комбез и сложенное состояние

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -86,6 +86,7 @@
     foldVerbText: fold-verb-clothing-jacket
   - type: FoldableClothing
     foldedEquippedPrefix: folded
+    foldedHeldPrefix: folded
   - type: Sprite
     layers:
     - state: icon

Resources/Prototypes/_White/Fluff/fluff.yml

@@ -584,11 +584,11 @@
     - type: EyeProtection
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ClothingUniformBase, ClothingUniformFoldableBase]
   id: ClothingUniformJumpsuitSerafimSalvageSpecialist
-  name: комбинезон специалиста по утилизации
+  name: экспедиторская униформа
   suffix: fluff
-  description: Удобный прочный комбинезон. Особенно грязный.
+  description: Нестандартная форма экспедитора, специалиста сопровождающего рабочие процессы Карго и РНД отделов. На вороте имеется примечательная нашивка "corp.Embryo-Evolt".
   components:
     - type: Sprite
       sprite: White/Fluff/Serafim547/salvage.rsi

Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json

@@ -47,6 +47,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json

@@ -36,6 +36,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json

@@ -1,41 +1,49 @@
 {
-  "version": 1,
+    "version": 1,
-  "license": "CC-BY-SA-3.0",
+    "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, folded state by BIG_Zi_348",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, folded state by BIG_Zi_348",
-  "size": {
+    "size": {
-    "x": 32,
+        "x": 32,
-    "y": 32
+        "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
     },
-    {
+    "states": [
-      "name": "icon_folded"
+        {
-    },
+            "name": "icon"
-    {
+        },
-      "name": "equipped-INNERCLOTHING",
+        {
-      "directions": 4
+            "name": "icon_folded"
-    },
+        },
-    {
+        {
-      "name": "folded-equipped-INNERCLOTHING",
+            "name": "equipped-INNERCLOTHING",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "equipped-INNERCLOTHING-monkey",
+            "name": "folded-equipped-INNERCLOTHING",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "equipped-INNERCLOTHING-body-slim",
+            "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "inhand-left",
+            "name": "equipped-INNERCLOTHING-body-slim",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "inhand-right",
+            "name": "inhand-left",
-      "directions": 4
+            "directions": 4
-    }
+        },
-  ]
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json

@@ -1,41 +1,49 @@
 {
-  "version": 1,
+    "version": 1,
-  "license": "CC-BY-SA-3.0",
+    "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github). folded state made BIG_Zi_348",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github). folded state made BIG_Zi_348",
-  "size": {
+    "size": {
-    "x": 32,
+        "x": 32,
-    "y": 32
+        "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
     },
-    {
+    "states": [
-      "name": "icon_folded"
+        {
-    },
+            "name": "icon"
-    {
+        },
-      "name": "equipped-INNERCLOTHING",
+        {
-      "directions": 4
+            "name": "icon_folded"
-    },
+        },
-    {
+        {
-      "name": "folded-equipped-INNERCLOTHING",
+            "name": "equipped-INNERCLOTHING",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "equipped-INNERCLOTHING-monkey",
+            "name": "folded-equipped-INNERCLOTHING",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "equipped-INNERCLOTHING-body-slim",
+            "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "inhand-left",
+            "name": "equipped-INNERCLOTHING-body-slim",
-      "directions": 4
+            "directions": 4
-    },
+        },
-    {
+        {
-      "name": "inhand-right",
+            "name": "inhand-left",
-      "directions": 4
+            "directions": 4
-    }
+        },
-  ]
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/White/Clothing/Uniforms/Jumpsuit/clown_banana.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/White/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json

@@ -32,6 +32,14 @@
         {
             "name": "inhand-right",
             "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
         }
     ]
-}
+}

Resources/Textures/White/Fluff/Serafim547/salvage.rsi/meta.json

@@ -1,34 +1,45 @@
 {
-  "version": 1,
+    "version": 1,
-  "license": "CC-BY-SA-3.0",
+    "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
-  "size": {
+    "size": {
-    "x": 32,
+        "x": 32,
-    "y": 32
+        "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
     },
-    {
+    "states": [
-      "name": "equipped-INNERCLOTHING",
+        {
-      "directions": 4
+            "name": "icon"
-    },
+        },
-    {
+        {
-      "name": "equipped-INNERCLOTHING-monkey",
+            "name": "icon_folded"
-      "directions": 4
+        },
-    },
+        {
-    {
+            "name": "equipped-INNERCLOTHING",
-      "name": "equipped-INNERCLOTHING-body-slim",
+            "directions": 4
-      "directions": 4
+        },
-    },
+        {
-    {
+            "name": "folded-equipped-INNERCLOTHING",
-      "name": "inhand-left",
+            "directions": 4
-      "directions": 4
+        },
-    },
+        {
-    {
+            "name": "equipped-INNERCLOTHING-monkey",
-      "name": "inhand-right",
+            "directions": 4
-      "directions": 4
+        },
-    }
+        {
-  ]
+            "name": "inhand-left",
-}
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "folded-inhand-right",
+            "directions": 4
+        }
+    ]
+}