diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl index 5844b45264..6a54078c6d 100644 --- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl +++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl @@ -12,8 +12,5 @@ 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 - fold-lower-visor-verb = Lower visor fold-raise-visor-verb = Raise visor diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 287dcb80c8..67edfa9c26 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -68,7 +68,7 @@ components: - type: Foldable canFoldInsideContainer: true - unfoldVerbText: unfold-verb-clothing-jacket - foldVerbText: fold-verb-clothing-jacket + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb - type: FoldableClothing foldedEquippedPrefix: folded diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index a49ad4d289..aff43f8970 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -512,7 +512,7 @@ sprite: Clothing/Uniforms/Jumpsuit/qm.rsi - type: entity - parent: [ClothingUniformBase, BaseCommandContraband] + parent: [ClothingUniformBase, ClothingUniformFoldableBase, BaseCommandContraband] id: ClothingUniformJumpsuitQMTurtleneck name: quartermasters's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/folded-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..e5760a7902 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/folded-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json index f92fbbeffd..9e445cdc4f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/meta.json @@ -1,26 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Derived from qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Derived from qmturtleneck sprite from beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/a11e7468ca552cfc97c9164c69ccdafff09e794c and modified by Emisse for Space Station 14", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-INNERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "folded-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] }