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.

Sign up for GitHub

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

Jump to bottom

Mirror: More good looking inventory part 2.2 (instruments version) #189

Merged
merged 2 commits into from
May 29, 2024
Merged

Mirror: More good looking inventory part 2.2 (instruments version) #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f68ca0
Cherry-picked commit 91aa6445714d6b833474fcb911c4c8555a54f799 from sp…
Apr 22, 2024
e2a7728
Merge branch 'master' into space-wizards_space-station-14_26090_2024-…
VMSolidus May 29, 2024
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
5 changes: 3 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatMagician
name: magician's top hat.
description: "A magician's top hat."
name: magician's tophat
description: "A magician's tophat."
components:
- type: Icon
sprite: Clothing/Head/Hats/magician.rsi
Expand All @@ -827,6 +827,7 @@
- type: Item
size: Small
sprite: Clothing/Head/Hats/magician.rsi
storedRotation: 0
- type: Storage
grid:
- 0,0,0,0
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
program: 125
- type: Item
size: Small
storedRotation: -90

- type: entity
parent: BaseHandheldInstrument
Expand Down Expand Up @@ -118,6 +119,7 @@
- type: Item
size: Small
sprite: Objects/Fun/Instruments/gunpet.rsi
storedRotation: -90
- type: Tag
tags:
- Sidearm
Expand All @@ -141,6 +143,7 @@
- type: Item
sprite: Objects/Fun/Instruments/bike_horn.rsi
size: Small
storedRotation: -90
- type: Clothing
sprite: Objects/Fun/Instruments/bike_horn.rsi
slots: [Belt]
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@
- type: Tag
tags:
- KeyedInstrument
- type: Item
size: Small

- type: entity
parent: BaseHandheldInstrument
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
sprite: Objects/Fun/Instruments/panflute.rsi
state: icon
- type: Item
size: Normal
size: Small
sprite: Objects/Fun/Instruments/panflute.rsi
- type: Tag
tags:
Expand All @@ -160,8 +160,9 @@
sprite: Objects/Fun/Instruments/ocarina.rsi
state: icon
- type: Item
size: Normal
size: Small
sprite: Objects/Fun/Instruments/ocarina.rsi
storedRotation: -90
- type: Tag
tags:
- WoodwindInstrument
Expand Down
Loading