Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow tying jumpsuits around waists (Impstation port) #2742

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fold-verb-clothing-jacket = Take off jacket
unfold-verb-clothing-jacket = Put on jacket
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
60 changes: 30 additions & 30 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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".
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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?
Expand Down Expand Up @@ -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?'
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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'.
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
abstract: true
id: ClothingUniformFoldableBaseImpstation # Impstation suffix because DV already has its own ClothingUniformFoldableBase
components:
- type: Foldable
canFoldInsideContainer: true
unfoldVerbText: unfold-verb-clothing-jacket
foldVerbText: fold-verb-clothing-jacket
- type: FoldableClothing
foldedEquippedPrefix: folded
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit (Will update when PR'd), monkey made by brainfood1183 (github) for ss14",
"copyright": "Taken from tgstation at commit (Will update when PR'd), monkey made by brainfood1183 (github) for ss14, folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "folded-equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github)",
"copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github), folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "folded-equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by KingFroozy (github) for space station 14",
"copyright": "Sprited by KingFroozy (github) for space station 14, folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "folded-equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github), folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) and edited by Pinkbat5 (github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "folded-equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey made by brainfood1183 (github) for ss14",
"copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey made by brainfood1183 (github) for ss14, folded version taken from tgstation (https://github.com/tgstation/tgstation/blob/5ed5566dbf09507cb99768faa696f8c3f8f65660/icons/mob/uniform.dmi) spritework and edited by Pinkbat5 (github)",
"size": {
"x": 32,
"y": 32
Expand All @@ -14,6 +14,10 @@
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "folded-equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading