From 4eab05b55e538ea3f7fd7d30b4f145524d90d8a6 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Sat, 6 Sep 2025 13:55:02 -0400 Subject: [PATCH] Add some alternate jumpsuit designs which can be toggled (#31213) * inital * testfa * New Sec sprite * Update atmos * Update meta.json * Update meta.json * 0 * Update meta.json --- .../components/foldable-component.ftl | 3 + .../Uniforms/base_clothinguniforms.yml | 11 +++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 68 +++++------------- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 832 bytes .../Uniforms/Jumpsuit/atmos.rsi/meta.json | 8 ++- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 506 bytes .../Jumpsuit/atmos_casual.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 408 bytes .../Uniforms/Jumpsuit/bartender.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 436 bytes .../Uniforms/Jumpsuit/cargotech.rsi/meta.json | 4 ++ .../ce.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 547 bytes .../Uniforms/Jumpsuit/ce.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 497 bytes .../Uniforms/Jumpsuit/chemistry.rsi/meta.json | 4 ++ .../cmo.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 508 bytes .../Uniforms/Jumpsuit/cmo.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 825 bytes .../Jumpsuit/engineering.rsi/meta.json | 6 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 544 bytes .../Jumpsuit/engineering_hazard.rsi/meta.json | 4 ++ .../hop.rsi/folded-equipped-INNERCLOTHING.png | Bin 0 -> 475 bytes .../Uniforms/Jumpsuit/hop.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 577 bytes .../Uniforms/Jumpsuit/hydro.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 590 bytes .../Uniforms/Jumpsuit/janitor.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 511 bytes .../Uniforms/Jumpsuit/medical.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 457 bytes .../Jumpsuit/roboticist.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 495 bytes .../Uniforms/Jumpsuit/salvage.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 520 bytes .../Uniforms/Jumpsuit/scientist.rsi/meta.json | 4 ++ .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 524 bytes .../Uniforms/Jumpsuit/security.rsi/meta.json | 6 +- 37 files changed, 103 insertions(+), 55 deletions(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl index 1221efbdf0..70f996414a 100644 --- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl +++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl @@ -11,3 +11,6 @@ fold-flip-verb = Flip fold-zip-verb = Zip up fold-unzip-verb = Unzip + +fold-verb-clothing-jacket = Take off jacket +unfold-verb-clothing-jacket = Put on jacket \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index eafc5acf79..cd8ef614e5 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -64,3 +64,14 @@ - type: Clothing slots: [innerclothing] femaleMask: UniformTop + +- type: entity + abstract: true + id: ClothingUniformFoldableBase + components: + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: unfold-verb-clothing-jacket + foldVerbText: fold-verb-clothing-jacket + - type: FoldableClothing + foldedEquippedPrefix: folded \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 0f1a079320..98fa96eea0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -21,15 +21,13 @@ sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitBartender name: bartender's uniform description: A nice and tidy uniform. Shame about the bar though. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi - type: entity parent: ClothingUniformBase @@ -69,37 +67,31 @@ sprite: Clothing/Uniforms/Jumpsuit/captain.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit description: A sturdy jumpsuit, issued to members of the Cargo department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitSalvageSpecialist name: salvage specialist's jumpsuit description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitChiefEngineer name: chief engineer's jumpsuit description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ce.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/ce.rsi - type: entity parent: [ClothingUniformBase, BaseCommandContraband] @@ -168,15 +160,13 @@ sprite: Clothing/Uniforms/Jumpsuit/chef.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitChemistry name: chemistry jumpsuit description: There's some odd stains on this jumpsuit. Hm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi - type: entity parent: ClothingUniformBase @@ -253,15 +243,13 @@ sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitCMO name: chief medical officer's jumpsuit description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi - type: entity parent: [ClothingUniformBase, BaseCommandContraband] @@ -297,37 +285,31 @@ sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitEngineering name: engineering jumpsuit description: If this suit was non-conductive, maybe engineers would actually do their damn job. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitEngineeringHazard name: hazard jumpsuit description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitHoP name: head of personnel's jumpsuit description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/hop.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hop.rsi - type: entity parent: [ClothingUniformBase, BaseCommandContraband] @@ -408,26 +390,22 @@ sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitHydroponics name: hydroponics jumpsuit description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitJanitor name: janitor jumpsuit description: The jumpsuit for the poor sop with a mop. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi - type: entity parent: ClothingUniformBase @@ -441,15 +419,13 @@ sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitMedicalDoctor name: medical doctor jumpsuit description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/medical.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/medical.rsi - type: entity parent: ClothingUniformBase @@ -569,15 +545,13 @@ sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitScientist name: scientist jumpsuit description: It's made of a special fiber that increases perceived intelligence and decreases personal ethics. It has markings that denote the wearer as a scientist. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - type: entity parent: ClothingUniformBase @@ -591,26 +565,22 @@ sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitRoboticist name: roboticist jumpsuit description: It's a slimming black with reinforced seams; great for industrial work. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi - type: entity - parent: [ClothingUniformBase, BaseSecurityContraband] + parent: [ClothingUniformBase, BaseSecurityContraband, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitSec name: security jumpsuit description: A jumpsuit made of strong material, providing robust protection. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/security.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/security.rsi - type: Item inhandVisuals: left: @@ -896,26 +866,22 @@ sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitAtmos name: atmospheric technician jumpsuit description: I am at work. I can't leave work. Work is breathing. I am testing air quality. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBase] id: ClothingUniformJumpsuitAtmosCasual name: atmospheric technician's casual jumpsuit description: Might as well relax with a job as easy as yours. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi - - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi - type: entity parent: ClothingUniformBase diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0f4d4b6183bf411146c9e7d49a1c421915c36ae3 GIT binary patch literal 832 zcmV-G1Hb%Px%`bk7VRCt{2n$JrVQ5?WOvn)g%!o4k`CPZX-O8)@!BzlONqp{Of&^-kk4CG-C z0|gyq_uzS?W3y7AUcxL2ya*oDmDs|q#f^*w&qLE;_NTbEZ*}znLVyFuvho1^3 zIaVzC&)$9Y=u^4^vFm^f+Omfo*BF_Ag?WE1F$K&gl?~_=!$h+!y&he~Vq9H6FO=?WO-4Bm{+hoK~M z*TQwQo&L$`2>pE#Du@1QR}P`SJGjh_H=xtdQVqe2MmY(7eAD>f>}>OVn0$WQWHp4Lk6 z%uC;{r;oOjs#D5^k;h}c9R(t`47wM#&T>tKG-u@=Iu4x0%)>z1!;;Lb62 zC`O=qi;Rh8lr!{oQ-AV1)t;gAqN=Oe2BVw_bp1}w@xRxHD2 z{`B(Bq*2nWB*Xjk9mlM$nU%BYPzhwTnP|-e=W+6v*$zSYkNFE}cL^*=_=k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}zR>z80q%tz(PGs2lilKA!fdvc<+dnO>m1l^q{Qr(&Vg*B0EW`R< zsm^TvtgI}CX~%&2;&a<(11Z6hAiv=MXn;X=?aU;gBxiv~WHAE+-vJP2%(~Xe33QCH zr;B4qg!|iRuk#Ko@VIdw%+8p6;J5u-J9ev?-JREbXPFdMvDVK~`?F%_QF$ZQ-~&Df zMGS&I{Q9T6l4tg-&5ulTbKi$cCJP*L7LM2x>Bh!&a8pFLI=i(*`y}Qi96oXX9{yrG z+&!~VLDPhB>C+`#?;@&>%dX3wx6%w)(J|X>+c0TvYY*!;G_- zX1$(w+(*%(PuZfKZLYdjK!Kiu%KAkDEdpXPMpM4Y1v*GBY-C`JagsBCz~pz>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%xYG`O^X=!C;Wi>Q395`^m%E~G&EzRBCJuWWJ(9lptMMXzPM_pY# zC@4rlBSEK+1 z&w9EzhD5l(y>^kW$$-b^3=9umUSfE@m%pU*uc(0Y8ip<68OxYlo@aQmGljGN zFx1+xz1~E?p8E*Th1`h@D}HXf|8AezpAw*1k_imy2i7xIJbod&aEVBzWjwjC6VnzL3rdk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0Z1^9%xR>z93YEVc@N}7}>eQmSG%$YMA8X689IIw*A^4+_4-`Zt+F8*(;X08)Ggl-K{7?)N&wP%1nXg0{ zeW#ojN{C&p&(b)9+4%a7MmF8vQwbaa^S8tV-FI+ysO&i?^5Mjf7;Yy6)(QsAu3eWL z7_a_PGS!>IdPe24#&TKf+l-f-vtlgXiKhO3b@{Bc{Wn{^0>*+y?gpS`R!pl+zZttT zrg0~fJU^3p+T7LJjM81E04*mT>H|x zK;~c)uSVB0u{SFdABv>R4BIJo!fNjEcDDsL{wwuuoU1Q&kbj55b9KJMM=g~CIURt3 Oz~JfX=d#Wzp$P!arLaT* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json index 12bdb72c4a..8ecd272ddf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..39a640b26d47254751dff869206c764da1467c57 GIT binary patch literal 547 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p2l#}z2DUknWY86MtYC`!+|eCgoi$&=$_ zgD+h?SP;eC(9m$=#0e)$+x9%(sHmu}uC7fJ1cQTvUtSRfn%Ap!Fc3&dmIV0)|HlCs z7)`jg0~K)=ctjR6Fz_7!VaBX$ot!|&+IYG+hD5l(opv$rumX>(VdSKsux%IHp8Vfm za{bCg4%REHW_>%<>5`PgcTRZ4Ti;y^xM%3SU{Vu(b6?*xUf|7Tm!+;fK^z~iu(UMJ zSmp4#(d42+VVhHz$&VErZoY?GW@YM0Ut#e(5W;dJaTX`n*}Zm)c-Gs^%?(Z1@MZFg zM{~}kNMuW7tMtjRoZETvMz>_D+Tn!H`pM@@4{kSo&tWDg!z~oi@IQkiN5|q{vXkL_ zE|DGlsdWcxJywX?`-+z^US^FwP;yY7v*u}y{GOU6GA!3`ANuj>r`;L5W%=PVJ7icA zBWEt%Au2VwWJ0Hh+5@323WaP^9WS>jv^)^+G#2Ym3Er?!A!7eEtBAc%xj5g;u-1HY z3fQ^Of_1W=s*Af literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json index 425e6eaae2..9da8dd64ef 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..aee5ab426e122f6a606f39d794feec6b59f049fa GIT binary patch literal 497 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}z_V)HpbYy5~XxO-M8c4 z(eiY042f`mJMCiGVFeBc#l(wl*?<49mzCJQO7L=Cdb<9-dCMFh%zMS{^hY(=fc21w zPh$YrzI*p4?Nj{W=e*wYfy=K9rpV{-CNc<$|9iHBF)UB@nX}*lrX33pp8dwV;og$D zCsr}N+X2cvGoE!ovO3XQi<|J$43UNA2v^y3o?2Zia6T{H`x-1SiSsqs@r z{nV{I$AeoBEN80w^75JY!MT=lwYw@)cds{Q4OZ|uD8do^!Mtff&oK$ZC)1mP1o~bc zH@4C@DNqtEcsSWh;X3=geLJ4Evc20r&D%lvfY#yp4)>XsG;Pf~wZDnuhkW0;hRe*3 zR!s6!xVf6mDpsCMT*Q^~C64pf!&)JmE!=$#zaIxZ*z$1Rj_uc*-7fI`H(uTq^?~_c cw7_F^8_7=>U0nssfI-RN>FVdQ&MBb@0I^rxT>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json index 3f72fb4460..08ce600884 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ad71010b462251ec5825ab1a05b10d19fbcb1b85 GIT binary patch literal 508 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%x_V)H>Wo0!qH0T%3+qiM#|Ns9R8yhpWUc7(*{)rPOEc^CHP21hu zH~GksBcY+8DJd!O@$o>dfBs570#ZUHL4LtNEvSIu(f<8HKv~WLkH}&M2EKzJ%(!D> z_FJHX3_V>OLn7SYPKzx+q`>1aImoTV;LZR4o7GHa*KFG*dp>SQm4HW)?w%zZ{!Y}K z!Ia3g%;5y<{m;{v=yTK^x}Ys&F~Lr`@lEm9i420`$pP0zHx#W*wPRz7IAGCyEbu!Y`{xid5-R5|^7<=4q^=c*ttYlE2hlf;s?ZdLbfdlm;Z{CL^?)%95OU#5dqvFb&Q z+Yicfs_gTOx!!3LF0{b!goSv^lmpK5^K8Ux41Zr(E-f$fy>eLsR}0uN_mn%_)Opoj zsVIvd+55Y&|5`5>-x3zTngEU`UmIs{FWeP)@T==WDh&)8M3z2oJc({Eh@%>PeQ iTP*UY>AzUcZP}PMrfs>r2j2rjl)=;0&t;ucLK6UAfZb34 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json index 3f72fb4460..08ce600884 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..56db6b87bbb2a783e5ba139da7c677db22d53c7d GIT binary patch literal 825 zcmV-91IGM`P)Px%^GQTORCt{2nn6euQ5eU6V}W$25G=@W5f2evf~Cv4f*^V^78E>1Za0xS6dm^( z?4gU=DY~_Glw8_c4|!SIZNbBm7b%Su2V#>pBt3)~O^3I`%xmc`!BP~ZAfLFW>zFl?c4Q(Fg8*DOyQ0NU-kTYo&l*O*5;Pej)q}z z19DkaN5jr@dLek{>3pQ`S8EBhovU3;tEBseVCJbZjZMIee*d0{Coob;tj=27G@X0PpWyd5=Q$m}zV?90 zc~$3t3vF<%_I7@}f%7;0c=S##ySM$;y%wGf{?YcQwFIhZHT`egg;V{?wz3ZEAJp~k zu6F-gRMRTau22h`Tk36ZZb4Uvf1jQQ!0Xh~oq|V=_9po5m2>S*)@=`x_n9X4IsNI6 zpFQB^>-zTEXH@_~zCzF=o3p>N24GS7Zcr&G%f*xTOI#2HK@bE%5ClOG1VIo4K{%PD zl34jz@c&EaWBP|6_Cre-NF}l235>VT{te(vMoHv(uzEAWs6+V}Rx}J0VXqhl$CZGp zqfTiHBaa`djt9N~_Z|BJP{`C|>?Z2XK`BR6@;_rRFzUK74GWi@*mTg6#xAu(&uT4s z7q(Pgjs&X>#uFI!IRUpkPVI&Ctg0Aw@FkA}m?N+<>$EFXD3$zr^G>M*;V`fWD~rl@ zWduTV{`_eTfW5}b01Y~QcM(bfpAvERlPDVc7XqA44_mZ~6IN0yaw@A!I^f2c`nr{oPE>VvO!!ZEwI*KU}|hFn@<~P|^%R zP@lfN=*?i5hor^(3i`ol{pV(C_GnIp9G5r*;RN#+aryOGfv-{Y00000NkvXXu0mjf Dk>-Lf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json index 1fb9cf1b66..63ed96bfdf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, folded-equipped-INNERCLOTHING edited by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..0774a270107f7d041916f267a8ae2b0c136f3f35 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p2l#}zmK!ikbYz%p&2Zqr0V^x3nbYL{*E5_9XIQ>``IA!i|No8ucQCA3 zsdV`)!|vq_8X6jYett9S8MZHFNYiERGh;aD%TS=ma48dL90QO1B#Z_JR*x382Ao?FyoGi*>8c4we)mx42f`mJMCiLVFeynMdg&7vmBYXKK+lk zy1g;Pr(kK>t#5|{XCI3xo@FCBx!yy(gz*wfNr(ynM#{ zpy&<#+*y^H6`gu7n3izwVtCnfUod0w#<^3PIQ5U+n4Q#+U>_Zztjw}Ou#dqYv2r03 z(|hJWSxnW3g;`_-cGxj2XV2hx#F@?LSD`1J@XNtrr|{w3YF2L^HVH7Dn0vX+dg21d zf6XFGN_}q?sGGfc@LN{%z{B;t<&UZ?>^vN8|MbgPEqTEDFM7gf^ThqR=ba9GG6Y3~ Mr>mdKI;Vst0HV?1ZU6uP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json index 1fb9cf1b66..8384c705b9 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..edbe52e7597b4184a47bd491af69173bebf65435 GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwGPtKP=sGj_7d8Mz652KZ$&d;LhnOl+Q3g|g1~m(yz=qaTIUvPT z666>B9|0JI?w>mc6z44Ph%9Dc;5!V$jK}j=qyR0}@N{tuiEw{A?RL>&1s>K?#^as; z|JPTuWN}MadRoujw_)Z+M$hiU-3uO1*EuL8;k|*yP5Xz;e$`s%52DK=CpJ3#bY+Tm z|2nl{rt8#NJBOxAEJ}<*CfeE4b~d`Ku~Fq@4V(W#a5~e(0EZR#W^7-x&&VO^YNu7b z`h_`)H+RWOy<)tiD^eh&Htk4bL;j69$p;gg4zt+FSL#hr;y5QzI47vqq=YFzzIfTk z2k-Zt6Vhqi$l{%#bMQV##`lArwbS0_H)nspEF&^i|T2m4u%e`MsTUlRK?)`$lfkPM!#elF{r5}E)T COSZZI literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json index 3f72fb4460..08ce600884 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..8bc0d303c3182da5296074d21c1e27d26fb6fa1b GIT binary patch literal 577 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 tebzbFyu{o7!{($wz&WR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index 16b45eec87..fa0b5a36dd 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..c919509adc83cf541183f99dfc84525035d5e12b GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}zR>z7bGfbSv@T!7g^QoC?OBg=w?N?b^D}QaXMi4_~XEy)(Ua3eo z_N=U|Hil#UInqFV`B6_}fRtcKkYDhBG{B&`c4iV#lC!`gvY3H^?;r>>?wFYU7U&oa zPZ!6K2=}+s9%Ef)eDD3w{CmoPkxgfpyjq*_;g)UcJi^wW#3h>)1KJWe zri6U>^>5l2-hH1-djE2!>^Wa$9Zl!uJ>PYpm4&Bt z)yI$m_TK@^rTkgt4OyHQ@EjD-u-C8*X6>3 z$4-n)O45@yEvg8YyS>e~;$+5_@_vRx9#uzJmkKB_Mt6K>zTsf-h2>bpGz)u$oZgol zUnF|7+bFW%(e*-Q(+8gCO<~3Scl=pWKie0bIKe9aA-D0n|4EZi Vn_jt<2mu3k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0}1^9%x_5wlQeLB zp`oEEDJjXx$?@^=K&>@r{1kzdP)U$qFi;CBV0g5DzYtKCv%n*=n1O-sAP6(=n3(+* z=pb897srqY_qWsT7PTnwxG7KKiadSj_x>DVpXCpPw%_(!ZZ4BPb$(5H$=;5Dx|1S4 zjRvg23R{}afAqd2&a&Z!sGDM=`Kv_El)0C~nV#P{Wj}X5!}-9JdpwM59&8gh?3T>@ zWA+ijlOi7TlJo@k?#+A*r1NdweV^H+DX=Vot3~sNw4+f}vZmt8 z1q(&5yuGFP`U_*`+^ze*mN3mL_@36RH|K$kV9_z5hUw4x6KWPtd9*<6hu)HKN0vML zChK}!x|{3xm*GH4%>siyA+KIP?Ym3vM9x1^$35kT+IuT&3+|e-w0XRGzr7pPPemSg vE>insW%q)0=Ea2von7^RF#gxoc*-nU%J}=h4~9>`&}Hy+^>bP0l+XkKl{ezn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json index 3f72fb4460..08ce600884 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d22e70dac460478ecddf0b98069a1c846e0807f4 GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1!1o(uwh6?j{2uti$l+w`9(AL)W^YMA$DtFXIrbbNc1_Q%VdHG}si77Vv z2`pR{vNBVqOzGB9}_V6`#%>1%5xTYL>4nJ@ErnS zMo|r~2B5<%JzX3_BHZ6jyPJ1dfya$kN3*eY+LOQcOXqiLGdBKPGpp?I$|*@Xe9yQt z{!dVpU`pd?YdFdJ{bTecbC&O!OQX6alv;j#W#N)PTEZG7y);mvkhRdOd3_%PYns#9 zHMiMj9b~<+FTpJ9n4WCo)2q{uma>X@_Xc%;HwsRin>uHzMIgtX?m)hKl3@vswlQ0tm<_}c3P?rGX8HX6z?d-