From 512d27ca6b452ede774e3921d1baf09f59cc1a2d Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 28 Aug 2024 11:43:30 +0200 Subject: [PATCH] Add black suspenders (#29055) * Black suspenders * fix * fix linter --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Catalog/Fills/Crates/service.yml | 3 +- .../Entities/Clothing/Belt/belts.yml | 18 +++++++++--- .../Markers/Spawners/Random/maintenance.yml | 3 +- .../Loadouts/Jobs/Civilian/mime.yml | 11 ++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 +++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Graphs/clothing/mime_hardsuit.yml | 2 +- .../Recipes/Crafting/Graphs/bots/mimebot.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/mime.yml | 1 - .../suspenders_black.rsi/equipped-BELT.png | Bin 0 -> 345 bytes .../Belt/suspenders_black.rsi/icon.png | Bin 0 -> 557 bytes .../Belt/suspenders_black.rsi/inhand-left.png | Bin 0 -> 425 bytes .../suspenders_black.rsi/inhand-right.png | Bin 0 -> 437 bytes .../Belt/suspenders_black.rsi/meta.json | 26 ++++++++++++++++++ .../equipped-BELT.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 Resources/migration.yml | 3 ++ 21 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/equipped-BELT.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/icon.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/Belt/{suspenders.rsi => suspenders_red.rsi}/meta.json (100%) 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 0000000000000000000000000000000000000000..f2ab9dc222a8cbd6378df172a3e173c684915627 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_nlM zPZ!6KinzD8F7h@jh_oiYy<1I`=hRc_{hnO)t!RZed%oAzrm`1s%(FD%+oxQWH*L%8 zVn37RDY}b4t8O(CV`LFZL|J;L!|k-$h%kHe|jAJm!4lYgZ)SGh?%OCY_V)T6?3H~@ zUJ583C>fE(j&BMS443`M207*__g0{~uyr1t+tC+=Nk*raOOGIu7Ku%%;f4sjr zouF&THI+^#=UzjQgBYVysW`{w)pfEC;v(b_lIuXVTHOk!1GeqcnY>-g{K5htgkwA& zCm0~&PV4o$w_GlhnE8BO=&@y zI-RD-SrWa*x=4tS*Y@?XYvjt5;OO`yUJnoT2@nh?T;xi*b@{%Zc{L@u v{u*Wk6u!Va3e0WAJL0jzlmbcz_U^zRLjeE=$0)9<00000NkvXXu0mjfSqAT{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c9e814f9e041f764145b3a73d1cde54883724c82 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s7x zPZ!6KinzD8Y>Qe9c-j)xMQuw8*x%Ljykn64QZoA|*V&wjDQRCHpFID%D@pY&;N@L}(mu~&N?{?+9cb3aCt9TAyI98Z*d)v;>HQSGU=VH)} zQ{MFBdBy4Qz--Qjdwbff6oa-Ljo#<6ZhewB!TBY*y+=85yVJDUDyG04t;{i&r*!RGkKmkeP6{dyNZ?z}7WQSR_k zW|#LYE)Q&qmorsF8EkscbHjvTx5U$2*YinLdFKALPYr*4xVitp=g->0?dvw|F$%nz n&%5B0R&40oC$10JIcgXxjY=9H`*D8-hCPF)tDnm{r-UW|H22BR01_s7- zPZ!6KinzD8Hs&=Oh_oiE3tQ)W;M?;*`2*jEgXi2zwRU!`dUh*(hS=);%RLOw?UdhU zd_(bqfCB>~3ntN6ukv9-*4th0GG?i5$(3G~Y4rQv$sC#E$+x#{cwZfH{py*&Tbhoy zn@0HRKJyh_Kg)-~bJb*(>@36lGx@3JjE_t%8Le2Uxn7_sZ5^k<`Ok~r|DKig|J15G zr{;6zGrf428X1&)=hN>ychn9T@XY_uWcrTr)Y?BQw@;2?(%QEzb-|ufb2qaDIn?ws zFmWg}U?=L8Clp_J=sV3uYBSp&r3u>`HvhfLU{%!D`udT}Il(VCCxqL*XA787@nlJ~ zvZeclrCb6PFQ2jfINP*ey!vSVZbq;DjPEO!PQR1cpuOy=wTQ0m*``Yz>!vT@HOOmP zKR>ql&WhqsTqpe_ADeEu&im2LRFIXC