From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Wed, 28 Aug 2024 09:43:30 +0000 (+0200)
Subject: Add black suspenders (#29055)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=512d27ca6b452ede774e3921d1baf09f59cc1a2d;p=space-station-14.git

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 b7e8616da2..92c3bb9d61 100644
--- 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 d922056a8b..6a109fbf8e 100644
--- 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 0613ec9726..41e89eef61 100644
--- 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 58586f3216..8bd9d8ca30 100644
--- 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 0d137b488b..f5c78f3c17 100644
--- 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 aab58d0ef4..b2e9ca81cc 100644
--- 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 b50e49fede..21ee9aa311 100644
--- 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 6d3826f701..73d65b0394 100644
--- 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 4fc851a347..27391898c7 100644
--- 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 bfdf92b5dd..de8a900f8e 100644
--- 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
index 0000000000..f2ab9dc222
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
index 0000000000..7dfbd79d89
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
index 0000000000..c9e814f9e0
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
index 0000000000..f9612ce3b8
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
index 0000000000..8fe7c515b7
--- /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 55d91a0e68..9b5290f511 100644
--- 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