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 flowers to loadout #32097

Merged
merged 9 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
11 changes: 11 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,14 @@
- WhitelistChameleon
- type: StaticPrice
price: 1

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHairflower
name: hairflower
description: A beautiful hairflower that can be inserted between the locks of hair.
JustArt1m marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
sprite: Clothing/Head/Misc/hairflower.rsi
- type: Clothing
sprite: Clothing/Head/Misc/hairflower.rsi
13 changes: 13 additions & 0 deletions Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,19 @@
department: Command
time: 3600 # 1 hour

# Flowers
- type: loadout
id: FlowerWreath
storage:
back:
- ClothingHeadHatFlowerWreath

- type: loadout
id: Hairflower
storage:
back:
- ClothingHeadHatHairflower

# Plushies
- type: loadout
id: PlushieLizard
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
minLimit: 0
maxLimit: 3
loadouts:
- FlowerWreath
- Hairflower
- PlushieLizard
- PlushieSpaceLizard
- Lighter
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.
18 changes: 18 additions & 0 deletions Resources/Textures/Clothing/Head/Misc/hairflower.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "icon sprited by Just_Art, equipped-HELMET sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
Loading