Add black suspenders (#29055)

* Black suspenders

* fix

* fix linter

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index b7e8616da23b8a945a8b3a857173b3c8d51daf05..92c3bb9d61ec23b50e382809063b1bff6040b533 100644 (file)
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -80,6 +80,7 @@ loadout-group-mime-mask = Mime mask
 loadout-group-mime-jumpsuit = Mime jumpsuit
 loadout-group-mime-backpack = Mime backpack
 loadout-group-mime-outerclothing = Mime outer clothing
+loadout-group-mime-belt = Mime belt
 
 loadout-group-musician-jumpsuit = Musician jumpsuit
 loadout-group-musician-outerclothing = Musician outer clothing

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index d922056a8bf93393466ea33b5559d0e1d7d3afb4..6a109fbf8e4e62b8c777829d0cdf40eb12c4069a 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -91,7 +91,8 @@
     - id: ClothingUniformJumpskirtOldDress
     - id: BikeHorn
     - id: ClownRecorder
-    - id: ClothingBeltSuspenders
+    - id: ClothingBeltSuspendersRed
+    - id: ClothingBeltSuspendersBlack
 
 - type: entity
   id: CrateServiceCustomSmokable

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 0613ec972697e6f7b8dc6c37ab9ad0a69f13ec15..41e89eef612a58e0a8db5ef09ed90f5169741f82 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -672,20 +672,30 @@
 
 - type: entity
   parent: ClothingBeltBase
-  id: ClothingBeltSuspenders
-  name: suspenders
+  id: ClothingBeltSuspendersRed
+  name: red suspenders
   description: For holding your pants up.
   components:
   - type: Tag
     tags:
     - MimeBelt
   - type: Sprite
-    sprite: Clothing/Belt/suspenders.rsi
+    sprite: Clothing/Belt/suspenders_red.rsi
     state: icon
   - type: Clothing
-    sprite: Clothing/Belt/suspenders.rsi
+    sprite: Clothing/Belt/suspenders_red.rsi
     quickEquip: true
 
+- type: entity
+  parent: ClothingBeltSuspendersRed
+  id: ClothingBeltSuspendersBlack
+  name: black suspenders
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/suspenders_black.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/suspenders_black.rsi
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltWand

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 58586f321682468775b4adc4da88da36620e6124..8bd9d8ca30d190fc48cba6d4a1e1f051e0c286cf 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -39,7 +39,8 @@
         - id: ClothingMaskRaven
         - id: ClothingMaskJackal
         - id: ClothingMaskBat
-      - id: ClothingBeltSuspenders
+      - id: ClothingBeltSuspendersRed
+      - id: ClothingBeltSuspendersBlack
       - id: ClothingEyesEyepatch
       - id: ClothingEyesGlasses
       - id: ClothingHandsGlovesLatex

diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
index 0d137b488b8203399f3ec980be3df5ef6a2b0e7e..f5c78f3c17400005156f84f6c9f2933935bec123 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
@@ -62,3 +62,14 @@
   id: MimeWintercoat
   equipment:
     outerClothing: ClothingOuterWinterMime
+
+# Belt
+- type: loadout
+  id: MimeSuspendersRed
+  equipment:
+    belt: ClothingBeltSuspendersRed
+
+- type: loadout
+  id: MimeSuspendersBlack
+  equipment:
+    belt: ClothingBeltSuspendersBlack

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index aab58d0ef4baedff946bdb4b02e86710f5d2228d..b2e9ca81ccac5aefee6fcb382c353c877017fb27 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -482,6 +482,13 @@
   loadouts:
   - MimeWintercoat
 
+- type: loadoutGroup
+  id: MimeBelt
+  name: loadout-group-mime-belt
+  loadouts:
+  - MimeSuspendersRed
+  - MimeSuspendersBlack
+  
 - type: loadoutGroup
   id: SurvivalMime
   name: loadout-group-survival-mime

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index b50e49fede78081d08449437f7da7b2d2ca94831..21ee9aa311ffa3ba43799105b40b4eead68fa415 100644 (file)
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -173,6 +173,7 @@
   - MimeJumpsuit
   - MimeBackpack
   - MimeOuterClothing
+  - MimeBelt
   - Glasses
   - SurvivalMime
   - Trinkets

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml
index 6d3826f701ac18cf78ec59dfd03a0d2270404bf4..73d65b0394ae66439cc5765864b10083f4009dff 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/mime_hardsuit.yml
@@ -36,7 +36,7 @@
             - tag: MimeBelt
               name: suspenders
               icon:
-                sprite: Clothing/Belt/suspenders.rsi
+                sprite: Clothing/Belt/suspenders_red.rsi
                 state: icon
               doAfter: 1
     - node: mimeHardsuit

diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
index 4fc851a3476e899e95df5696163b3e154fd3e0ee..27391898c7bfc1835ab586ae4f41472240f14884 100644 (file)
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
@@ -13,7 +13,7 @@
         name: mime edition happy honk meal
       - tag: MimeBelt
         icon:
-            sprite: Clothing/Belt/suspenders.rsi
+            sprite: Clothing/Belt/suspenders_red.rsi
             state: icon
         name: suspenders
         doAfter: 2

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index bfdf92b5dd56aeb7d5e0de11400f5d0640f79cbc..de8a900f8e908b9755c97a2c275c23eb07a6bf9a 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -21,7 +21,6 @@
 - type: startingGear
   id: MimeGear
   equipment:
-    belt: ClothingBeltSuspenders
     gloves: ClothingHandsGlovesColorWhite
     shoes: ClothingShoesColorWhite
     pocket1: CrayonMime

diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..f2ab9dc
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/icon.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/icon.png
new file mode 100644 (file)
index 0000000..7dfbd79
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..c9e814f
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..f9612ce
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json
new file mode 100644 (file)
index 0000000..8fe7c51
--- /dev/null
+++ b/Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and resprited",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Clothing/Belt/suspenders.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/suspenders_red.rsi/equipped-BELT.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/suspenders.rsi/equipped-BELT.png
rename to Resources/Textures/Clothing/Belt/suspenders_red.rsi/equipped-BELT.png

diff --git a/Resources/Textures/Clothing/Belt/suspenders.rsi/icon.png b/Resources/Textures/Clothing/Belt/suspenders_red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/suspenders.rsi/icon.png
rename to Resources/Textures/Clothing/Belt/suspenders_red.rsi/icon.png

diff --git a/Resources/Textures/Clothing/Belt/suspenders.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/suspenders_red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/suspenders.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Belt/suspenders_red.rsi/inhand-left.png

diff --git a/Resources/Textures/Clothing/Belt/suspenders.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/suspenders_red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Belt/suspenders.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Belt/suspenders_red.rsi/inhand-right.png

diff --git a/Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json b/Resources/Textures/Clothing/Belt/suspenders_red.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Belt/suspenders.rsi/meta.json
rename to Resources/Textures/Clothing/Belt/suspenders_red.rsi/meta.json

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 55d91a0e687dd9f1b1dc06e1869616953a1aea74..9b5290f5112f1196b6b4ec4eb2bdf7cd21507cc8 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -404,5 +404,8 @@ FoodMeatHawaiianKebab: FoodKebabSkewer
 FoodMeatKebab: FoodKebabSkewer
 FoodMeatFiestaKebab: FoodKebabSkewer
 
+#2024-08-14
+ClothingBeltSuspenders: ClothingBeltSuspendersRed
+
 # 2024-08-19
 ClothingNeckShockCollar: ClothingBackpackElectropack