Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add black suspenders #29055

Merged
merged 8 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/preferences/loadout-groups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
- id: ClothingUniformJumpskirtOldDress
- id: BikeHorn
- id: ClownRecorder
- id: ClothingBeltSuspenders
- id: ClothingBeltSuspendersRed
- id: ClothingBeltSuspendersBlack

- type: entity
id: CrateServiceCustomSmokable
Expand Down
18 changes: 14 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
- id: ClothingMaskRaven
- id: ClothingMaskJackal
- id: ClothingMaskBat
- id: ClothingBeltSuspenders
- id: ClothingBeltSuspendersRed
- id: ClothingBeltSuspendersBlack
- id: ClothingEyesEyepatch
- id: ClothingEyesGlasses
- id: ClothingHandsGlovesLatex
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,14 @@
id: MimeWintercoat
equipment:
outerClothing: ClothingOuterWinterMime

# Belt
- type: loadout
id: MimeSuspendersRed
equipment:
belt: ClothingBeltSuspendersRed

- type: loadout
id: MimeSuspendersBlack
equipment:
belt: ClothingBeltSuspendersBlack
7 changes: 7 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
- MimeJumpsuit
- MimeBackpack
- MimeOuterClothing
- MimeBelt
- Glasses
- SurvivalMime
- Trinkets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
- type: startingGear
id: MimeGear
equipment:
belt: ClothingBeltSuspenders
gloves: ClothingHandsGlovesColorWhite
shoes: ClothingShoesColorWhite
pocket1: CrayonMime
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/Clothing/Belt/suspenders_black.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
3 changes: 3 additions & 0 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -404,5 +404,8 @@ FoodMeatHawaiianKebab: FoodKebabSkewer
FoodMeatKebab: FoodKebabSkewer
FoodMeatFiestaKebab: FoodKebabSkewer

#2024-08-14
ClothingBeltSuspenders: ClothingBeltSuspendersRed

# 2024-08-19
ClothingNeckShockCollar: ClothingBackpackElectropack
Loading