Skip to content

feat: Musicians now have the performer set in loadout #901

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

Merged
Psymbiote merged 8 commits into from
Jun 27, 2026
Merged

feat: Musicians now have the performer set in loadout #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0356810
use the meatspike
bruhmogus Jun 9, 2026
42c07e8
Merge branch 'main' of https://github.com/bruhmogus/fbi-starcup
bruhmogus Jun 18, 2026
b577de7
Added loadout options for the Performer set for the musician
bruhmogus Jun 22, 2026
45b81c6
Properly add MusicianHead loadout
bruhmogus Jun 22, 2026
459862b
fixes impossible loadout restriction
bruhmogus Jun 22, 2026
287385a
Revert "use the meatspike"
bruhmogus Jun 22, 2026
796c884
Merge branch 'teamstarcup:main' into matsunefujita
bruhmogus Jun 22, 2026
13acb87
Merge branch 'teamstarcup:main' into matsunefujita
bruhmogus Jun 26, 2026
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/_starcup/preferences/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ loadout-group-mime-shoes = Mime shoes

loadout-group-musician-glasses = Musician glasses
loadout-group-musician-shoes = Musician shoes
loadout-group-musician-head = Musician head

loadout-group-passenger-glasses = Passenger eyewear

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@
- ClothingUniformMrSpaceWideSkirt
- ClothingUniformNightclubSuit
- ClothingUniformNightclubSuitSkirt
- PerformerJumpskirt
# end starcup

- type: loadoutGroup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@
id: JobMusician
canCustomizeName: true
groups:
- MusicianHead # starcup
- Scarfs # starcup
- MusicianJumpsuit
- CommonBackpack
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_starcup/Loadouts/Jobs/Service/musician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@
id: ClothingUniformMrSpaceWideSkirt
equipment:
jumpsuit: ClothingUniformMrSpaceWideSkirt

- type: loadout
id: PerformerJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtPerformer
9 changes: 9 additions & 0 deletions Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@
- BlackHeels
- HighHeels
- WinterBoots
- PerformerBoots

- type: loadoutGroup
parent: [ Glasses ]
Expand All @@ -310,6 +311,14 @@
- Sunglasses
- Mirrorshades

- type: loadoutGroup
id: MusicianHead
name: loadout-group-musician-head
minLimit: 0
maxLimit: 1
loadouts:
- PerformerWig

# Reporter
- type: loadoutGroup
id: ReporterShoes
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,8 @@
id: SyndieCap
equipment:
head: ClothingHeadHatSyndie

- type: loadout
id: PerformerWig
equipment:
head: ClothingHeadPerformerWig
7 changes: 7 additions & 0 deletions Resources/Prototypes/_starcup/Loadouts/Miscellaneous/shoes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,10 @@
equipment:
shoes: ClothingShoesBootsCowboyWhite
groupBy: "cowboyboots"

# Special

- type: loadout
id: PerformerBoots
equipment:
shoes: ClothingShoesBootsPerformer
Loading