Skip to content

feat: add corporate jackets #903

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
Psymbiote wants to merge 11 commits into
base: main
Choose a base branch
from
Open

feat: add corporate jackets #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1d4552
Added corporate jacket sprites.
Mar 11, 2026
76dee91
Merge branch 'main' of https://github.com/teamstarcup/starcup into ad…
Mar 12, 2026
314f710
Merge branch 'main' of https://github.com/teamstarcup/starcup into ad…
Mar 13, 2026
cdc8f4b
Added Chalice versions of Cybersun and BC jackets, removed old BC jacket
Mar 14, 2026
9e1fb35
Merge branch 'main' of https://github.com/teamstarcup/starcup into ad…
Apr 17, 2026
698282d
Merge branch 'main' of https://github.com/teamstarcup/starcup into ad…
May 21, 2026
828fd88
Merge branch 'main' of https://github.com/teamstarcup/starcup into fe…
Jun 20, 2026
62aac48
Added Donk jacket, inhands, prototypes.
Jun 21, 2026
5ade48c
Added sprites, prototypes, loadouts, miant spawns.
Jun 23, 2026
82df009
Merge branch 'main' of https://github.com/teamstarcup/starcup into fe…
Jun 23, 2026
14851ff
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 23, 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/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
ClothingNeckScarfStripedLightBlue: 3
ClothingShoesBootsWinterAtmos: 2 # DeltaV - Add departmental winter boots
contrabandInventory:
ClothingCorpoJacketElectra: 1 # starcup
ToyFigurineAtmosTech: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
MailBag: 2
ClothingOuterSweaterLogistics: 3 # starcup
contrabandInventory:
ClothingCorpoJacketHawkmoon: 1 # starcup
ToyFigurineCargoTech: 1
ToyFigurineSalvage: 1
ToyFigurineQuartermaster: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@
ClothingShoesChef: 2
ClothingBeltChef: 2
contrabandInventory:
ClothingCorpoJacketHephaestus: 1 # starcup
ToyFigurineChef: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
ClothingHandsGlovesLatex: 1
ClothingShoesColorWhite: 1
contrabandInventory:
ClothingCorpoJacketInterdyne: 1 # starcup
ToyFigurineChemist: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@
contrabandInventory:
FoodSnackDanDanNoodles: 3
FoodBakedBunHoney: 3
ClothingCorpoJacketDiscountDans: 1 # starcup
1 change: 1 addition & 0 deletions 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,5 +18,6 @@
ClothingShoesBootsWinterEngi: 2
ClothingOuterSweaterEngineering: 3 # starcup
contrabandInventory:
ClothingCorpoJacketDonkChef: 1 # starcup
ToyFigurineEngineer: 1
ToyFigurineChiefEngineer: 1
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
PillCanisterTricordrazine: 2
contrabandInventory:
PillCanisterRandom: 1
ClothingCorpoJacketInterdyne: 1 # starcup

# All access version. Should reflect the stock of NanoMedInventory, but less powerful
- type: vendingMachineInventory
Expand All @@ -26,6 +27,7 @@
PillTricordrazine: 10
contrabandInventory:
PillCanisterRandom: 1
ClothingCorpoJacketInterdyne: 1 # starcup

# Core medical supply vendor
- type: vendingMachineInventory
Expand Down Expand Up @@ -56,6 +58,7 @@
PillCanisterRandom: 3
PillSpaceDrugs: 3
FoodApple: 1
ClothingCorpoJacketInterdyne: 1 # starcup

# All access version. Should reflect NanoMedCivilianWallInventory, but with more stock
- type: vendingMachineInventory
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
ClothingOuterSweaterMedical: 2 # starcup
contrabandInventory:
ClothingUniformJumpskirtOfLife: 1
ClothingCorpoJacketInterdyne: 1 # starcup
ToyFigurineMedicalDoctor: 1
ToyFigurineParamedic: 1
ToyFigurineChiefMedicalOfficer: 1
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
ChemistryBottleCrystalLatticeNanites: 2
# end starcup
contrabandInventory:
ClothingCorpoJacketDonkRoboticist: 1 # starcup
FoodBurgerRobot: 1
1 change: 1 addition & 0 deletions 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,4 +17,5 @@
ClothingShoesBootsWinterSci: 2
ClothingOuterSweaterScience: 3 # starcup
contrabandInventory:
ClothingCorpoJacketDonkRoboticist: 1 # starcup
ToyFigurineResearchDirector: 1
18 changes: 18 additions & 0 deletions Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,24 @@
- id: ClothingShoesTourist
- id: ClothingUniformJumpsuitLoungewear
- id: ClothingHeadHatCowboyRed
# begin starcup: corporate jackets
- id: ClothingCorpoJacketDiscountDans
- id: ClothingCorpoJacketGilthari
- id: ClothingCorpoJacketHephaestus
- id: ClothingCorpoJacketScarab
- id: ClothingCorpoJacketStarship
- id: ClothingCorpoJacketBishop
- !type:GroupSelector # rarer than the other jackets but not rare enouch for the uncommon thing
children:
- id: ClothingCorpoJacketCybersun
- id: ClothingCorpoJacketCybersunChalice
- id: ClothingCorpoJacketHawkmoon
- id: ClothingCorpoJacketInterdyne
- id: ClothingCorpoJacketElectra
- id: ClothingCorpoJacketDonkChef
- id: ClothingCorpoJacketDonkRoboticist
- id: ClothingCorpoJacketFPA
# end starcup
# Uncommon Group
- !type:GroupSelector
weight: 23
Expand Down
25 changes: 21 additions & 4 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 @@ -172,8 +172,11 @@
loadouts:
- CaptainOuterClothing
- CaptainWintercoat
- CommandSweater # starcup
- TrenchCoat # starcup
# begin starcup
- CommandSweater
- TrenchCoat
- CorpoJacketCybersun
# end starcup

#- type: loadoutGroup
# id: CaptainJobTrinkets
Expand Down Expand Up @@ -223,8 +226,11 @@
minLimit: 0
loadouts:
- HoPWintercoat
- CommandSweater # starcup
- TrenchCoat # starcup
# begin starcup
- CommandSweater
- TrenchCoat
- CorpoJacketCybersun
# end starcup

#- type: loadoutGroup
# id: HoPJobTrinkets
Expand Down Expand Up @@ -448,6 +454,7 @@
- BartenderApron
- BartenderWintercoat
- BartenderCuteApron # imp
- CorpoJacketGilthari # starcup

- type: loadoutGroup
id: BartenderJobTrinkets
Expand Down Expand Up @@ -494,6 +501,7 @@
- ChefJacket
- ChefWintercoat
- ChefCuteApron # imp
- CorpoJacketDonkChef # starcup

#- type: loadoutGroup
# id: ChefJobTrinkets
Expand Down Expand Up @@ -705,6 +713,7 @@
loadouts:
- BotanistApron
- BotanistWintercoat
- CorpoJacketInterdyne # starcup

#- type: loadoutGroup
# id: BotanistJobTrinkets
Expand Down Expand Up @@ -945,6 +954,7 @@
- QuartermasterLongcoat # DeltaV - Longcoats
- QuartermasterWintercoat
- TrenchCoat # starcup
- CorpoJacketHawkmoon # starcup

- type: loadoutGroup
parent: CargoTechnicianShoes # starcup
Expand Down Expand Up @@ -1002,6 +1012,7 @@
- CargoTechnicianWintercoat
- LogisticsSweater # starcup
- BomberJacket # starcup
- CorpoJacketHawkmoon # starcup

- type: loadoutGroup
id: CargoTechnicianShoes
Expand Down Expand Up @@ -1044,6 +1055,7 @@
minLimit: 0
loadouts:
- SalvageSpecialistWintercoat
- CorpoJacketHawkmoon # starcup

- type: loadoutGroup
parent: CargoTechnicianShoes # starcup
Expand Down Expand Up @@ -1096,6 +1108,7 @@
loadouts:
- ChiefEngineerLongcoat # DeltaV - Longcoats
- ChiefEngineerWintercoat
- CorpoJacketElectra # starcup

- type: loadoutGroup
parent: StationEngineerShoes # starcup
Expand Down Expand Up @@ -1169,6 +1182,7 @@
loadouts:
- StationEngineerOuterVest
- StationEngineerWintercoat
- CorpoJacketElectra # starcup

- type: loadoutGroup
id: StationEngineerShoes
Expand Down Expand Up @@ -1215,6 +1229,7 @@
minLimit: 0
loadouts:
- AtmosphericTechnicianWintercoat
- CorpoJacketElectra # starcup

- type: loadoutGroup
id: AtmosphericTechnicianBackpack
Expand Down Expand Up @@ -1283,6 +1298,7 @@
- ResearchDirectorLabCoat
- ResearchDirectorLongcoat # DeltaV - Longcoats
- ResearchDirectorWintercoat
- CorpoJacketElectra # starcup

- type: loadoutGroup
parent: ScientistShoes # starcup
Expand Down Expand Up @@ -1354,6 +1370,7 @@
#- RoboticistLabCoat # starcup: moved to RoboticistOuterClothing
#- RoboticistWintercoat # starcup: moved to RoboticistOuterClothing
- SeniorResearcherLabCoat
- CorpoJacketElectra # starcup

- type: loadoutGroup
id: ScientistShoes
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
- ChiefMedicalOfficerLabCoat
- ChiefMedicalOfficerWintercoat
- ChiefMedicalOfficerLongcoat # DeltaV - Longcoats
- CorpoJacketInterdyne # starcup

- type: loadoutGroup
parent: [ MedicalDoctorNeck ] # starcup
Expand Down Expand Up @@ -129,6 +130,7 @@
- MedicalDoctorWintercoat
- MedicalSweater # starcup
- SeniorPhysicianLabCoat
- CorpoJacketInterdyne # starcup

- type: loadoutGroup
id: MedicalDoctorPDA
Expand Down Expand Up @@ -177,6 +179,7 @@
- RegularLabCoat
- ChemistLabCoat
- ChemistWintercoat
- CorpoJacketInterdyne # starcup

- type: loadoutGroup
id: ChemistBackpack
Expand Down Expand Up @@ -216,6 +219,7 @@
- ParamedicWindbreaker
- ParamedicWintercoat
- MedicalSweater # starcup
- CorpoJacketInterdyne # starcup

- type: loadoutGroup
parent: MedicalShoes # starcup
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_starcup/Catalog/VendingMachines/Inventories/syndcommdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
ClothingOuterCoatSyndieCapArmored: 3
ClothingOuterWinterSyndComm: 3
ClothingOuterWinterSyndCommWarden: 3
ClothingCorpoJacketSyndComm: 3

ClothingHandsGlovesCombat: 3

Expand Down
Loading
Loading