From: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Date: Sat, 10 Feb 2024 08:41:54 +0000 (-0500) Subject: QM drip DLC (#24477) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=400036b9624620900012e891b230ab6029d9bc22;p=space-station-14.git QM drip DLC (#24477) * New Drip for the QM QM beret and QM formal uniform * Asd Asd * Adds the new clothing to the uniform printer what it says on the tin * I always forget to update the copyright RAAAAAH yup --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index a22c5290cb..4ca0ac3a74 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -77,6 +77,8 @@ contents: - id: ClothingNeckCloakQm - id: ClothingHeadsetCargo + - id: ClothingHeadHatBeretQM + - id: ClothingUniformJumpsuitQMFormal - id: ClothingUniformJumpsuitQMTurtleneck - id: ClothingUniformJumpskirtQMTurtleneck - id: ClothingHandsGlovesColorBrown diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index fb839149ea..9b0e9583ee 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -84,6 +84,22 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretQM + name: quartermaster's beret + description: A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_qm.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_qm.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretHoS diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 3c034a6674..a7ab4d3e23 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -493,6 +493,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitQMFormal + name: quartermasters's formal suit + description: Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector @@ -1447,4 +1458,4 @@ - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi \ No newline at end of file + sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index f22c420eae..ac92611984 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -929,10 +929,12 @@ - ClothingUniformJumpsuitPrisoner - ClothingUniformJumpskirtPrisoner - ClothingHeadHatQMsoft + - ClothingHeadHatBeretQM - ClothingUniformJumpsuitQM - ClothingUniformJumpskirtQM - ClothingUniformJumpsuitQMTurtleneck - ClothingUniformJumpskirtQMTurtleneck + - ClothingUniformJumpsuitQMFormal - ClothingHeadHatBeretRND - ClothingUniformJumpsuitResearchDirector - ClothingUniformJumpskirtResearchDirector diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 566e33e3f3..b1d14dbe6c 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -474,6 +474,13 @@ materials: Cloth: 300 +- type: latheRecipe + id: ClothingUniformJumpsuitQMFormal + result: ClothingUniformJumpsuitQMFormal + completetime: 4 + materials: + Cloth: 300 + - type: latheRecipe id: ClothingUniformJumpskirtQM result: ClothingUniformJumpskirtQM @@ -979,6 +986,14 @@ Cloth: 100 Durathread: 50 +- type: latheRecipe + id: ClothingHeadHatBeretQM + result: ClothingHeadHatBeretQM + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + - type: latheRecipe id: ClothingHeadHatBeretCmo result: ClothingHeadHatBeretCmo diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..c9197282c6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..b03816eeb6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png new file mode 100644 index 0000000000..ee1997cc96 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png new file mode 100644 index 0000000000..4c59df7550 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png new file mode 100644 index 0000000000..1f8ff31024 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json new file mode 100644 index 0000000000..8591b0feab --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, recoloured by Hanzdegloker", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3fa68c11d4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png new file mode 100644 index 0000000000..6332595226 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png new file mode 100644 index 0000000000..e5c39a74eb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png new file mode 100644 index 0000000000..014ac5f9ec Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json new file mode 100644 index 0000000000..7f5c61326f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Spritework done by Hanzdegloker", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}