From ba23ea370d031cde4ba2a2e5dc1842bd8bcb4eeb Mon Sep 17 00:00:00 2001 From: Tiniest Shark Date: Thu, 13 Aug 2026 12:21:27 +0000 Subject: [PATCH] QM Turtleneck Tactical Switch (#45242) The pant legs can now be removed. --- .../components/foldable-component.ftl | 3 -- .../Uniforms/base_clothinguniforms.yml | 4 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../folded-equipped-INNERCLOTHING.png | Bin 0 -> 982 bytes .../Uniforms/Jumpsuit/qmturtle.rsi/meta.json | 50 ++++++++++-------- 5 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi/folded-equipped-INNERCLOTHING.png 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 0000000000000000000000000000000000000000..e5760a79022ca7bc311ca7b5831337b8448767a4 GIT binary patch literal 982 zcmV;{11bE8P)Px&kV!;ARCt{2n$1faK^VrLZ5yekq6SG0u1C!w1kytY6_3)eAjMNpJ@*jr1))Mq zdMtQK4n6k|5D6?PUIHZ&Ja`y#Fdn-_45AjQ6oPCI?Mx>hCV9u*joA5JWMx)VaG#br+ib3tLzPjiFK%vwy`d#x2u9c35uz%PRt*Sn$L#KE)6Gge!ymb&N z`g8L!eE)VLT2=i=6!Enc6WhBEBGWTS$IrooiA>J`Xku-}1OV3$6S)4r!M3;D6srCM zs`%Q9iE^!p$n;EGE8pjD$}433x%rqFY-g*YKhS{n)kQZQ54BxO$3qyO9BXSk?|WrJ zFa1GK^oN=ObMrBro?MD`b`$%DE%BDTq;s8nso!@G=w5e&;p@_i{U8Yafir-M4?B=T zsbTOp;RSx{_niR;XR|oi<7bVb9(bF6qtNebK($&`n!c+2Mxj5{CU~DAIlQ#AB>uE~ ze)|wl7M|nh(HFe>a4kOL)!QGWe-l*wp}z?NKq{3I#~(`oa10;`=`yO-D&>(RQmGV@ z$>fdq8DnI9k^ultLxEJfIi|$T-*_E}knW*yf$OiCiZMoJ&cp`+$s}{l&f6jxb5Gj-zMlWsEj5Nsr zK6sv!ADqiF)Zs1Ha5Cb;*2rW>vhueNCs3Y6$5|^K$sxs>g8;$U;Nc@ zEz5#wnr*52dcDqL92)W-P^nZ5?sCwB=M;-YgJ+3(3@U>M6gR;{A|Z}dD>J-6)|O+U zpj06u2QbRKycgQa25|8pr@jo=&E;~w{|BnkXf*eh-@w`wxa}fVs{jB107*qoM6N<$ Ef)QTMLI3~& literal 0 HcmV?d00001 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 + } + ] }