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

diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
index 1221efbdf059d601be942faacb0e1e94c70b0961..70f996414ab6bb77249eaf42d4dfbf8db07cc072 100644 (file)
--- 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 eafc5acf79e9cd21b198a5b4eebed52e0086c77e..cd8ef614e59c1f2643bee46d86eadcdb91cde939 100644 (file)
--- 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 0f1a0793203db9b6715562584f2d83d6049e75f4..98fa96eea03152fd6bf390d3d25447273f2ee082 100644 (file)
--- 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 (file)
index 0000000..0f4d4b6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
index 1ec7ec28283d6f7db11da7dcf817647bb72f1222..7b1360bf3abb6c241ea61e4426dae964a496b268 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
@@ -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-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
@@ -27,4 +31,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..eb1b473
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
index 7cd0cba745cbd0edb5ba107cb2c079acd0eaec0a..a9a78e9e9780cb465c6cf413fd1f3bb2572229a9 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.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/bartender.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..091f658
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json
index b02e5f4b8a6ee8b073eda1fe1ce7b3bae83f168c..d77d70001d4078caba4f7ccae50eb2b038a7f471 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.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/cargotech.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..dcdcaeb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json
index 12bdb72c4a0abe8365180cff8506a2363d4d37fe..8ecd272ddf5fd9fbdc09fb1d34df00a31268d11a 100644 (file)
--- 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 (file)
index 0000000..39a640b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
index 425e6eaae249ac96c4b856d13bb90e227eb4ec77..9da8dd64eff92e11dbf209f05b9b11ff37ee888e 100644 (file)
--- 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 (file)
index 0000000..aee5ab4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json
index 3f72fb446001b9309f73f5ecea1c404def25837a..08ce60088435c15f279fe790d8bf72a7ac95af6e 100644 (file)
--- 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 (file)
index 0000000..ad71010
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json
index 3f72fb446001b9309f73f5ecea1c404def25837a..08ce60088435c15f279fe790d8bf72a7ac95af6e 100644 (file)
--- 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 (file)
index 0000000..56db6b8
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json
index 1fb9cf1b666b172121baa7ca2b6162a2a6325da8..63ed96bfdf8564623ad7bc68174c83ea1e614928 100644 (file)
--- 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 (file)
index 0000000..0774a27
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/folded-equipped-INNERCLOTHING.png differ

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 1fb9cf1b666b172121baa7ca2b6162a2a6325da8..8384c705b910ede2befe33015b03dbdd0ae0b8e1 100644 (file)
--- 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 (file)
index 0000000..edbe52e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json
index 3f72fb446001b9309f73f5ecea1c404def25837a..08ce60088435c15f279fe790d8bf72a7ac95af6e 100644 (file)
--- 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 (file)
index 0000000..8bc0d30
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json
index 3f72fb446001b9309f73f5ecea1c404def25837a..08ce60088435c15f279fe790d8bf72a7ac95af6e 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.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/janitor.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..77eb214
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json
index 1fb9cf1b666b172121baa7ca2b6162a2a6325da8..8384c705b910ede2befe33015b03dbdd0ae0b8e1 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.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/medical.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..a495f1d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json
index 3f72fb446001b9309f73f5ecea1c404def25837a..08ce60088435c15f279fe790d8bf72a7ac95af6e 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.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/roboticist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..2d89552
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
index 16b45eec87da12c1468b1a7c09f15286fa7924a2..fa0b5a36dde06608ad49b418462e180698ebd4d9 100644 (file)
--- 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 (file)
index 0000000..c919509
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json
index da8e85d0a128c7e51361e5f6c918eb2ea68412ea..fef223e0925cfc4bb8aee13b4e4c85038a4c57cd 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.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/scientist.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..885809c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json
index 3f72fb446001b9309f73f5ecea1c404def25837a..08ce60088435c15f279fe790d8bf72a7ac95af6e 100644 (file)
--- 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 (file)
index 0000000..d22e70d
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/folded-equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
index 8fe98eacbe4f61fd6330ed00db24665e411e7c3c..e1ac2a6635b79f6ab603d1ee94b66c18a2931001 100644 (file)
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi. folded-equipped-INNERCLOTHING edited by Dutch-VanDerLinde",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "folded-equipped-INNERCLOTHING",
+      "directions": 4
+    },
     {
       "name": "overlay-inhand-left",
       "directions": 4