Skip to content

Remove departmental clown items #22

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

Open
CombustibleToast wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Remove departmental clown items #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc645bf
remove clown stuff. I removed too much and something broke
CombustibleToast Feb 13, 2026
937e38f
undelete masks for base mask usage
CombustibleToast Feb 13, 2026
0c938c5
comment out all the meme masks
CombustibleToast Feb 13, 2026
73deff2
uncomment basic clown mask tag
CombustibleToast Feb 13, 2026
19bec3b
readd chaplain mask
CombustibleToast Feb 13, 2026
e7587c0
remove clown clothes from drobes
CombustibleToast Feb 13, 2026
b8e8b36
comment out clown expert role timers
CombustibleToast Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@
ClothingNeckScarfStripedBlack: 2 # imp
contrabandInventory:
ToyFigurineBartender: 1
ClothingMaskClownService: 1 # imp
ClothingOuterApronClown: 1 # imp

1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@
ToyFigurineCargoTech: 1
ToyFigurineSalvage: 1
ToyFigurineQuartermaster: 1
ClothingMaskClownCargo: 1 # imp
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
ClothingNeckScarfStripedRed: 2
contrabandInventory:
ToyFigurineChef: 1
ClothingMaskClownService: 1 # imp
ClothingOuterApronClown: 1 # imp
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
contrabandInventory:
ClothingMaskClownEngineer: 1 # imp
ClothingUniformCybersunHazard: 1 # DeltaV
ToyFigurineEngineer: 1
ToyFigurineChiefEngineer: 1
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
ClothingHeadsetService: 2
ClothingOuterWinterHydro: 2
contrabandInventory:
ClothingMaskClownService: 1
ClothingOuterApronClown: 1
ToyFigurineBotanist: 1
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
contrabandInventory:
ClothingHeadHatSurgcapCybersun: 1 # DeltaV
ClothingOuterCoatCybersunWindbreaker: 1 # DeltaV
ClothingMaskClownMedical: 1 # imp
UniformScrubsColorCybersun: 1
ClothingUniformJumpskirtOfLife: 1
ToyFigurineMedicalDoctor: 1
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
ClothingOuterWinterRobo: 2
ClothingNeckScarfStripedBlack: 2
ClothingShoesBootsWinterRobo: 2
contrabandInventory:
ClothingMaskClownRobotics: 1
# contrabandInventory: # QB

1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
ClothingNeckScarfStripedPurple: 3
ClothingShoesBootsWinterSci: 2
contrabandInventory:
ClothingMaskClownScience: 1 # imp
ClothingUniformCybersunRND: 1 # DeltaV
ToyFigurineResearchDirector: 1
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
ClothingNeckCloakBlanketShock: 2
# end imp additions
contrabandInventory:
ClothingMaskClownSecurity: 1
ClothingMaskMimeSecurity: 1
ToyFigurineSecurity: 1
ToyFigurineWarden: 1
Expand Down
10 changes: 0 additions & 10 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@
- BartenderVest
- BartenderApron
- BartenderCuteApron # imp
- ServiceClownApron # imp
- BartenderWintercoat

- type: loadoutGroup
Expand All @@ -383,7 +382,6 @@
minLimit: 0
loadouts:
- ChefMask
- ServiceClown # imp

- type: loadoutGroup
id: ChefJumpsuit
Expand All @@ -402,7 +400,6 @@
loadouts:
- ChefApron
- ChefCuteApron # imp
- ServiceClownApron # imp
- ChefJacket
- ChefWintercoat

Expand Down Expand Up @@ -617,7 +614,6 @@
loadouts:
- BotanistApron
- BotanistWintercoat
- ServiceClownApron # imp

- type: loadoutGroup
id: ClownHead
Expand Down Expand Up @@ -881,7 +877,6 @@
loadouts:
- BlackShoes
- CargoWinterBoots
- CargoClownShoes # imp

- type: loadoutGroup
id: CargoTechnicianID
Expand Down Expand Up @@ -1009,7 +1004,6 @@
loadouts:
- WorkBoots
- EngineeringWinterBoots
- EngineerClownShoes # imp

- type: loadoutGroup
id: StationEngineerID
Expand Down Expand Up @@ -1172,7 +1166,6 @@
- BlackShoes
- ScienceWinterBoots
- RoboticistWinterBoots # imp
- ScientistClownShoes # imp

- type: loadoutGroup
id: ScientistGloves
Expand Down Expand Up @@ -1332,7 +1325,6 @@
loadouts:
- JackBoots
- SecurityWinterBoots
- SecurityClownShoes # imp

- type: loadoutGroup
id: SecurityPDA
Expand Down Expand Up @@ -1521,7 +1513,6 @@
loadouts:
- WhiteShoes
- MedicalWinterBoots
- DoctorClownShoes # imp

- type: loadoutGroup
id: MedicalDoctorPDA
Expand All @@ -1544,7 +1535,6 @@
minLimit: 0
loadouts:
- SterileMask
- DoctorClown # imp

- type: loadoutGroup
id: MedicalInternJumpsuit
Expand Down
14 changes: 0 additions & 14 deletions Resources/Prototypes/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
id: JobBartender
groups:
- BartenderHead
- ServiceMask # imp
- BartenderNeck # imp
- BartenderJumpsuit
- BartenderOuterClothing
Expand All @@ -110,7 +109,6 @@
- type: roleLoadout
id: JobServiceWorker
groups:
- ServiceMask # imp
- GroupTankHarness
- BartenderJumpsuit
- BartenderShoes # imp
Expand Down Expand Up @@ -199,7 +197,6 @@
id: JobJanitor
groups:
- JanitorHead
- JanitorMask # imp
- JanitorNeck # imp
- JanitorJumpsuit
- JanitorOuterClothing # imp reorder
Expand All @@ -219,7 +216,6 @@
id: JobBotanist
groups:
- BotanistHead
- ServiceMask # imp
- BotanistNeck # imp
- BotanistJumpsuit
- BotanistOuterClothing
Expand Down Expand Up @@ -314,7 +310,6 @@
id: JobCargoTechnician
groups:
- CargoTechnicianHead
- CargoTechnicianMask # imp
- CargoTechnicianNeck # imp
- CargoTechnicianJumpsuit
- CargoTechnicianOuterClothing
Expand All @@ -333,7 +328,6 @@
- type: roleLoadout
id: JobSalvageSpecialist
groups:
- CargoTechnicianMask # imp
- SalvageSpecialistNeck # imp
- SalvageSpecialistJumpsuit # imp unspecial
- SalvageSpecialistOuterClothing
Expand Down Expand Up @@ -382,7 +376,6 @@
id: JobStationEngineer
groups:
- StationEngineerHead
- StationEngineerMask # imp
- StationEngineerNeck # imp
- StationEngineerJumpsuit
- StationEngineerOuterClothing
Expand All @@ -400,7 +393,6 @@
id: JobAtmosphericTechnician
groups:
- AtmosphericTechnicianHead # imp
- StationEngineerMask # imp
- AtmosphericTechnicianNeck # imp
- AtmosphericTechnicianJumpsuit
- AtmosphericTechnicianOuterClothing
Expand Down Expand Up @@ -438,7 +430,6 @@
id: JobScientist
groups:
- ScientistHead
- ScientistMask # imp
- ScientistNeck
- ScientistJumpsuit
- ScientistOuterClothing
Expand Down Expand Up @@ -472,7 +463,6 @@
id: JobHeadOfSecurity
groups:
- HeadofSecurityHead
- SecurityMask # imp
- HeadofSecurityNeck
- HeadofSecurityJumpsuit
- HeadofSecurityOuterClothing
Expand All @@ -495,7 +485,6 @@
id: JobWarden
groups:
- WardenHead
- SecurityMask # imp
- WardenNeck # imp
- WardenJumpsuit
- WardenOuterClothing
Expand All @@ -518,7 +507,6 @@
id: JobSecurityOfficer
groups:
- SecurityHead
- SecurityMask # imp
- SecurityNeck # imp
- SecurityJumpsuit
- SecurityOuterClothing
Expand Down Expand Up @@ -680,7 +668,6 @@
- type: roleLoadout
id: JobReporter
groups:
- ServiceMask # imp
- ReporterNeck # imp
- ReporterJumpsuit
- ReporterShoes # imp
Expand All @@ -697,7 +684,6 @@
id: JobPsychologist
groups:
- PsychologistHead # imp
- PsychologistMask # imp
- PsychologistNeck # imp
- PsychologistJumpsuit
- PsychologistOuterClothing # DeltaV
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/_Impstation/Catalog/VendingMachines/Inventories/courierdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
ClothingNeckScarfStripedBrown: 3
ClothingNeckScarfStripedBlue: 3
ClothingShoesBootsWinterCourier: 2
contrabandInventory:
ClothingMaskClownCargo: 1
# contrabandInventory: # QB
3 changes: 1 addition & 2 deletions Resources/Prototypes/_Impstation/Catalog/VendingMachines/Inventories/salvdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@
ClothingOuterDecapoidCoatSanctioned: 2
ClothingNeckScarfStripedPurple: 3 #purple propaganda
ClothingShoesBootsWinterColorPurple: 3 #purple propaganda
contrabandInventory:
ClothingMaskClownCargo: 1
# contrabandInventory: # QB
Loading
Loading