From 6d5b0c5629edbc70fb33eb5d1f4781e22bfee669 Mon Sep 17 00:00:00 2001 From: Hyenh Date: Sat, 13 Apr 2024 19:53:48 +0700 Subject: [PATCH] add --- .../Objects/Misc/identification_cards.yml | 2 +- .../Entities/Objects/Tools/flashlights.yml | 4 ++-- .../Storage/Closets/Lockers/lockers.yml | 8 ++++---- .../_FTL/Entities/Objects/Devices/pda.yml | 2 +- .../Structures/Storage/closet.rsi/merc.png | Bin 0 -> 689 bytes .../Structures/Storage/closet.rsi/merc_door.png | Bin 0 -> 726 bytes .../Structures/Storage/closet.rsi/merc_open.png | Bin 0 -> 727 bytes .../Structures/Storage/closet.rsi/meta.json | 9 +++++++++ 8 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/merc.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/merc_door.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/merc_open.png diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 8c6b0c7ca8..de27f8311d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -125,7 +125,7 @@ - type: entity parent: IDCardStandard id: SecurityIDCard - name: security ID card + name: mercenary ID card components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 14a31d269e..7237430912 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -75,10 +75,10 @@ - Belt - type: entity - name: seclite + name: taclite parent: FlashlightLantern id: FlashlightSeclite - description: A robust flashlight used by security. + description: A robust tactical flashlight. components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 0207a8977b..24c021af1e 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -327,13 +327,13 @@ - type: entity id: LockerSecurity parent: LockerBaseSecure - name: security officer's locker + name: mercenary's locker components: - type: Appearance - type: EntityStorageVisuals - stateBaseClosed: sec - stateDoorOpen: sec_open - stateDoorClosed: sec_door + stateBaseClosed: merc + stateDoorOpen: merc_open + stateDoorClosed: merc_door - type: AccessReader access: [["Security"]] diff --git a/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml index 416e0a18d0..e3c219ea32 100644 --- a/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_FTL/Entities/Objects/Devices/pda.yml @@ -16,7 +16,7 @@ name: mercenary PDA description: Rugged and robust. components: - - type: Pda + - type: Pda id: SecurityIDCard state: pda-bartender - type: PdaBorderColor diff --git a/Resources/Textures/Structures/Storage/closet.rsi/merc.png b/Resources/Textures/Structures/Storage/closet.rsi/merc.png new file mode 100644 index 0000000000000000000000000000000000000000..6c49ebe7331772f1645da58569b8e3fdb6f4aa2b GIT binary patch literal 689 zcmV;i0#5yjP)EX>4Tx04R}tkvmAkKpe)uKBS^m2RjsT$WWau_(B||ibb$c+6t{Ym|XgTCJjl7 zi=*ILaPYBMb#QUk)xlK|1Ro&I4o-?LQsV!TLW>v=j{EW5eIIw<0p3Q1DTaR>P*hV- z#bZJ?w<-i);YTm}5yphb3@wpf%)oVg-NVDzyC~0cKlkV8lk)}xJOc3?({z(~gLr1s z)Hv@GhgeCJiO-40bh;q%BiAK|-#8a-_VUb-o=MFUhlqt@2TL8yO1eTkO&pOGmGZq= zhh@%NoRvzAweHDZ7|g3HX|B^8MjT5>APE5yYAB-u6H!`KQVgVMKjz{evi(VNN#rVn zkz)Z>C=hKw_#gc4)+kI(I!VD8(Dh-*TUnkRto8Msp0{%Ql5{Up8K z)*?s1z&3Dk-PWW%;Bp5DKWU;a+LDi^w@?7y&*+n`u^?(FT~Gp+u90FvZ#v{~205&!@I24YJ`L;z9%QUFp>&F#_v000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j~P13^6NG(n`bt006B?L_t(o!|hkG3Pd3ci^u6u zDB>je|NrG8f|G;b>Mi#H6?_PHEx3gm5?c&#xr`J@L~Ezt7I XJ>5GofKa|c00000NkvXXu0mjfz(XiU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/merc_door.png b/Resources/Textures/Structures/Storage/closet.rsi/merc_door.png new file mode 100644 index 0000000000000000000000000000000000000000..fd6ade03b034e8db4e4a5beddde0c2ee8e193b60 GIT binary patch literal 726 zcmV;{0xA88P)EX>4Tx04R}tkvmAkKpe)uKBS^m2RjsT$WWau_(B||ibb$c+6t{Ym|XgTCJjl7 zi=*ILaPYBMb#QUk)xlK|1Ro&I4o-?LQsV!TLW>v=j{EW5eIIw<0p3Q1DTaR>P*hV- z#bZJ?w<-i);YTm}5yphb3@wpf%)oVg-NVDzyC~0cKlkV8lk)}xJOc3?({z(~gLr1s z)Hv@GhgeCJiO-40bh;q%BiAK|-#8a-_VUb-o=MFUhlqt@2TL8yO1eTkO&pOGmGZq= zhh@%NoRvzAweHDZ7|g3HX|B^8MjT5>APE5yYAB-u6H!`KQVgVMKjz{evi(VNN#rVn zkz)Z>C=hKw_#gc4)+kI(I!VD8(Dh-*TUnkRto8Msp0{%Ql5{Up8K z)*?s1z&3Dk-PWW%;Bp5DKWU;a+LDi^w@?7y&*+n`u^?(FT~Gp+u90FvZ#v{~205&!@I24YJ`L;z9%QUFp>&F#_v000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j~P13^4~_3MMB2007cSL_t(o!|j%_3WP8WhU4MX zg0uMkkKzLqx^yf;S8qD0(&KW{7LLoegwRlae_~Q1MN$5pPFgrk({79r)y5df zS}VG{mkKb(kW|1oJfwv&##0U;8*{Zq1YB9yH5;oraAjGRY-}b#9Vq2Me^EX>4Tx04R}tkvmAkKpe)uKBS^m2RjsT$WWau_(B||ibb$c+6t{Ym|XgTCJjl7 zi=*ILaPYBMb#QUk)xlK|1Ro&I4o-?LQsV!TLW>v=j{EW5eIIw<0p3Q1DTaR>P*hV- z#bZJ?w<-i);YTm}5yphb3@wpf%)oVg-NVDzyC~0cKlkV8lk)}xJOc3?({z(~gLr1s z)Hv@GhgeCJiO-40bh;q%BiAK|-#8a-_VUb-o=MFUhlqt@2TL8yO1eTkO&pOGmGZq= zhh@%NoRvzAweHDZ7|g3HX|B^8MjT5>APE5yYAB-u6H!`KQVgVMKjz{evi(VNN#rVn zkz)Z>C=hKw_#gc4)+kI(I!VD8(Dh-*TUnkRto8Msp0{%Ql5{Up8K z)*?s1z&3Dk-PWW%;Bp5DKWU;a+LDi^w@?7y&*+n`u^?(FT~Gp+u90FvZ#v{~205&!@I24YJ`L;z9%QUFp>&F#_v000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j~P13^5q(0xQx0007fTL_t(o!|hiw4ul{O91RtT zv4NV}nji3R|6)Y}jWMzHDlaF8<}T;DCdX6@*<>cevI{^#K>;(Wo&Dv*yq_U5WN^-H z)_vcDQotMGIF8S_ZClbK5INEqBLF}tMP38qb+HnM5O@TH5HQa(j4_wpf{g&JHID<{ zdq^p>4tVeXz=5;|thGEf&~@GAt+?i%1vLN+!?2qmrKA_oG!3r<(=_o4I4ZuiJ(CJZ zNn(uT#AO)WyA|KYfiz}uKx=*2DbIM8FRA4j!irSD7ypIR@c^53ZA=uN0%8CF002ov JPDHLkV1kacJ6`|* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 98bbe8085a..71d4ba3378 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -534,6 +534,15 @@ }, { "name": "clown_open" + }, + { + "name": "merc" + }, + { + "name": "merc_door" + }, + { + "name": "merc_open" }, { "name": "mime"