From cb1b067a21a22510e939e2160937564844f6edb4 Mon Sep 17 00:00:00 2001 From: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Date: Tue, 17 Oct 2023 21:33:02 -0400 Subject: [PATCH] Lockable Suit Storages (#20950) --- .../Catalog/Fills/Lockers/suit_storage.yml | 27 +++++++++++++++--- .../Storage/Closets/base_structureclosets.yml | 11 +++++-- .../Storage/suit_storage.rsi/base.png | Bin 839 -> 754 bytes .../Storage/suit_storage.rsi/closed.png | Bin 500 -> 0 bytes .../Storage/suit_storage.rsi/door.png | Bin 0 -> 381 bytes .../Storage/suit_storage.rsi/locked.png | Bin 0 -> 231 bytes .../Storage/suit_storage.rsi/meta.json | 11 ++++++- .../Storage/suit_storage.rsi/panel.png | Bin 0 -> 260 bytes .../Storage/suit_storage.rsi/unlocked.png | Bin 0 -> 239 bytes .../Storage/suit_storage.rsi/welded.png | Bin 416 -> 442 bytes 10 files changed, 42 insertions(+), 7 deletions(-) delete mode 100644 Resources/Textures/Structures/Storage/suit_storage.rsi/closed.png create mode 100644 Resources/Textures/Structures/Storage/suit_storage.rsi/door.png create mode 100644 Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png create mode 100644 Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png create mode 100644 Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 09afc38349..7ee7351fbe 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -39,7 +39,7 @@ - id: OxygenTankFilled - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath - + #Prisoner EVA - type: entity id: SuitStorageEVAPrisoner @@ -80,7 +80,7 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitPirateEVA - id: ClothingMaskGas - + #NTSRA Voidsuit - type: entity id: SuitStorageNTSRA @@ -93,7 +93,7 @@ - id: ClothingOuterHardsuitAncientEVA - id: ClothingHeadHelmetAncient - id: ClothingMaskBreath - + #HARDSUITS #Basic hardsuit - type: entity @@ -121,6 +121,8 @@ - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitEngineering - id: ClothingMaskBreath + - type: AccessReader + access: [["Engineering"]] #Atmospherics hardsuit - type: entity @@ -134,6 +136,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitAtmos - id: ClothingMaskBreath + - type: AccessReader + access: [["Atmospherics"]] #Security hardsuit - type: entity @@ -147,6 +151,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitSecurity - id: ClothingMaskBreath + - type: AccessReader + access: [["Security"]] #CE's hardsuit - type: entity @@ -162,6 +168,8 @@ - id: ClothingShoesBootsMagAdv - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath + - type: AccessReader + access: [["ChiefEngineer"]] #CMO's hardsuit - type: entity @@ -175,6 +183,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitMedical - id: ClothingMaskBreathMedical + - type: AccessReader + access: [ [ "ChiefMedicalOfficer" ] ] #RD's hardsuit - type: entity @@ -188,6 +198,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitRd - id: ClothingMaskBreath + - type: AccessReader + access: [ [ "ResearchDirector" ] ] #HOS's hardsuit - type: entity @@ -202,6 +214,8 @@ - id: JetpackSecurityFilled - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat + - type: AccessReader + access: [["HeadOfSecurity"]] #Warden's hardsuit - type: entity @@ -215,6 +229,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitWarden - id: ClothingMaskBreath + - type: AccessReader + access: [["Armory"]] #Captain's hardsuit - type: entity @@ -228,6 +244,8 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain + - type: AccessReader + access: [["Captain"]] #Salvage hardsuit - type: entity @@ -242,6 +260,8 @@ - id: ClothingShoesBootsMag - id: ClothingOuterHardsuitSpatio - id: ClothingMaskGasExplorer + - type: AccessReader + access: [["Salvage"]] #Blood-red hardsuit - type: entity @@ -282,4 +302,3 @@ - id: OxygenTankFilled - id: ClothingOuterHardsuitWizard - id: ClothingMaskBreath - \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index f39938fd95..5edad73e33 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -184,6 +184,8 @@ name: suit storage unit description: A fancy hi-tech storage unit made for storing space suits. components: + - type: AccessReader + - type: Lock - type: Anchorable delay: 2 - type: StaticPrice @@ -196,11 +198,14 @@ sprite: Structures/Storage/suit_storage.rsi layers: - state: base - - state: closed + - state: door map: ["enum.StorageVisualLayers.Door"] - state: welded visible: false map: ["enum.WeldableLayers.BaseWelded"] + - state: locked + map: ["enum.StorageVisualLayers.Lock"] + shader: unshaded - type: MovedByPressure - type: DamageOnHighSpeedImpact damage: @@ -257,5 +262,7 @@ - type: Appearance - type: EntityStorageVisuals stateBase: base + stateLocked: locked + stateUnlocked: unlocked stateDoorOpen: base - stateDoorClosed: closed + stateDoorClosed: door diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png index 3a686cd6ecbbf57f16eb4baf430b6c8e21e3c939..5171b03f4611739868635ecb19891a86acf2f1ce 100644 GIT binary patch delta 693 zcmV;m0!sbI2J!`vNq>4tL_t(|+Qe7AOB_KIe{+7IVt1f$7FyUCu{b@k6ScDNz(yrq ziim<}qY3&KD59kx#6l~PwGb361q%;RbA^O7SEUgALPofkO2eT4P#8uhGq_Dq?mDdvaiA@J0zPSrj04PitXvDg{@S zLu{d3l$SE5QQ+j1qXb7|g*AlCuVqNV7Jw#2(=P2e*?+s*z-ig5Xa%x>GVM-EjnTv1 zK#wOMKpb6wXV_9mvjw0@A@2kGii{(aa>M6u_t{Y{A+3#8Dhu@dk6MuPfmBYg3)``V z@KHcMfF=%$iRa(NRYOjA+48_f_i^d+fZGZ6d$Z6Q=yyK6PaZ&r8%tCagy3OD!WTaQ z2MZnY(|_teV;;aL(Er*N6-ZW+Oy~|T6R9Z=U@u`R!@fR%rov_diNe$ZT!-sT6|m@@ z(8~#Jc_6R=+&i*Dm^?s#@8<)a9Z@oot6JU70)n0kbZ!Az_8@9ojmy65Q` z4NG2)+ph?}#knk=-1|_SMk5kRB8)|fI2(J1&&536PZYq$#>Az6&X)G$WBJRb?noJ- zX`#F03`lewj{y%yF`O-7cvnZ|N8NK**E5_yR}jM&bANCzLW#$3g1|rqE5XxPYI<&J z_rtedAv%&#t{AVA^7`K5$4s-&^#2`OP9i>#5`^2r_3ML7zZ^%S6HJ)^X<+cwR}77$ z_$cVOE$dOM1!o%gomx`39;EotT1pVD)qqhGqmph&0}H-BK6)yGsSp+Q&((k7&N6=r zi1FQvK7WycV}D~UAcApDR1ntTQMkSF#Yk#^Qrsx|%ir9sh9b2#kQyMudOYYIZ=3+7 zG+x!fW)aqojfn3k*;0OrSvJsJm(X8-^I07*qo JLrim%_V(FTh6nerF;W}?DhhI7L#3=# z8D8E##;}U%09c&ywi*iiF0&O_9Z3D12al*51t3FZ)I}MdJ>15y@vReBtd2>P!J+m8 zL!|9ThUI@hFsP}kGjKh7O}j+M`HhEx{WBB8k7LIe=Is?=U}g1SXf87b%du}e50+XE+#AGI;4%4wMAE0n;GM=~fPa zfUn6HhRKsGA)IZ>9I*Ke4_3!)KEuqAV!|+*21e7s zXd0ky2!N_mP?d^avw?y=HxCl$Ajil%`J%{!)Du$`4~jHE&;cM{fEp&)(m>fZ)HHDU q(j}674{k?{cFjf|FwhPF2rvM|GQbi2X(R{$000046o@Y zg<+R+$=5FuMb1zE`Oiz?+_=G|&GF6kthPxF<~+92E)pfavsOy8?l^F`cJ@IrqYbS_ z2V@R!cxdtUGK1NMpFI3w$8+ospP7*4bUcQEt4x5Qon>tiquGP(PppD(ZcmU^c9LiB zS=M;b#9$U%TddRpX{H6ML_(I{tNg&Be53fYLLpyK&z{NpT{a%JhM^x9crdfbGJIlP zk=UfmJ0;iImwCE=tkTKv3I{B1nM#))aIj`jIKZ&%|8&RT8HdgRLya#r!ZXd+mq822 W<^W<4xD-4YM0vXUxvX709|cOGtUcUY*}7_?@( zJ_`$Tqpv>5yIkbLH6gX(;||?di!@eMGkdq?026!-@(Adq0jDyLx7%(Jmk~6@vd$@?2>`=9OaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json b/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json index aa1c1f09ec..c4d4dc3468 100644 --- a/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json @@ -11,7 +11,16 @@ "name": "base" }, { - "name": "closed" + "name": "door" + }, + { + "name": "unlocked" + }, + { + "name": "locked" + }, + { + "name": "panel" }, { "name": "welded" diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..7c4ef0d075ea8f10c8bd2ba4bc6e8ca506fd6458 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GJ)SO(Ar-fh{`~)Mf7pRZt&NdwF`q=~ffdYdvIegj0@-`4 z8d|T385kKEX=uMbBrRM1J}#|gqhqe%u9gF9)VE6zSSql z6wK-7_Ng~WVsB@;d)eXa@9#aQoQxg>FtneT9R1(1ZflI-YL6oPfpUXO@geCx}JXdl6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png new file mode 100644 index 0000000000000000000000000000000000000000..cb906e3cb202a82ba0fa224df108e8a8896b9e3d GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G<(@8%Ar-fh{`~)Mf7pRZt&NdwF`q=~fd=b_R*|DW|8H_> zn8G2any+T$TkUMj?w~8KxZoMD?V<+;B8xX?O0%w>u}nC`cw(Xyv+iOBww%HZnbJ%y zN8U>Z$sVwXlI*ogxWWiFZw0fPtih{>Kz5!j%nVFC3_02&@*ECV0)S57OO5bM^YvxW X0mdKI;Vst0NaBJyZ`_I delta 17 YcmdnRynuPbbVg1FPgg&ebxsLQ05YKkqyPW_ -- 2.51.2