From d0786ab4b54d23779b356e5660250a9cf47732a2 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Tue, 5 May 2026 14:31:31 -0700 Subject: [PATCH 01/17] New Trinket Prototypes/Reorganizations - removes the wood cane's playtime requirement - new loadout prototypes: black/syndie cardboxes, storybook, pillows, flask, lollipops, and blindfold - new dummies: storybook and medications - reoorganized some files+renamed accessories.yml to cosmetics.yml --- .../Loadouts/Miscellaneous/trinkets.yml | 12 ++-- .../Specific/Medical/loadout-items.yml | 67 ------------------- .../Loadouts/Miscellaneous/glasses.yml | 8 +++ .../Loadouts/Trinkets/accessibility.yml | 6 ++ .../{accessories.yml => cosmetics.yml} | 6 -- .../Loadouts/Trinkets/jobtrinkets.yml | 39 +++++++++++ .../_starcup/Loadouts/Trinkets/meds.yml | 26 ++++--- .../_starcup/Loadouts/Trinkets/smokeables.yml | 1 + .../_starcup/Loadouts/Trinkets/toys.yml | 24 +++++++ .../_starcup/Loadouts/Trinkets/treats.yml | 38 +++++++++++ .../_starcup/Loadouts/Trinkets/utility.yml | 13 ++++ .../_starcup/Loadouts/dummy_entities.yml | 54 +++++++++++++++ 12 files changed, 205 insertions(+), 89 deletions(-) delete mode 100644 Resources/Prototypes/_starcup/Entities/Objects/Specific/Medical/loadout-items.yml rename Resources/Prototypes/_starcup/Loadouts/Trinkets/{accessories.yml => cosmetics.yml} (77%) create mode 100644 Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 01a78aab732..03d0621ee31 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -319,12 +319,12 @@ - type: loadout id: Cane - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobLibrarian - time: 3600 # 1hr same as Jamjar. +# effects: # starcup - removed job requirement, it's just an accessibility item! +# - !type:JobRequirementLoadoutEffect +# requirement: +# !type:RoleTimeRequirement +# role: JobLibrarian +# time: 3600 # 1hr same as Jamjar. storage: back: - Cane diff --git a/Resources/Prototypes/_starcup/Entities/Objects/Specific/Medical/loadout-items.yml b/Resources/Prototypes/_starcup/Entities/Objects/Specific/Medical/loadout-items.yml deleted file mode 100644 index cd7dd538879..00000000000 --- a/Resources/Prototypes/_starcup/Entities/Objects/Specific/Medical/loadout-items.yml +++ /dev/null @@ -1,67 +0,0 @@ -# If pill canisters are going to be moving into loadouts, they need to be clearer in what their items actually do. -# Failing a bigger coding change to how loadout items display, this is the best way to get that information across. - -- type: entity - parent: PillCanister - id: PillCanisterEthyloxyephedrineLoadout - name: narcolepsy medication - categories: [ HideSpawnMenu ] - components: - - type: EntityTableContainerFill - containers: - storagebase: !type:AllSelector - children: - - id: PillEthyloxyephedrine - amount: 5 - -- type: entity - parent: PillCanister - id: PillCanisterSoretizoneLoadout - name: painkiller medication - categories: [ HideSpawnMenu ] - components: - - type: EntityTableContainerFill - containers: - storagebase: !type:AllSelector - children: - - id: PillSoretizone - amount: 5 - -- type: entity - parent: PillCanister - id: PillCanisterAgonolexyneLoadout - name: strong painkiller medication - categories: [ HideSpawnMenu ] - components: - - type: EntityTableContainerFill - containers: - storagebase: !type:AllSelector - children: - - id: PillAgonolexyne - amount: 5 - -- type: entity - parent: PillCanister - id: PillCanisterNeurozeniumLoadout - name: antidepressant medication - categories: [ HideSpawnMenu ] - components: - - type: EntityTableContainerFill - containers: - storagebase: !type:AllSelector - children: - - id: PillNeurozenium - amount: 5 - -- type: entity - parent: PillCanister - id: PillCanisterCalmafluxineLoadout - name: anxiety medication - categories: [ HideSpawnMenu ] - components: - - type: EntityTableContainerFill - containers: - storagebase: !type:AllSelector - children: - - id: PillCalmafluxine - amount: 5 diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml index 1fe8084803d..adb51f6b366 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml @@ -16,3 +16,11 @@ id: Sunglasses equipment: eyes: ClothingEyesGlassesSunglasses + +# Blindfold +- type: loadout + id: Blindfold + equipment: + eyes: ClothingEyesBlindfold + +# CATTY TODO: Add Blindfold to Glasses loadout list/s diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessibility.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessibility.yml index a520050d24f..ff53367745f 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessibility.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessibility.yml @@ -9,3 +9,9 @@ storage: back: - WhiteCane + +- type: loadout + id: NoviceMark + storage: + back: + - ClothingNeckNoviceMark diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessories.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml similarity index 77% rename from Resources/Prototypes/_starcup/Loadouts/Trinkets/accessories.yml rename to Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml index d75b04931f3..108615f21ec 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessories.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml @@ -4,12 +4,6 @@ back: - CDDogtags -- type: loadout - id: NoviceMark - storage: - back: - - ClothingNeckNoviceMark - - type: loadout id: HeartLocket storage: diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml index 4e6d44c79cb..8c01c3a7571 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml @@ -57,3 +57,42 @@ storage: back: - ToyNuke + +# CATTY TODO: Add this to the Station Engineer, CE, and Atmos Tech job trinkets. +- type: loadout + id: PillowEngineering + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 72000 #50 hrs + storage: + back: + - PillowEngineeringWrapped + +# CATTY TODO: Add this to the Doctor, Paramedic, CMO, Brig Medic, and Chemist job trinkets. +- type: loadout + id: PillowMedical + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Medical + time: 72000 #50 hrs + storage: + back: + - PillowMedicalWrapped + +# CATTY TODO: Add this to the Captain and HoP job trinkets. +- type: loadout + id: PillowCommand + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Command + time: 72000 #50 hrs + storage: + back: + - PillowCommandWrapped diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml index 7304b15acbf..cc105666fb0 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml @@ -1,34 +1,40 @@ +# CATTY TODO: Replace the PillCanisterLoadout items with these in Accessibility - type: loadout - id: PillCanisterNeurozeniumLoadout + id: PillCanisterNeurozenium + dummyEntity: LoadoutDummyNeurozenium storage: back: - - PillCanisterNeurozeniumLoadout + - PillCanisterNeurozenium groupBy: "meds" - type: loadout - id: PillCanisterCalmafluxineLoadout + id: PillCanisterCalmafluxine + dummyEntity: LoadoutDummyCalmafluxine storage: back: - - PillCanisterCalmafluxineLoadout + - PillCanisterCalmafluxine groupBy: "meds" - type: loadout - id: PillCanisterSoretizoneLoadout + id: PillCanisterSoretizone + dummyEntity: LoadoutDummySoretizone storage: back: - - PillCanisterSoretizoneLoadout + - PillCanisterSoretizone groupBy: "meds" - type: loadout - id: PillCanisterAgonolexyneLoadout + id: PillCanisterAgonolexyne + dummyEntity: LoadoutDummyAgonolexyne storage: back: - - PillCanisterAgonolexyneLoadout + - PillCanisterAgonolexyne groupBy: "meds" - type: loadout - id: PillCanisterEthyloxyephedrineLoadout + id: PillCanisterEthyloxyephedrine + dummyEntity: LoadoutDummyEthyloxyephredine storage: back: - - PillCanisterEthyloxyephedrineLoadout + - PillCanisterEthyloxyephedrine groupBy: "meds" diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml index 5322fe61e49..2dbe0f62bdb 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml @@ -1,3 +1,4 @@ +# CATTY TODO: Add these to Accessibility! - type: loadout id: CigPackPurple storage: diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml index 1a13c91e1c8..9b97f53ec7c 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml @@ -1,5 +1,29 @@ +# CATTY TODO: Add these all to Trinkets! + +# Cards - type: loadout id: CardBoxSparot storage: back: - CardBoxSparot + +- type: loadout + id: CardBoxSyndicate + storage: + back: + - CardBoxSyndicate + +- type: loadout + id: CardBoxBlack + storage: + back: + - CardBoxBlack + +# Misc +- type: loadout + id: BookRandomStory + dummyEntity: LoadoutDummyStorybook + storage: + back: + - BookRandomStory + diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml index a5b66c02859..c19b615d750 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml @@ -3,4 +3,42 @@ storage: back: - FoodLollipopBubblegum + groupBy: "treats" + +- type: loadout + id: LollipopBlueRaspberry + storage: + back: + - FoodLollipopBlueRaspberry + groupBy: "treats" + +- type: loadout + id: LollipopButterscotch + storage: + back: + - FoodLollipopButterscotch + groupBy: "treats" + +- type: loadout + id: LollipopSourApple + storage: + back: + - FoodLollipopSourApple + groupBy: "treats" + +- type: loadout + id: LollipopStrawberry + storage: + back: + - FoodLollipopStrawberry + groupBy: "treats" + +- type: loadout + id: LollipopBubblegum + storage: + back: + - FoodLollipopBubblegum + groupBy: "treats" # add the cotton lollipop if we ever port it +# left out cotton candy, grape, lemonlime, mango, orange, pineapple, rootbeer, and watermelon +# CATTY TODO: Add these all to Trinkets! diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml index 2e5e910ae23..7ab61a15a7c 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml @@ -9,3 +9,16 @@ storage: back: - TapeRecorderFilled +# CATTY TODO: Add these all to Trinkets! + +- type: loadout + id: ShinyFlask + storage: + back: + - DrinkShinyFlask + +- type: loadout + id: Pillow + storage: + back: + - PillowBaseWrapped diff --git a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml new file mode 100644 index 00000000000..e6f40fc3c52 --- /dev/null +++ b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml @@ -0,0 +1,54 @@ +- type: entity + id: LoadoutDummyStorybook + categories: [ HideSpawnMenu ] + name: random storybook + description: A book you picked out to read to pass the time. + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + state: book_icon + +# Medications +- type: entity + id: LoadoutDummyPillCanisterBase + abstract: true + components: + - type: Sprite + layers: + - state: box + - state: pillbox + +- type: entity + parent: LoadoutDummyPillCanisterBase + id: LoadoutDummyEthyloxyephredine + categories: [ HideSpawnMenu ] + name: ethyloxyephredine pills + description: A canister of narcolepsy medication. + +- type: entity + parent: LoadoutDummyPillCanisterBase + id: LoadoutDummySoretizone + categories: [ HideSpawnMenu ] + name: soretizone pills + description: A canister of painkiller medication. + +- type: entity + parent: LoadoutDummyPillCanisterBase + id: LoadoutDummyAgonolexyne + categories: [ HideSpawnMenu ] + name: agonolexyne pills + description: A canister of potent painkiller medication. + +- type: entity + parent: LoadoutDummyPillCanisterBase + id: LoadoutDummyNeurozenium + categories: [ HideSpawnMenu ] + name: neurozenium pills + description: A canister of antidepressant medication. + +- type: entity + parent: LoadoutDummyPillCanisterBase + id: LoadoutDummyCalmafluxine + categories: [ HideSpawnMenu ] + name: calmafluxine pills + description: A canister of anxiety medication. From 4c85a53b7e7de5a43373f4066a8892d58262d6f3 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Tue, 5 May 2026 14:35:03 -0700 Subject: [PATCH 02/17] merges jobtrinkets ymls (whoops!) --- .../Loadouts/LoadoutGroups/job_trinkets.yml | 99 +++++++++++++++++++ .../Loadouts/Trinkets/jobtrinkets.yml | 98 ------------------ 2 files changed, 99 insertions(+), 98 deletions(-) delete mode 100644 Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml index df49142396a..d6dd467aa1d 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml @@ -217,3 +217,102 @@ minLimit: 0 loadouts: - LizardPlushiePassenger + +- type: loadout + id: LizardPlushieBoxer + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobBoxer + time: 72000 # 20hr + storage: + back: + - PlushieLizardJobBoxer + +- type: loadout + id: PlushieNar + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLibrarian + time: 21600 #6 hrs + storage: + back: + - PlushieNar + +- type: loadout + id: PlushieRatvar + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobLibrarian + time: 21600 #6 hrs + storage: + back: + - PlushieRatvar + +- type: loadout + id: PlushieIPC + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobRoboticist + time: 72000 #20 hrs + storage: + back: + - PlushieIPC + +- type: loadout + id: ToyNuke + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobPrisoner + time: 72000 #50 hrs + storage: + back: + - ToyNuke + +# CATTY TODO: Add this to the Station Engineer, CE, and Atmos Tech job trinkets. +- type: loadout + id: PillowEngineering + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Engineering + time: 72000 #50 hrs + storage: + back: + - PillowEngineeringWrapped + +# CATTY TODO: Add this to the Doctor, Paramedic, CMO, Brig Medic, and Chemist job trinkets. +- type: loadout + id: PillowMedical + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Medical + time: 72000 #50 hrs + storage: + back: + - PillowMedicalWrapped + +# CATTY TODO: Add this to the Captain and HoP job trinkets. +- type: loadout + id: PillowCommand + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Command + time: 72000 #50 hrs + storage: + back: + - PillowCommandWrapped diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml deleted file mode 100644 index 8c01c3a7571..00000000000 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml +++ /dev/null @@ -1,98 +0,0 @@ -- type: loadout - id: LizardPlushieBoxer - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobBoxer - time: 72000 # 20hr - storage: - back: - - PlushieLizardJobBoxer - -- type: loadout - id: PlushieNar - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobLibrarian - time: 21600 #6 hrs - storage: - back: - - PlushieNar - -- type: loadout - id: PlushieRatvar - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobLibrarian - time: 21600 #6 hrs - storage: - back: - - PlushieRatvar - -- type: loadout - id: PlushieIPC - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobRoboticist - time: 72000 #20 hrs - storage: - back: - - PlushieIPC - -- type: loadout - id: ToyNuke - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobPrisoner - time: 72000 #50 hrs - storage: - back: - - ToyNuke - -# CATTY TODO: Add this to the Station Engineer, CE, and Atmos Tech job trinkets. -- type: loadout - id: PillowEngineering - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Engineering - time: 72000 #50 hrs - storage: - back: - - PillowEngineeringWrapped - -# CATTY TODO: Add this to the Doctor, Paramedic, CMO, Brig Medic, and Chemist job trinkets. -- type: loadout - id: PillowMedical - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Medical - time: 72000 #50 hrs - storage: - back: - - PillowMedicalWrapped - -# CATTY TODO: Add this to the Captain and HoP job trinkets. -- type: loadout - id: PillowCommand - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Command - time: 72000 #50 hrs - storage: - back: - - PillowCommandWrapped From c17c4d71c394e2167f970f30b3852e6e91a7a1d0 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Tue, 5 May 2026 14:47:12 -0700 Subject: [PATCH 03/17] tweaked wristwatch for description and engraveability, and moved its loadout prototype from relics to here --- .../Entities/Objects/Devices/wristwatch.yml | 3 ++- .../_starcup/Loadouts/Jobs/Service/chaplain.yml | 13 +++++++------ .../_starcup/Loadouts/Trinkets/cosmetics.yml | 10 ++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml index b2544f597ca..d099b93a721 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml @@ -2,7 +2,7 @@ id: Wristwatch parent: BaseItem name: wristwatch - description: A cheap watch for telling time. How much did you waste playing Space Station 14? + description: An old or cheap watch for telling time. How much did you waste playing that block game? # starcup - removed fourth wall break components: - type: Sprite sprite: Objects/Devices/wristwatch.rsi @@ -41,6 +41,7 @@ - type: PhysicalComposition materialComposition: Steel: 300 + - type: Engraveable # starcup - type: entity id: WristwatchGold diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml index 0eb11bca8c5..45fa158a4b2 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml @@ -79,12 +79,6 @@ # would be nice to add a "sacred flask" prototype that's like a holy water flask but empty # but the sprites aren't there for it being filled with blood. yet. -- type: loadout - id: Wristwatch - storage: - back: - - Wristwatch - - type: loadout id: BikeHorn storage: @@ -132,3 +126,10 @@ storage: back: - AnomalyCoreTechInert +# CATTY TODO: Add this to Chaplain Trinkets! + +- type: loadout + id: CrystalCyan + storage: + back: + - CrystalCyan diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml index 108615f21ec..99be30bca7b 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml @@ -21,3 +21,13 @@ storage: back: - SilverRing + +# CATTY TODO: Add these all plus a mime mask to Cosmetics, remove Wristwatch from Chaplain's relics, +# CATTY TODO: add puppy/cat ears to theatervend! +# CATTY TODO: port the various seedless hairflowers to here! + +- type: loadout + id: Wristwatch + storage: + back: + - Wristwatch From a7465b3e13e3e83d7800b9617e397028fb69b367 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Tue, 5 May 2026 15:50:19 -0700 Subject: [PATCH 04/17] new loadout prototypes: syndiecap, noir glasses, nitrile gloves, shipwright jumpsuit, tactical maid gear, syndie recruit and formal jumpsuits/jumpskirts; swaps HoP/QM clipboards for paperwork belts --- .../Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Jobs/Engineering/station_engineer.yml | 7 ++++++ .../Loadouts/Jobs/Science/roboticist.yml | 7 ++++++ .../Loadouts/Jobs/Security/detective.yml | 7 ++++++ .../Loadouts/Jobs/Service/janitor.yml | 24 +++++++++++++++++++ .../_starcup/Loadouts/Miscellaneous/head.yml | 6 +++++ .../Loadouts/Miscellaneous/jumpskirt.yml | 6 +++++ .../Loadouts/Miscellaneous/jumpsuit.yml | 11 +++++++++ 9 files changed, 70 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index ec0c6101a10..08193aa572d 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -43,7 +43,7 @@ equipment: id: QuartermasterPDA ears: ClothingHeadsetQM - belt: BoxFolderClipboardThreePapers + belt: ClothingBeltPaperworkFilled # starcup - replaced clipboard pocket1: AppraisalTool storage: back: diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 02b00c0548a..c7cdf9d265d 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -84,7 +84,7 @@ id: HoPPDA gloves: ClothingHandsGlovesHop ears: ClothingHeadsetAltCommandSyndie # starcup: command recolors - belt: BoxFolderClipboardThreePapers + belt: ClothingBeltPaperworkFilled # starcup: replaced clipboard # eyes: ClothingEyesHudCommand # starcup: moved to loadouts storage: back: diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/station_engineer.yml index d645bb0ecec..844389f6730 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/station_engineer.yml @@ -1,3 +1,10 @@ +# Jumpsuits +- type: loadout + id: SyndieShipwrightJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitRepairmanSyndie + groupBy: "jumpsuit" + # Outer Clothing - type: loadout id: EngineeringSweater diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml index 5e102141522..3d74a3b6afd 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml @@ -56,6 +56,13 @@ equipment: head: ClothingOuterCardborg +# CATTY TODO: Give these to Roboticists and Brig Medics +# Gloves +- type: loadout + id: NitrileGloves + equipment: + hands: ClothingHandsGlovesNitrile + # Shoes - type: loadout id: RoboticsWinterBoots diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml index 2b34d3acf89..1722bdd1c75 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml @@ -28,3 +28,10 @@ id: StasecWinterCoatDet equipment: outerClothing: ClothingOuterCoatStasecDet + +# CATTY TODO: Add new DetectiveEyewear loadoutgroup that contains normal eyewear + this, then give them that! +# Eyewear +- type: loadout + id: ClothingEyesGlassesNoir + equipment: + eyes: ClothingEyesGlassesNoir diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml index 945580f8297..3658e748b32 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml @@ -9,12 +9,36 @@ equipment: jumpsuit: ClothingUniformJumpskirtJanimaidmini +# CATTY TODO: Add this to their loadouts! +- type: loadout + id: TacticalMaidUniform + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10 hours + equipment: + jumpsuit: ClothingUniformJumpskirtTacticalMaid + # Hat - type: loadout id: MaidLaceHeadpiece equipment: head: ClothingHeadHatMaidLaceHeadpiece +# CATTY TODO: Add this to their loadouts! +- type: loadout + id: TacticalMaidHeadband + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10 hours + equipment: + head: ClothingHeadHatTacticalMaidHeadband + # Belt - type: loadout id: JanitorBelt diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml index b0a32bc64f1..3b7ec43c3cc 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml @@ -167,3 +167,9 @@ id: DogEarsNoTail equipment: head: ClothingHeadHatDogEarsNoTail + +# CATTY TODO: Add this to passenger/roboticist? loadouts! +- type: loadout + id: SyndieCap + equipment: + head: ClothingHeadHatSyndie diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml index e3a4a5563b4..c6d3aa93446 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml @@ -338,3 +338,9 @@ equipment: jumpsuit: ClothingUniformJumpskirtTacticool groupBy: "jumpskirt" + +# CATTY TODO: Add to passenger loadouts! +- type: loadout + id: SyndieFormalDress + equipment: + jumpsuit: ClothingUniformJumpskirtSyndieFormalDress diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml index 125aae58c9c..b6677eabf8b 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml @@ -214,3 +214,14 @@ id: MNKGymBra equipment: jumpsuit: ClothingUniformMNKGymBra + +# CATTY TODO: Add these to passenger loadouts! +- type: loadout + id: SyndieRecruitJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitRecruitSyndie + +- type: loadout + id: SyndieFormalJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitSyndieFormal From 440af00ee2492c549075825ae6abd0839d0da3ce Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 21:57:36 -0700 Subject: [PATCH 05/17] ports Den #2165's seedless hairflower variants as cosmetics, reparenting the black rose --- .../Loadouts/Miscellaneous/trinkets.yml | 18 ++++++++++ .../Objects/Consumable/Food/produce.yml | 36 +++++++++++++++++++ .../_starcup/Catalog/Fills/clothing.yml | 4 ++- .../Loadouts/LoadoutGroups/general.yml | 3 ++ 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index 03d0621ee31..e091e6d49d5 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -21,6 +21,24 @@ back: - ClothingHeadHatHairflower +- type: loadout + id: RoseSeedless + storage: + back: + - RoseSeedless + +- type: loadout + id: RoseBlackSeedless + storage: + back: + - RoseBlackSeedless + +- type: loadout + id: FoodLilySeedless + storage: + back: + - FoodLilySeedless + # Headphones - type: loadout id: Headphones diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml new file mode 100644 index 00000000000..678112854ac --- /dev/null +++ b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml @@ -0,0 +1,36 @@ +- type: entity + parent: Rose + id: RoseSeedless + suffix: seedless + components: + - type: Produce + seed: + seedless: true + plantRsi: _Impstation/Objects/Specific/Hydroponics/rose.rsi + +- type: entity + parent: Rose # starcup - reparenting so it's not contraband + id: RoseBlackSeedless + suffix: seedless + components: + - type: Clothing # starcup - reparenting + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + - type: Sprite + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + - type: Item + sprite: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + - type: Produce + seedId: blackRose + seed: + seedless: true + plantRsi: _Impstation/Objects/Specific/Hydroponics/blackRose.rsi + +- type: entity + parent: FoodLily + id: FoodLilySeedless + suffix: seedless + components: + - type: Produce + seed: + seedless: true + plantRsi: Objects/Specific/Hydroponics/lily.rsi diff --git a/Resources/Prototypes/_starcup/Catalog/Fills/clothing.yml b/Resources/Prototypes/_starcup/Catalog/Fills/clothing.yml index 996d5434d01..26c96499e03 100644 --- a/Resources/Prototypes/_starcup/Catalog/Fills/clothing.yml +++ b/Resources/Prototypes/_starcup/Catalog/Fills/clothing.yml @@ -5,7 +5,9 @@ - !type:GroupSelector children: - id: FoodPoppy - - id: FoodLily + - id: FoodLilySeedless + - id: RoseBlackSeedless + - id: RoseSeedless - id: ClothingHeadHatHairflower - id: ClothingHeadHatFlowerWreath - id: ClothingEyesGlassesSunglasses diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml index c3528a13ac0..a80993d9565 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml @@ -67,6 +67,9 @@ loadouts: - FlowerWreath - Hairflower + - RoseSeedless + - RoseBlackSeedless + - FoodLilySeedless - Headphones # Abstract Groups (for parenting purposes) From d292916719d10c377f6aa46e2944dec7e50c0437 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 22:45:18 -0700 Subject: [PATCH 06/17] added new loadout prototypes to their lists --- .../_starcup/preferences/loadout-groups.ftl | 3 +++ .../Loadouts/LoadoutGroups/loadout_groups.yml | 8 ++++++++ .../Loadouts/LoadoutGroups/medical.yml | 1 + .../Loadouts/Miscellaneous/trinkets.yml | 18 ------------------ .../Loadouts/RoleLoadouts/medical.yml | 1 + .../Loadouts/RoleLoadouts/role_loadouts.yml | 4 +++- .../Prototypes/_DV/Loadouts/role_loadouts.yml | 2 ++ .../Loadouts/Jobs/Science/roboticist.yml | 1 - .../Loadouts/Jobs/Security/detective.yml | 3 +-- .../Loadouts/Jobs/Service/janitor.yml | 2 -- .../Loadouts/LoadoutGroups/job_trinkets.yml | 13 ++++++++++--- .../Loadouts/LoadoutGroups/logistics.yml | 9 +++++++++ .../Loadouts/LoadoutGroups/science.yml | 2 ++ .../Loadouts/LoadoutGroups/security.yml | 12 ++++++++++++ .../Loadouts/LoadoutGroups/service.yml | 1 + .../_starcup/Loadouts/Miscellaneous/head.yml | 1 - .../Loadouts/Miscellaneous/jumpskirt.yml | 1 - .../_starcup/Loadouts/Trinkets/cosmetics.yml | 19 ++++++++++++++++++- .../_starcup/Loadouts/role_loadouts.yml | 1 + 19 files changed, 72 insertions(+), 30 deletions(-) diff --git a/Resources/Locale/en-US/_starcup/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_starcup/preferences/loadout-groups.ftl index 24aec0b13a8..5f6fd75c4ba 100644 --- a/Resources/Locale/en-US/_starcup/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_starcup/preferences/loadout-groups.ftl @@ -7,6 +7,8 @@ loadout-group-technical-assistant-outerclothing = Technical assistant outer clot # Logistics loadout-group-cargo-technician-neck = Cargo technician neck +loadout-group-logistics-gloves = Logistics gloves + loadout-group-courier-belt = Courier belt loadout-group-courier-backpack = Courier backpack @@ -43,6 +45,7 @@ loadout-group-brigmedic-backpack = Combat Medic backpack loadout-group-detective-backpack = Detective backpack loadout-group-detective-shoes = Detective shoes +loadout-group-detective-glasses = Detective glasses loadout-group-security-cadet-outerclothing = Security cadet outer clothing diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml index cf1eff7e755..e88735a05b4 100644 --- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml @@ -283,6 +283,9 @@ - PinkKimono - PurpleKimono - SkyKimono + - SyndieRecruitJumpsuit + - SyndieFormalDress + - SyndieFormalJumpsuit # end starcup - type: loadoutGroup @@ -631,6 +634,7 @@ loadouts: - JanitorHead - MaidLaceHeadpiece # starcup + - TacticalMaidHeadband # starcup - type: loadoutGroup id: JanitorJumpsuit @@ -640,6 +644,7 @@ - JanitorJumpskirt - JanitorMaidUniform # starcup - JanitorMaidUniformMini # starcup + - TacticalMaidUniform # starcup - type: loadoutGroup id: JanitorGloves @@ -1061,6 +1066,7 @@ loadouts: - ChiefEngineerHead - ChiefEngineerBeret + - AtmosBeret - type: loadoutGroup id: ChiefEngineerJumpsuit @@ -1102,6 +1108,7 @@ - BlackHeels - BlackCommandHeels - ChiefEngineerWinterBoots + - AtmosTechWinterBoots # end starcup #- type: loadoutGroup @@ -1142,6 +1149,7 @@ - StationEngineerHazardsuit - SeniorEngineerJumpsuit - SeniorEngineerJumpskirt + - SyndieShipwrightJumpsuit - type: loadoutGroup id: StationEngineerBackpack diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml index a97653d9b36..a02de5078fd 100644 --- a/Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml +++ b/Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml @@ -215,6 +215,7 @@ loadouts: - ParamedicWindbreaker - ParamedicWintercoat + - MedicalSweater # starcup - type: loadoutGroup parent: MedicalShoes # starcup diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index e091e6d49d5..03d0621ee31 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -21,24 +21,6 @@ back: - ClothingHeadHatHairflower -- type: loadout - id: RoseSeedless - storage: - back: - - RoseSeedless - -- type: loadout - id: RoseBlackSeedless - storage: - back: - - RoseBlackSeedless - -- type: loadout - id: FoodLilySeedless - storage: - back: - - FoodLilySeedless - # Headphones - type: loadout id: Headphones diff --git a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml index 2350e488e9a..c4b3eefa565 100644 --- a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml +++ b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml @@ -62,6 +62,7 @@ groups: - GroupTankHarness - MedicalInternHead # starcup + - MedicalMask # starcup - Scarfs # starcup - MedicalInternJumpsuit - MedicalBackpack diff --git a/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml index df81d41bfdd..cb7f18c6885 100644 --- a/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/RoleLoadouts/role_loadouts.yml @@ -325,6 +325,7 @@ - QuartermasterJumpsuit - CargoTechnicianBackpack - QuartermasterOuterClothing + - LogisticsGloves # starcup - QuartermasterShoes - Glasses - Survival @@ -344,6 +345,7 @@ - CargoTechnicianJumpsuit - CargoTechnicianBackpack - CargoTechnicianOuterClothing + - LogisticsGloves # starcup - CargoTechnicianShoes - Glasses - CargoTechnicianID @@ -588,7 +590,7 @@ - DetectiveOuterClothing - SecurityGloves # starcup - DetectiveShoes # starcup - - SecurityEyewear # starcup + - DetectiveEyewear # starcup - SurvivalSecurity - Accessibility # starcup - Cosmetics # starcup diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 6f0195d49b1..81046d54e3f 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -29,6 +29,7 @@ - CourierBelt # starcup - CourierBackpack # starcup - CourierOuterClothing + - LogisticsGloves # starcup - CourierShoes - Glasses # starcup - CourierPDA @@ -48,6 +49,7 @@ - CargoAssistantJumpsuit - CargoTechnicianBackpack # starcup - CargoAssistantOuterClothing + - LogisticsGloves # starcup - CargoAssistantShoes - Glasses - Survival diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml index 3d74a3b6afd..85b2c44143b 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml @@ -56,7 +56,6 @@ equipment: head: ClothingOuterCardborg -# CATTY TODO: Give these to Roboticists and Brig Medics # Gloves - type: loadout id: NitrileGloves diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml index 1722bdd1c75..36e776ba77e 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml @@ -29,9 +29,8 @@ equipment: outerClothing: ClothingOuterCoatStasecDet -# CATTY TODO: Add new DetectiveEyewear loadoutgroup that contains normal eyewear + this, then give them that! # Eyewear - type: loadout - id: ClothingEyesGlassesNoir + id: NoirGlasses equipment: eyes: ClothingEyesGlassesNoir diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml index 3658e748b32..021a712f98f 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml @@ -9,7 +9,6 @@ equipment: jumpsuit: ClothingUniformJumpskirtJanimaidmini -# CATTY TODO: Add this to their loadouts! - type: loadout id: TacticalMaidUniform effects: @@ -27,7 +26,6 @@ equipment: head: ClothingHeadHatMaidLaceHeadpiece -# CATTY TODO: Add this to their loadouts! - type: loadout id: TacticalMaidHeadband effects: diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml index d6dd467aa1d..71ee8b7b1b6 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml @@ -5,6 +5,7 @@ minLimit: 0 loadouts: - LizardPlushieCaptain + - PillowCommand - type: loadoutGroup id: HoPJobTrinkets @@ -12,6 +13,7 @@ minLimit: 0 loadouts: - LizardPlushieHeadOfPersonnel + - PillowCommand # Engineering - type: loadoutGroup @@ -20,6 +22,7 @@ minLimit: 0 loadouts: - LizardPlushieAtmosphericTechnician + - PillowEngineering - type: loadoutGroup id: ChiefEngineerJobTrinkets @@ -27,6 +30,7 @@ minLimit: 0 loadouts: - LizardPlushieChiefEngineer + - PillowEngineering - type: loadoutGroup id: StationEngineerJobTrinkets @@ -34,6 +38,7 @@ minLimit: 0 loadouts: - LizardPlushieStationEngineer + - PillowEngineering - type: loadoutGroup id: TechnicalAssistantJobTrinkets @@ -71,6 +76,7 @@ minLimit: 0 loadouts: - LizardPlushieChemist + - PillowMedical - type: loadoutGroup id: ChiefMedicalOfficerJobTrinkets @@ -78,6 +84,7 @@ minLimit: 0 loadouts: - LizardPlushieChiefMedicalOfficer + - PillowMedical - type: loadoutGroup id: MedicalDoctorJobTrinkets @@ -85,6 +92,7 @@ minLimit: 0 loadouts: - LizardPlushieMedicalDoctor + - PillowMedical - type: loadoutGroup id: MedicalInternJobTrinkets @@ -92,6 +100,7 @@ minLimit: 0 loadouts: - LizardPlushieMedicalIntern + - PillowMedical - type: loadoutGroup id: ParamedicJobTrinkets @@ -99,6 +108,7 @@ minLimit: 0 loadouts: - LizardPlushieParamedic + - PillowMedical - type: loadoutGroup id: PsychologistJobTrinkets @@ -278,7 +288,6 @@ back: - ToyNuke -# CATTY TODO: Add this to the Station Engineer, CE, and Atmos Tech job trinkets. - type: loadout id: PillowEngineering effects: @@ -291,7 +300,6 @@ back: - PillowEngineeringWrapped -# CATTY TODO: Add this to the Doctor, Paramedic, CMO, Brig Medic, and Chemist job trinkets. - type: loadout id: PillowMedical effects: @@ -304,7 +312,6 @@ back: - PillowMedicalWrapped -# CATTY TODO: Add this to the Captain and HoP job trinkets. - type: loadout id: PillowCommand effects: diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/logistics.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/logistics.yml index bbde50bc565..3f677b7c4b8 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/logistics.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/logistics.yml @@ -1,3 +1,12 @@ +# General +- type: loadoutGroup + id: LogisticsGloves + name: loadout-group-logistics-gloves + minLimit: 0 + loadouts: + - FingerlessGloves + - BlackGloves + # Cargo Assistant - type: loadoutGroup id: CargoAssistantHead diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/science.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/science.yml index ae708835609..3c56ddf52c9 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/science.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/science.yml @@ -27,6 +27,7 @@ - ScientificBeret - CardborgHelmet - NeuroroboticistHelmet + - SyndieCap - type: loadoutGroup parent: ScientistJumpsuit @@ -59,6 +60,7 @@ - LatexGloves - PurpleGloves - RobohandsGloves + - NitrileGloves - type: loadoutGroup parent: ScientistShoes diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml index c5641c8516d..c61bbf691d1 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml @@ -100,6 +100,7 @@ loadouts: - LatexGloves - BlackGloves + - NitrileGloves - type: loadoutGroup id: BrigmedicShoes @@ -130,6 +131,17 @@ - EmergencyBoxMKC # Detective +- type: loadoutGroup + parent: [ Glasses ] + id: DetectiveEyewear + name: loadout-group-detective-glasses + minLimit: 0 + loadouts: + - SecurityGlasses + - SecurityHud + - SecurityEyePatchHud + - NoirGlasses + - type: loadoutGroup id: DetectiveBackpack name: loadout-group-detective-backpack diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml index 0de74179f4c..f2c51d3322a 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml @@ -439,6 +439,7 @@ - WitchHat - PirateHat - WarningCone + - SyndieCap - type: loadoutGroup parent: [ Glasses ] diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml index 3b7ec43c3cc..7fe4dc8fad6 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml @@ -168,7 +168,6 @@ equipment: head: ClothingHeadHatDogEarsNoTail -# CATTY TODO: Add this to passenger/roboticist? loadouts! - type: loadout id: SyndieCap equipment: diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml index c6d3aa93446..1138ac69940 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml @@ -339,7 +339,6 @@ jumpsuit: ClothingUniformJumpskirtTacticool groupBy: "jumpskirt" -# CATTY TODO: Add to passenger loadouts! - type: loadout id: SyndieFormalDress equipment: diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml index 99be30bca7b..5302c754c96 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml @@ -24,10 +24,27 @@ # CATTY TODO: Add these all plus a mime mask to Cosmetics, remove Wristwatch from Chaplain's relics, # CATTY TODO: add puppy/cat ears to theatervend! -# CATTY TODO: port the various seedless hairflowers to here! - type: loadout id: Wristwatch storage: back: - Wristwatch + +- type: loadout + id: RoseSeedless + storage: + back: + - RoseSeedless + +- type: loadout + id: RoseBlackSeedless + storage: + back: + - RoseBlackSeedless + +- type: loadout + id: FoodLilySeedless + storage: + back: + - FoodLilySeedless diff --git a/Resources/Prototypes/_starcup/Loadouts/role_loadouts.yml b/Resources/Prototypes/_starcup/Loadouts/role_loadouts.yml index 71d0208eb7f..f82ab9cb8d1 100644 --- a/Resources/Prototypes/_starcup/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_starcup/Loadouts/role_loadouts.yml @@ -52,6 +52,7 @@ - Accessibility - Cosmetics - Trinkets + - SecurityJobTrinkets - Plushies - SecurityFirearm - SecurityFirearmAmmo From 364562b7489a1c545aaccf3c2fe3ac9bbe1d935d Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 23:18:37 -0700 Subject: [PATCH 07/17] added numerous trinkets, cosmetics, smokeables, and uniform stuff --- .../Clothing/Uniforms/ship_vs_ship.yml | 2 +- .../Loadouts/LoadoutGroups/loadout_groups.yml | 3 +++ .../Jobs/Engineering/chief_engineer.yml | 12 ++++++--- .../Jobs/Logistics/logistics_officer.yml | 18 +++++++++++++ .../Loadouts/Jobs/Security/combat_medic.yml | 10 +++++++ .../Loadouts/Jobs/Service/chaplain.yml | 1 - .../Loadouts/LoadoutGroups/general.yml | 27 +++++++++++++++---- .../Loadouts/LoadoutGroups/security.yml | 2 ++ .../Loadouts/LoadoutGroups/service.yml | 2 +- .../Loadouts/Miscellaneous/glasses.yml | 2 -- .../Loadouts/Miscellaneous/jumpsuit.yml | 1 - .../_starcup/Loadouts/Trinkets/cosmetics.yml | 24 ++++++++++++++--- .../_starcup/Loadouts/Trinkets/meds.yml | 1 - .../_starcup/Loadouts/Trinkets/smokeables.yml | 15 ++++++++++- .../_starcup/Loadouts/Trinkets/toys.yml | 2 -- .../_starcup/Loadouts/Trinkets/treats.yml | 7 ----- .../_starcup/Loadouts/Trinkets/utility.yml | 1 - 17 files changed, 101 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml index bd01c50a521..ed9e742b91f 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml @@ -63,7 +63,7 @@ #HEADS OF STAFF #Chief Engineer - type: entity - parent: ClothingUniformBase # starcup: remove syndicate contraband label + parent: [ ClothingUniformBase, BaseCommandContraband ] # starcup: remove syndicate contraband label id: ClothingUniformJumpsuitChiefEngineerSyndie name: syndicate chief shipwright jumpsuit # starcup: rewritten for clarity description: Whether it's the wreckage caused by a rampant tesla engine or the blaze of a tritium burn gone wrong, SyndComm's shipwrights never fail to clean up the mess before the next shift. # starcup: rewritten for setting lore diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml index e88735a05b4..be961d90c60 100644 --- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml @@ -72,6 +72,7 @@ loadouts: - Eyepatch # starcup - EyepatchFlipped # starcup + - Blindfold # starcup - Glasses # imp edit start - its in the middle for alphabetizing reasons sorry - GlassesColorfulPink @@ -933,6 +934,7 @@ - QuartermasterCloak - QuartermasterMantle - GoliathCloak # starcup + - SupremeSalvagerCloak # starcup - type: loadoutGroup id: QuartermasterOuterClothing @@ -1076,6 +1078,7 @@ - ChiefEngineerJumpskirt - ChiefEngineerTurtleneck - ChiefEngineerTurtleneckSkirt + - SyndieChiefEngineerJumpsuit - type: loadoutGroup parent: [ Scarfs ] # starcup diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml index 9fd68c3a6fd..aad59add64d 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -1,11 +1,17 @@ -# Shoes +# Jumpsuit - type: loadout - id: ChiefEngineerWinterBoots + id: SyndieChiefEngineerJumpsuit equipment: - shoes: ClothingShoesBootsWinterChiefEngineer + jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie # OuterClothing - type: loadout id: ChiefEngineerLongcoat equipment: outerClothing: ClothingLongcoatCE + +# Shoes +- type: loadout + id: ChiefEngineerWinterBoots + equipment: + shoes: ClothingShoesBootsWinterChiefEngineer diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml index ad29c4c8f52..ad8d57d71f5 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml @@ -1,3 +1,21 @@ +- type: loadoutEffectGroup + id: SalvageVeteran + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 25h + +# Neck +- type: loadout + id: SupremeSalvagerCloak + effects: + - !type:GroupLoadoutEffect + proto: SalvageVeteran + equipment: + neck: ClothingNeckCloakSalvagerSupreme + # Shoes - type: loadout id: LogisticsOfficerWinterBoots diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/combat_medic.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/combat_medic.yml index 44d2b5f4b4c..602ad8f5180 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/combat_medic.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/combat_medic.yml @@ -9,6 +9,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtBrigmedic +- type: loadout + id: JumpskirtOfLife + equipment: + jumpsuit: ClothingUniformJumpskirtOfLife + +- type: loadout + id: FieldMedicJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitParamedicSyndie + # Back - type: loadout id: BrigmedicBackpack diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml index 45fa158a4b2..c90c16c1d40 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml @@ -126,7 +126,6 @@ storage: back: - AnomalyCoreTechInert -# CATTY TODO: Add this to Chaplain Trinkets! - type: loadout id: CrystalCyan diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml index a80993d9565..0bd5542d11f 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml @@ -43,15 +43,19 @@ - OffsetCaneSyndie - Cane - WhiteCane - - PillCanisterNeurozeniumLoadout - - PillCanisterSoretizoneLoadout - - PillCanisterCalmafluxineLoadout - - PillCanisterEthyloxyephedrineLoadout - - PillCanisterAgonolexyneLoadout + - PillCanisterNeurozenium + - PillCanisterSoretizone + - PillCanisterCalmafluxine + - PillCanisterEthyloxyephedrine + - PillCanisterAgonolexyne + - SmokingPipe + - Joint + - CigPackCandy - CigPackGreen - CigPackRed - CigPackBlue - CigPackBlack + - CigPackPurple - CigarCase - CigarGold @@ -71,6 +75,9 @@ - RoseBlackSeedless - FoodLilySeedless - Headphones + - MimeMaskTrinket + - MimeMaskSadTrinket + - MimeMaskScaredTrinket # Abstract Groups (for parenting purposes) ## Plushies @@ -157,18 +164,27 @@ id: TrinketsUtility loadouts: - TapeRecorder + - ShinyFlask + - Pillow - type: loadoutGroup abstract: true id: TrinketsTreat loadouts: - LollipopBubblegum + - LollipopBlueRaspberry + - LollipopButterscotch + - LollipopSourApple + - LollipopStrawberry - type: loadoutGroup abstract: true id: TrinketsToy loadouts: - CardBoxSparot + - CardBoxSyndicate + - CardBoxBlack + - BookRandomStory - type: loadoutGroup abstract: true @@ -192,6 +208,7 @@ - HeartLocket - GoldRing - SilverRing + - Wristwatch - type: loadoutGroup abstract: true diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml index c61bbf691d1..791d336d334 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/security.yml @@ -83,6 +83,8 @@ loadouts: - BrigmedicJumpsuit - BrigmedicJumpskirt + - JumpskirtOfLife + - FieldMedicJumpsuit - type: loadoutGroup id: BrigmedicOuterClothing diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml index f2c51d3322a..22526c2e105 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/service.yml @@ -143,10 +143,10 @@ - JanitorLantern - PumpkinLantern - BikeHorn - - Wristwatch - AnomalyCoreShadowInert - AnomalyCoreFleshInert - AnomalyCoreTechInert + - CrystalCyan # Chef - type: loadoutGroup diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml index adb51f6b366..867024356b0 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml @@ -22,5 +22,3 @@ id: Blindfold equipment: eyes: ClothingEyesBlindfold - -# CATTY TODO: Add Blindfold to Glasses loadout list/s diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml index b6677eabf8b..16151574880 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml @@ -215,7 +215,6 @@ equipment: jumpsuit: ClothingUniformMNKGymBra -# CATTY TODO: Add these to passenger loadouts! - type: loadout id: SyndieRecruitJumpsuit equipment: diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml index 5302c754c96..987348eb52f 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml @@ -22,9 +22,6 @@ back: - SilverRing -# CATTY TODO: Add these all plus a mime mask to Cosmetics, remove Wristwatch from Chaplain's relics, -# CATTY TODO: add puppy/cat ears to theatervend! - - type: loadout id: Wristwatch storage: @@ -48,3 +45,24 @@ storage: back: - FoodLilySeedless + +- type: loadout + id: MimeMaskTrinket + storage: + back: + - ClothingMaskMime + groupBy: "mime" + +- type: loadout + id: MimeMaskSadTrinket + storage: + back: + - ClothingMaskSadMime + groupBy: "mime" + +- type: loadout + id: MimeMaskScaredTrinket + storage: + back: + - ClothingMaskScaredMime + groupBy: "mime" diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml index cc105666fb0..6e87855c687 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml @@ -1,4 +1,3 @@ -# CATTY TODO: Replace the PillCanisterLoadout items with these in Accessibility - type: loadout id: PillCanisterNeurozenium dummyEntity: LoadoutDummyNeurozenium diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml index 2dbe0f62bdb..447ad8e84d6 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml @@ -1,4 +1,3 @@ -# CATTY TODO: Add these to Accessibility! - type: loadout id: CigPackPurple storage: @@ -12,3 +11,17 @@ back: - CigPackCandy groupBy: "smokeables" + +- type: loadout + id: SmokingPipe + storage: + back: + - SmokingPipeFilledTobacco + groupBy: "smokeables" + +- type: loadout + id: Joint + storage: + back: + - Joint + groupBy: "smokeables" diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml index 9b97f53ec7c..058b8743ae9 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml @@ -1,5 +1,3 @@ -# CATTY TODO: Add these all to Trinkets! - # Cards - type: loadout id: CardBoxSparot diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml index c19b615d750..768f2dc0e91 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml @@ -33,12 +33,5 @@ - FoodLollipopStrawberry groupBy: "treats" -- type: loadout - id: LollipopBubblegum - storage: - back: - - FoodLollipopBubblegum - groupBy: "treats" # add the cotton lollipop if we ever port it # left out cotton candy, grape, lemonlime, mango, orange, pineapple, rootbeer, and watermelon -# CATTY TODO: Add these all to Trinkets! diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml index 7ab61a15a7c..dc5655dbf89 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml @@ -9,7 +9,6 @@ storage: back: - TapeRecorderFilled -# CATTY TODO: Add these all to Trinkets! - type: loadout id: ShinyFlask From 3af9f97fc5e5d5ac2e3b47a06de3501bcb1c014d Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 23:25:34 -0700 Subject: [PATCH 08/17] added spectral locator trinket --- .../Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml | 1 + Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml index 0bd5542d11f..0d191c3a3a2 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml @@ -185,6 +185,7 @@ - CardBoxSyndicate - CardBoxBlack - BookRandomStory + - SpectralLocator - type: loadoutGroup abstract: true diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml index 058b8743ae9..e4b2544d545 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml @@ -25,3 +25,8 @@ back: - BookRandomStory +- type: loadout + id: SpectralLocator + storage: + back: + - SpectralLocator From d72b7cb92a6be009555389c9d61999f408438bd7 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Thu, 7 May 2026 23:31:07 -0700 Subject: [PATCH 09/17] gave janitors fingerless gloves --- Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml index be961d90c60..8e0f0025e54 100644 --- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml @@ -656,6 +656,7 @@ - OrangeGloves - PurpleGloves - WhiteGloves # starcup - to match maid outfit + - FingerlessGloves # starcup - to go with impractical tactical maid outfit (gloves are insuls) - type: loadoutGroup id: JanitorOuterClothing From db4dc470dc585c8a52f98db55c62471ed137925a Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Fri, 8 May 2026 00:26:35 -0700 Subject: [PATCH 10/17] fixed some issues --- .../en-US/_starcup/clothing/examine/security.ftl | 4 ++-- .../Clothing/OuterClothing/Longcoats/command.yml | 2 +- .../Clothing/OuterClothing/Longcoats/security.yml | 2 +- .../_DV/Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../_DV/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Loadouts/Jobs/Logistics/logistics_officer.yml | 2 +- .../_starcup/Loadouts/Jobs/Science/roboticist.yml | 2 +- .../_starcup/Loadouts/Jobs/Service/boxer.yml | 11 ----------- .../_starcup/Loadouts/Miscellaneous/hands.yml | 2 +- 9 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Resources/Locale/en-US/_starcup/clothing/examine/security.ftl b/Resources/Locale/en-US/_starcup/clothing/examine/security.ftl index 5f60d02d586..0137b11eb63 100644 --- a/Resources/Locale/en-US/_starcup/clothing/examine/security.ftl +++ b/Resources/Locale/en-US/_starcup/clothing/examine/security.ftl @@ -33,10 +33,10 @@ clothing-brigmedic-hardsuit = [color=#a40000]combat medic hardsuit[/color] clothing-warden-hardsuit = [color=#a40000]warden hardsuit[/color] clothing-hos-hardsuit = [color=#a40000]Head of Security's hardsuit[/color] clothing-security-winter-coat = [color=#a40000]security winter coat[/color] -clothing-security-winter-coat = [color=#a40000]security longcoat[/color] +clothing-security-longcoat = [color=#a40000]security longcoat[/color] clothing-warden-winter-coat = [color=#a40000]warden's armored winter coat[/color] clothing-hos-winter-coat = [color=#a40000]Head of Security's armored winter coat[/color] -clothing-hos-winter-coat = [color=#a40000]Head of Security's armored longcoat[/color] +clothing-hos-longcoat = [color=#a40000]Head of Security's armored longcoat[/color] ## Shoes diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/command.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/command.yml index eaedba7e395..a2c227866a7 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/command.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/command.yml @@ -68,5 +68,5 @@ Caustic: 0.75 # begin starcup: examinable clothing - type: ExaminableClothing - examineText: clothing-hos-winter-coat + examineText: clothing-hos-longcoat # end starcup diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/security.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/security.yml index 5a0ae8d613d..7a7111f4e66 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/security.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/Longcoats/security.yml @@ -25,7 +25,7 @@ sprite: _Floof/Clothing/OuterClothing/Longcoats/security.rsi # begin starcup: examinable clothing - type: ExaminableClothing - examineText: clothing-security-winter-coat + examineText: clothing-security-longcoat # end starcup - type: entity diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml index 00ac99a3b07..f35dbd98ee8 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -46,7 +46,7 @@ # Senior Officer uniform - type: entity - parent: ClothingUniformFoldableBase + parent: ClothingUniformBase # starcup - removed foldable id: ClothingUniformJumpskirtSecTurtle name: senior officer's turtleneck description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer. diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml index eee400901cb..04f02b3d1ec 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -66,7 +66,7 @@ # Senior Officer - type: entity - parent: ClothingUniformFoldableBase + parent: ClothingUniformBase # starcup - removed foldable id: ClothingUniformJumpsuitSecTurtle name: senior officer's turtleneck description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer. diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml index ad8d57d71f5..9fa6e547d1c 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml @@ -1,5 +1,5 @@ - type: loadoutEffectGroup - id: SalvageVeteran + id: SalvageSupreme effects: - !type:JobRequirementLoadoutEffect requirement: diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml index 85b2c44143b..ad18910d316 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml @@ -60,7 +60,7 @@ - type: loadout id: NitrileGloves equipment: - hands: ClothingHandsGlovesNitrile + gloves: ClothingHandsGlovesNitrile # Shoes - type: loadout diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/boxer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/boxer.yml index f69783d2ab0..f0fc9b4db94 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/boxer.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/boxer.yml @@ -25,17 +25,6 @@ equipment: jumpsuit: ClothingUniformKendoHakama -- type: loadout - id: SyndieFormalDress - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobCaptain - time: 21600 #6 hrs - equipment: - jumpsuit: ClothingUniformJumpskirtSyndieFormalDress - - type: loadout id: GladiatorUniform equipment: diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/hands.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/hands.yml index f28cdf8cc82..a72240e3244 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/hands.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/hands.yml @@ -12,7 +12,7 @@ - type: loadout id: TealGloves equipment: - hands: ClothingHandsGlovesColorTeal + gloves: ClothingHandsGlovesColorTeal - type: loadout id: BrownGloves From 9505645cf7c0c62a68822fbe7214b8addccb320c Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Fri, 8 May 2026 00:37:07 -0700 Subject: [PATCH 11/17] fixed pill sprite --- Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml index e6f40fc3c52..563e506b350 100644 --- a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml +++ b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml @@ -14,6 +14,7 @@ abstract: true components: - type: Sprite + sprite: Objects/Storage/boxes.rsi layers: - state: box - state: pillbox From e291c3f2ac40f90ea4db961c49b4da8bfe31b985 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Fri, 8 May 2026 00:58:56 -0700 Subject: [PATCH 12/17] fixed pill canister sprite but for real --- Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml index 563e506b350..e9061703ddf 100644 --- a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml +++ b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml @@ -14,10 +14,8 @@ abstract: true components: - type: Sprite - sprite: Objects/Storage/boxes.rsi - layers: - - state: box - - state: pillbox + sprite: Objects/Specific/Chemistry/pills_canister.rsi + state: pill_canister - type: entity parent: LoadoutDummyPillCanisterBase From 5f3fa123531f8784cfdd4f9eb37468989b012d29 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Fri, 8 May 2026 01:07:51 -0700 Subject: [PATCH 13/17] clarified pill canister names --- .../_starcup/Loadouts/dummy_entities.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml index e9061703ddf..4ad0a724bd4 100644 --- a/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml +++ b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml @@ -21,33 +21,33 @@ parent: LoadoutDummyPillCanisterBase id: LoadoutDummyEthyloxyephredine categories: [ HideSpawnMenu ] - name: ethyloxyephredine pills - description: A canister of narcolepsy medication. + name: narcolepsy medication + description: A canister of ethyloxyephredine pills. - type: entity parent: LoadoutDummyPillCanisterBase id: LoadoutDummySoretizone categories: [ HideSpawnMenu ] - name: soretizone pills - description: A canister of painkiller medication. + name: painkiller medication + description: A canister of soretizone pills. - type: entity parent: LoadoutDummyPillCanisterBase id: LoadoutDummyAgonolexyne categories: [ HideSpawnMenu ] - name: agonolexyne pills - description: A canister of potent painkiller medication. + name: strong painkiller medication + description: A canister of agonolexyne pills. - type: entity parent: LoadoutDummyPillCanisterBase id: LoadoutDummyNeurozenium categories: [ HideSpawnMenu ] - name: neurozenium pills - description: A canister of antidepressant medication. + name: antidepressant medication + description: A canister of neurozenium pills. - type: entity parent: LoadoutDummyPillCanisterBase id: LoadoutDummyCalmafluxine categories: [ HideSpawnMenu ] - name: calmafluxine pills - description: A canister of anxiety medication. + name: anxiety medication + description: A canister of calmafluxine pills. From ad69c34f00b73032e29d0e052ca80935579ba7f8 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Fri, 8 May 2026 01:12:23 -0700 Subject: [PATCH 14/17] fixed black rose's name --- .../Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml index 678112854ac..03a8e69c873 100644 --- a/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml @@ -11,6 +11,7 @@ - type: entity parent: Rose # starcup - reparenting so it's not contraband id: RoseBlackSeedless + name: black rose suffix: seedless components: - type: Clothing # starcup - reparenting From c6b65df37aed92b2f681c4df8657b6a348636984 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Fri, 8 May 2026 01:22:19 -0700 Subject: [PATCH 15/17] gave Medical back their job trinkets, plus cosmetics and plushies --- .../Loadouts/RoleLoadouts/medical.yml | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml index c4b3eefa565..f1b4eafe5a5 100644 --- a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml +++ b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml @@ -34,8 +34,10 @@ - Glasses - SurvivalMedical - Accessibility # starcup + - Cosmetics # starcup - Trinkets -# - ChiefMedicalOfficerJobTrinkets + - Plushies # starcup + - ChiefMedicalOfficerJobTrinkets # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -53,8 +55,10 @@ - MedicalDoctorPDA - SurvivalMedical - Accessibility # starcup + - Cosmetics # starcup - Trinkets -# - MedicalDoctorJobTrinkets + - Plushies # starcup + - MedicalDoctorJobTrinkets # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -72,8 +76,10 @@ - MedicalInternID # starcup - Accessibility # starcup - SurvivalMedical + - Cosmetics # starcup - Trinkets -# - MedicalInternJobTrinkets + - Plushies # starcup + - MedicalInternJobTrinkets # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -90,8 +96,10 @@ - ChemistPDA # starcup - SurvivalMedical - Accessibility # starcup + - Cosmetics # starcup - Trinkets -# - ChemistJobTrinkets + - Plushies # starcup + - ChemistJobTrinkets # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -108,6 +116,8 @@ - Glasses - SurvivalMedical - Accessibility # starcup + - Cosmetics # starcup - Trinkets -# - ParamedicJobTrinkets + - Plushies # starcup + - ParamedicJobTrinkets # starcup - GroupSpeciesBreathToolMedical From 9ec8a223998df037285f7695820ee7a44e3c5fb4 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Wed, 20 May 2026 11:28:31 -0700 Subject: [PATCH 16/17] removed Chief Engineer Syndie outfit, spectral locator, QM's paperwork belt, and pillow trinkets; swapped shiny flask for bar flask. --- .../Loadouts/LoadoutGroups/loadout_groups.yml | 1 - .../Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Jobs/Engineering/chief_engineer.yml | 6 --- .../Loadouts/LoadoutGroups/general.yml | 3 +- .../Loadouts/LoadoutGroups/job_trinkets.yml | 46 ------------------- .../_starcup/Loadouts/Trinkets/toys.yml | 6 --- .../_starcup/Loadouts/Trinkets/utility.yml | 4 +- 7 files changed, 4 insertions(+), 64 deletions(-) diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml index 8e0f0025e54..8905e1fe9d6 100644 --- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml @@ -1079,7 +1079,6 @@ - ChiefEngineerJumpskirt - ChiefEngineerTurtleneck - ChiefEngineerTurtleneckSkirt - - SyndieChiefEngineerJumpsuit - type: loadoutGroup parent: [ Scarfs ] # starcup diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 08193aa572d..ec0c6101a10 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -43,7 +43,7 @@ equipment: id: QuartermasterPDA ears: ClothingHeadsetQM - belt: ClothingBeltPaperworkFilled # starcup - replaced clipboard + belt: BoxFolderClipboardThreePapers pocket1: AppraisalTool storage: back: diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml index aad59add64d..b58961e3634 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -1,9 +1,3 @@ -# Jumpsuit -- type: loadout - id: SyndieChiefEngineerJumpsuit - equipment: - jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie - # OuterClothing - type: loadout id: ChiefEngineerLongcoat diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml index 0d191c3a3a2..1dfd835e041 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml @@ -164,7 +164,7 @@ id: TrinketsUtility loadouts: - TapeRecorder - - ShinyFlask + - BarFlask - Pillow - type: loadoutGroup @@ -185,7 +185,6 @@ - CardBoxSyndicate - CardBoxBlack - BookRandomStory - - SpectralLocator - type: loadoutGroup abstract: true diff --git a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml index 71ee8b7b1b6..3f6782ca8df 100644 --- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml +++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml @@ -5,7 +5,6 @@ minLimit: 0 loadouts: - LizardPlushieCaptain - - PillowCommand - type: loadoutGroup id: HoPJobTrinkets @@ -13,7 +12,6 @@ minLimit: 0 loadouts: - LizardPlushieHeadOfPersonnel - - PillowCommand # Engineering - type: loadoutGroup @@ -22,7 +20,6 @@ minLimit: 0 loadouts: - LizardPlushieAtmosphericTechnician - - PillowEngineering - type: loadoutGroup id: ChiefEngineerJobTrinkets @@ -30,7 +27,6 @@ minLimit: 0 loadouts: - LizardPlushieChiefEngineer - - PillowEngineering - type: loadoutGroup id: StationEngineerJobTrinkets @@ -38,7 +34,6 @@ minLimit: 0 loadouts: - LizardPlushieStationEngineer - - PillowEngineering - type: loadoutGroup id: TechnicalAssistantJobTrinkets @@ -76,7 +71,6 @@ minLimit: 0 loadouts: - LizardPlushieChemist - - PillowMedical - type: loadoutGroup id: ChiefMedicalOfficerJobTrinkets @@ -84,7 +78,6 @@ minLimit: 0 loadouts: - LizardPlushieChiefMedicalOfficer - - PillowMedical - type: loadoutGroup id: MedicalDoctorJobTrinkets @@ -92,7 +85,6 @@ minLimit: 0 loadouts: - LizardPlushieMedicalDoctor - - PillowMedical - type: loadoutGroup id: MedicalInternJobTrinkets @@ -100,7 +92,6 @@ minLimit: 0 loadouts: - LizardPlushieMedicalIntern - - PillowMedical - type: loadoutGroup id: ParamedicJobTrinkets @@ -108,7 +99,6 @@ minLimit: 0 loadouts: - LizardPlushieParamedic - - PillowMedical - type: loadoutGroup id: PsychologistJobTrinkets @@ -287,39 +277,3 @@ storage: back: - ToyNuke - -- type: loadout - id: PillowEngineering - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Engineering - time: 72000 #50 hrs - storage: - back: - - PillowEngineeringWrapped - -- type: loadout - id: PillowMedical - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Medical - time: 72000 #50 hrs - storage: - back: - - PillowMedicalWrapped - -- type: loadout - id: PillowCommand - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Command - time: 72000 #50 hrs - storage: - back: - - PillowCommandWrapped diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml index e4b2544d545..8eafa6bf5df 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml @@ -24,9 +24,3 @@ storage: back: - BookRandomStory - -- type: loadout - id: SpectralLocator - storage: - back: - - SpectralLocator diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml index dc5655dbf89..aa28ab4ba57 100644 --- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml +++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml @@ -11,10 +11,10 @@ - TapeRecorderFilled - type: loadout - id: ShinyFlask + id: BarFlask storage: back: - - DrinkShinyFlask + - DrinkFlaskBar - type: loadout id: Pillow From 9dafd51ce2e24ea8e7f3840bb62000079463f166 Mon Sep 17 00:00:00 2001 From: KoboldCatgirl <143960193+KoboldCatgirl@users.noreply.github.com> Date: Wed, 20 May 2026 11:58:28 -0700 Subject: [PATCH 17/17] fixed ordering + comments --- Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml | 8 ++++---- Resources/Prototypes/_DV/Loadouts/role_loadouts.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml index c4157abd2e6..80568cbfd4b 100644 --- a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml +++ b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml @@ -36,8 +36,8 @@ - Accessibility # starcup - Cosmetics # starcup - Trinkets - - Plushies # starcup - ChiefMedicalOfficerJobTrinkets # starcup + - Plushies # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -57,8 +57,8 @@ - Accessibility # starcup - Cosmetics # starcup - Trinkets - - Plushies # starcup - MedicalDoctorJobTrinkets # starcup + - Plushies # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -79,8 +79,8 @@ - SurvivalMedical - Cosmetics # starcup - Trinkets - - Plushies # starcup - MedicalInternJobTrinkets # starcup + - Plushies # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout @@ -99,8 +99,8 @@ - Accessibility # starcup - Cosmetics # starcup - Trinkets - - Plushies # starcup - ChemistJobTrinkets # starcup + - Plushies # starcup - GroupSpeciesBreathToolMedical - type: roleLoadout diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml index 81046d54e3f..bc60f0e0bff 100644 --- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml @@ -77,7 +77,7 @@ - Cosmetics # starcup - Trinkets - RoboticsJobTrinkets # starcup - - Plushies + - Plushies # starcup - Survival - GroupSpeciesBreathTool - GroupTankHarness