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 a22c5290cb4d614573f72610762b3fb729b14d96..4ca0ac3a744badac9ea5b3045354b533a89c9ca2 100644 (file)
--- 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 fb839149ea212f28442fb511c86951a7f60c800d..9b0e9583ee6f75c6cf5ae63388b9db32cb170145 100644 (file)
--- 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 3c034a66741c17d9eb144ff57baf258df32449d3..a7ab4d3e23976f252e2bae21cb40366d42e0d2aa 100644 (file)
--- 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 f22c420eaec5942ec30f3d24af17a8060cbbebd8..ac9261198490330ce445304538f9b081e8f068ab 100644 (file)
--- 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 566e33e3f31954aebc15027bdac74a7454d18b95..b1d14dbe6c15a45f5b3588f2e9bc79fad4b87982 100644 (file)
--- 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 (file)
index 0000000..c919728
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 (file)
index 0000000..b03816e
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 (file)
index 0000000..ee1997c
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 (file)
index 0000000..4c59df7
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 (file)
index 0000000..1f8ff31
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 (file)
index 0000000..8591b0f
--- /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 (file)
index 0000000..3fa68c1
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 (file)
index 0000000..6332595
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 (file)
index 0000000..e5c39a7
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 (file)
index 0000000..014ac5f
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 (file)
index 0000000..7f5c613
--- /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
+    }
+  ]
+}