From 6c017bf7ce354368a04a93c8515d2e2b66376b2c Mon Sep 17 00:00:00 2001 From: chell sz Date: Wed, 15 Jan 2025 09:43:47 -0700 Subject: [PATCH] Make (some) jumpsuits foldable Still porting impstation/imp-station-14#375. Notable jumpsuits NOT made foldable include: - The Salvage Specialist and HoP jumpsuits, which use _DV sprites at the moment. - Numerous security jumpsuits (due to rollable sleeves). - Pretty much all the colored jumpsuits for some reason. - The prisoner jumpsuit (this one in particular feels like a huge oversight). - All DeltaV-, Nyano-, EE-, and Impstation-specific jumpsuits. - Several seemingly random upstream jumpsuits including the reporter's jumpsuit and all variant bartender uniforms. - All skirts. Uncertain at this time whether to let those come in a separate PR. --- .../Clothing/Uniforms/color_jumpsuits.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 60 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml index 7a44409079b..f4f2600f197 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml @@ -492,7 +492,7 @@ # Rainbow Jumpsuit - type: entity - parent: ClothingUniformBase + parent: [ ClothingUniformBase, ClothingUniformFoldableBaseImpstation ] # imp - Add foldable uniform jumpsuits id: ClothingUniformColorRainbow name: rainbow jumpsuit description: A multi-colored jumpsuit! diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index cdfdf486a8a..64af043c2b9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitAncient name: ancient jumpsuit description: A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade. @@ -21,7 +21,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ancient.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitBartender name: bartender's uniform description: A nice and tidy uniform. Shame about the bar though. @@ -58,7 +58,7 @@ sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitCaptain name: captain's jumpsuit description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain". @@ -69,7 +69,7 @@ sprite: Clothing/Uniforms/Jumpsuit/captain.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo @@ -91,7 +91,7 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits 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. @@ -113,7 +113,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitChaplain name: chaplain's jumpsuit description: It's a black jumpsuit, often worn by religious folk. @@ -168,7 +168,7 @@ sprite: Clothing/Uniforms/Jumpsuit/chef.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitChemistry name: chemistry jumpsuit description: There's some odd stains on this jumpsuit. Hm. @@ -253,7 +253,7 @@ sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits 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. @@ -275,7 +275,7 @@ sprite: Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitDetective name: hard-worn suit description: Someone who wears this means business. @@ -286,7 +286,7 @@ sprite: Clothing/Uniforms/Jumpsuit/detective.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitDetectiveGrey name: noir suit description: A hard-boiled private investigator's grey suit, complete with tie clip. @@ -297,7 +297,7 @@ sprite: Clothing/Uniforms/Jumpsuit/detective_grey.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitEngineering name: engineering jumpsuit description: If this suit was non-conductive, maybe engineers would actually do their damn job. @@ -308,7 +308,7 @@ sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits 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. @@ -341,7 +341,7 @@ sprite: _DV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitHoSAlt name: head of security's turtleneck description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. @@ -385,7 +385,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitHydroponics name: hydroponics jumpsuit description: Has a strong earthy smell to it. Hopefully it's merely dirty as opposed to soiled. @@ -396,7 +396,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitJanitor name: janitor jumpsuit description: The jumpsuit for the poor sop with a mop. @@ -418,7 +418,7 @@ sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits 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. @@ -440,7 +440,7 @@ sprite: Clothing/Uniforms/Jumpsuit/mime.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitParamedic name: paramedic jumpsuit description: It's got a plus on it, that's a good thing right? @@ -501,7 +501,7 @@ - WhitelistChameleon - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, BaseCommandContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitQM name: logistics officer's jumpsuit # DeltaV - Logistics Department replacing Cargo description: 'What can brown do for you?' @@ -547,7 +547,7 @@ sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits 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. @@ -558,7 +558,7 @@ sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitScientistFormal name: scientist's formal jumpsuit description: A uniform for sophisticated scientists, best worn with its matching tie. @@ -569,7 +569,7 @@ sprite: Clothing/Uniforms/Jumpsuit/scientist_formal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitRoboticist name: roboticist jumpsuit description: It's a slimming black with reinforced seams; great for industrial work. @@ -826,7 +826,7 @@ sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi - type: entity - parent: UnsensoredClothingUniformBase + parent: [UnsensoredClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitNinja name: ninja jumpsuit description: Comfortable ninja suit, for convenience when relaxing and when you need to practice. @@ -837,7 +837,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitAtmos name: atmospheric technician jumpsuit description: I am at work. I can't leave work. Work is breathing. I am testing air quality. @@ -848,7 +848,7 @@ sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitAtmosCasual name: atmospheric technician's casual jumpsuit description: Might as well relax with a job as easy as yours. @@ -859,7 +859,7 @@ sprite: Clothing/Uniforms/Jumpsuit/atmos_casual.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitPsychologist name: psychologist suit description: I don't lose things. I place things in locations which later elude me. @@ -1105,7 +1105,7 @@ sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitFlannel name: flannel jumpsuit description: Smells like someones been grillin'. @@ -1116,7 +1116,7 @@ sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorEngineer name: senior engineer jumpsuit description: A sign of skill and prestige within the engineering department. @@ -1127,7 +1127,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_engineer.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorResearcher name: senior researcher jumpsuit description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science @@ -1138,7 +1138,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorPhysician name: senior physician jumpsuit description: A sign of skill and prestige within the medical department. @@ -1149,7 +1149,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi - type: entity - parent: [ClothingUniformBase, BaseRestrictedContraband] + parent: [ClothingUniformBase, BaseRestrictedContraband, ClothingUniformFoldableBaseImpstation] # imp - Add foldable uniform jumpsuits id: ClothingUniformJumpsuitSeniorOfficer name: senior officer jumpsuit description: A sign of skill and prestige within the security department.