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/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/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/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/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
index cf1eff7e755..8905e1fe9d6 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
@@ -283,6 +284,9 @@
   - PinkKimono
   - PurpleKimono
   - SkyKimono
+  - SyndieRecruitJumpsuit
+  - SyndieFormalDress
+  - SyndieFormalJumpsuit
   # end starcup
 
 - type: loadoutGroup
@@ -631,6 +635,7 @@
   loadouts:
   - JanitorHead
   - MaidLaceHeadpiece # starcup
+  - TacticalMaidHeadband # starcup
 
 - type: loadoutGroup
   id: JanitorJumpsuit
@@ -640,6 +645,7 @@
   - JanitorJumpskirt
   - JanitorMaidUniform # starcup
   - JanitorMaidUniformMini # starcup
+  - TacticalMaidUniform # starcup
 
 - type: loadoutGroup
   id: JanitorGloves
@@ -650,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
@@ -928,6 +935,7 @@
   - QuartermasterCloak
   - QuartermasterMantle
   - GoliathCloak # starcup
+  - SupremeSalvagerCloak # starcup
 
 - type: loadoutGroup
   id: QuartermasterOuterClothing
@@ -1061,6 +1069,7 @@
   loadouts:
   - ChiefEngineerHead
   - ChiefEngineerBeret
+  - AtmosBeret
 
 - type: loadoutGroup
   id: ChiefEngineerJumpsuit
@@ -1102,6 +1111,7 @@
   - BlackHeels
   - BlackCommandHeels
   - ChiefEngineerWinterBoots
+  - AtmosTechWinterBoots
   # end starcup
 
 #- type: loadoutGroup
@@ -1142,6 +1152,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 7f9d87d6e35..3580e5020d7 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -317,12 +317,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/Loadouts/RoleLoadouts/medical.yml b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml
index 07ed9761ba1..80568cbfd4b 100644
--- a/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml
+++ b/Resources/Prototypes/Loadouts/RoleLoadouts/medical.yml
@@ -36,7 +36,7 @@
   - Accessibility # starcup
   - Cosmetics # starcup
   - Trinkets
-  - ChiefMedicalOfficerJobTrinkets
+  - ChiefMedicalOfficerJobTrinkets # starcup
   - Plushies # starcup
   - GroupSpeciesBreathToolMedical
 
@@ -57,7 +57,7 @@
   - Accessibility # starcup
   - Cosmetics # starcup
   - Trinkets
-  - MedicalDoctorJobTrinkets
+  - MedicalDoctorJobTrinkets # starcup
   - Plushies # starcup
   - GroupSpeciesBreathToolMedical
 
@@ -66,6 +66,7 @@
   groups:
   - GroupTankHarness
   - MedicalInternHead # starcup
+  - MedicalMask # starcup
   - Scarfs # starcup
   - MedicalInternJumpsuit
   - MedicalBackpack
@@ -76,8 +77,9 @@
   - Accessibility # starcup
   - Cosmetics # starcup
   - SurvivalMedical
+  - Cosmetics # starcup
   - Trinkets
-  - MedicalInternJobTrinkets
+  - MedicalInternJobTrinkets # starcup
   - Plushies # starcup
   - GroupSpeciesBreathToolMedical
 
@@ -97,7 +99,7 @@
   - Accessibility # starcup
   - Cosmetics # starcup
   - Trinkets
-  - ChemistJobTrinkets
+  - ChemistJobTrinkets # starcup
   - Plushies # starcup
   - GroupSpeciesBreathToolMedical
 
@@ -117,6 +119,6 @@
   - Accessibility # starcup
   - Cosmetics # starcup
   - Trinkets
-  - ParamedicJobTrinkets
   - Plushies # starcup
+  - ParamedicJobTrinkets # starcup
   - GroupSpeciesBreathToolMedical
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/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/_DEN/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml
new file mode 100644
index 00000000000..03a8e69c873
--- /dev/null
+++ b/Resources/Prototypes/_DEN/Entities/Objects/Consumable/Food/produce.yml
@@ -0,0 +1,37 @@
+- 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
+  name: black rose
+  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/_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 ebfca611e61..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: [ClothingUniformBase, ClothingUniformFoldableBase] # starcup: ClothingUniformBase parent
+  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 d5256a2044d..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: [ClothingUniformBase, ClothingUniformFoldableBase] # starcup: ClothingUniformBase parent
+  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/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
index 6f0195d49b1..bc60f0e0bff 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
@@ -75,7 +77,7 @@
   - Cosmetics # starcup
   - Trinkets
   - RoboticsJobTrinkets # starcup
-  - Plushies
+  - Plushies # starcup
   - Survival
   - GroupSpeciesBreathTool
   - GroupTankHarness
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/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/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml
index 9fd68c3a6fd..b58961e3634 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -1,11 +1,11 @@
-# Shoes
-- type: loadout
-  id: ChiefEngineerWinterBoots
-  equipment:
-    shoes: ClothingShoesBootsWinterChiefEngineer
-
 # OuterClothing
 - type: loadout
   id: ChiefEngineerLongcoat
   equipment:
     outerClothing: ClothingLongcoatCE
+
+# Shoes
+- type: loadout
+  id: ChiefEngineerWinterBoots
+  equipment:
+    shoes: ClothingShoesBootsWinterChiefEngineer
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/Logistics/logistics_officer.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Logistics/logistics_officer.yml
index ad29c4c8f52..9fa6e547d1c 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: SalvageSupreme
+  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/Science/roboticist.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml
index 5e102141522..ad18910d316 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Science/roboticist.yml
@@ -56,6 +56,12 @@
   equipment:
     head: ClothingOuterCardborg
 
+# Gloves
+- type: loadout
+  id: NitrileGloves
+  equipment:
+    gloves: ClothingHandsGlovesNitrile
+
 # Shoes
 - type: loadout
   id: RoboticsWinterBoots
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/Security/detective.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml
index 2b34d3acf89..36e776ba77e 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Security/detective.yml
@@ -28,3 +28,9 @@
   id: StasecWinterCoatDet
   equipment:
     outerClothing: ClothingOuterCoatStasecDet
+
+# Eyewear
+- type: loadout
+  id: NoirGlasses
+  equipment:
+    eyes: ClothingEyesGlassesNoir
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/Jobs/Service/chaplain.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/chaplain.yml
index 0eb11bca8c5..c90c16c1d40 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,9 @@
   storage:
     back:
     - AnomalyCoreTechInert
+
+- type: loadout
+  id: CrystalCyan
+  storage:
+    back:
+    - CrystalCyan
diff --git a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml
index 945580f8297..021a712f98f 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Jobs/Service/janitor.yml
@@ -9,12 +9,34 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtJanimaidmini
 
+- 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
 
+- 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/LoadoutGroups/general.yml b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/general.yml
index 7f284d51330..f196a459dd5 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
 
@@ -67,7 +71,13 @@
   loadouts:
   - FlowerWreath
   - Hairflower
+  - RoseSeedless
+  - RoseBlackSeedless
+  - FoodLilySeedless
   - Headphones
+  - MimeMaskTrinket
+  - MimeMaskSadTrinket
+  - MimeMaskScaredTrinket
 
 # Abstract Groups (for parenting purposes)
 ## Plushies
@@ -156,18 +166,27 @@
   id: TrinketsUtility
   loadouts:
   - TapeRecorder
+  - BarFlask
+  - 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
@@ -191,6 +210,7 @@
   - HeartLocket
   - GoldRing
   - SilverRing
+  - Wristwatch
 
 - 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 df49142396a..3f6782ca8df 100644
--- a/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/LoadoutGroups/job_trinkets.yml
@@ -217,3 +217,63 @@
   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
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..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
@@ -100,6 +102,7 @@
   loadouts:
   - LatexGloves
   - BlackGloves
+  - NitrileGloves
 
 - type: loadoutGroup
   id: BrigmedicShoes
@@ -130,6 +133,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..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
@@ -439,6 +439,7 @@
   - WitchHat
   - PirateHat
   - WarningCone
+  - SyndieCap
 
 - type: loadoutGroup
   parent: [ Glasses ]
diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml
index 1fe8084803d..867024356b0 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/glasses.yml
@@ -16,3 +16,9 @@
   id: Sunglasses
   equipment:
     eyes: ClothingEyesGlassesSunglasses
+
+# Blindfold
+- type: loadout
+  id: Blindfold
+  equipment:
+    eyes: ClothingEyesBlindfold
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
diff --git a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml
index b0a32bc64f1..7fe4dc8fad6 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/head.yml
@@ -167,3 +167,8 @@
   id: DogEarsNoTail
   equipment:
     head: ClothingHeadHatDogEarsNoTail
+
+- 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..1138ac69940 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpskirt.yml
@@ -338,3 +338,8 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtTacticool
   groupBy: "jumpskirt"
+
+- 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..16151574880 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Miscellaneous/jumpsuit.yml
@@ -214,3 +214,13 @@
   id: MNKGymBra
   equipment:
     jumpsuit: ClothingUniformMNKGymBra
+
+- type: loadout
+  id: SyndieRecruitJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitRecruitSyndie
+
+- type: loadout
+  id: SyndieFormalJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSyndieFormal
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/accessories.yml
deleted file mode 100644
index d75b04931f3..00000000000
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/accessories.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: loadout
-  id: CDDogtags
-  storage:
-    back:
-    - CDDogtags
-
-- type: loadout
-  id: NoviceMark
-  storage:
-    back:
-    - ClothingNeckNoviceMark
-
-- type: loadout
-  id: HeartLocket
-  storage:
-    back:
-    - HeartLocket
-
-- type: loadout
-  id: GoldRing
-  storage:
-    back:
-    - GoldRing
-
-- type: loadout
-  id: SilverRing
-  storage:
-    back:
-    - SilverRing
diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml
new file mode 100644
index 00000000000..987348eb52f
--- /dev/null
+++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/cosmetics.yml
@@ -0,0 +1,68 @@
+- type: loadout
+  id: CDDogtags
+  storage:
+    back:
+    - CDDogtags
+
+- type: loadout
+  id: HeartLocket
+  storage:
+    back:
+    - HeartLocket
+
+- type: loadout
+  id: GoldRing
+  storage:
+    back:
+    - GoldRing
+
+- type: loadout
+  id: SilverRing
+  storage:
+    back:
+    - SilverRing
+
+- 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
+
+- 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/jobtrinkets.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml
deleted file mode 100644
index 4e6d44c79cb..00000000000
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/jobtrinkets.yml
+++ /dev/null
@@ -1,59 +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
diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml
index 7304b15acbf..6e87855c687 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/meds.yml
@@ -1,34 +1,39 @@
 - 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..447ad8e84d6 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/smokeables.yml
@@ -11,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 1a13c91e1c8..8eafa6bf5df 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/toys.yml
@@ -1,5 +1,26 @@
+# 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..768f2dc0e91 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/treats.yml
@@ -3,4 +3,35 @@
   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"
+
 # add the cotton lollipop if we ever port it
+# left out cotton candy, grape, lemonlime, mango, orange, pineapple, rootbeer, and watermelon
diff --git a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml
index 2e5e910ae23..aa28ab4ba57 100644
--- a/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml
+++ b/Resources/Prototypes/_starcup/Loadouts/Trinkets/utility.yml
@@ -9,3 +9,15 @@
   storage:
     back:
     - TapeRecorderFilled
+
+- type: loadout
+  id: BarFlask
+  storage:
+    back:
+    - DrinkFlaskBar
+
+- 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..4ad0a724bd4
--- /dev/null
+++ b/Resources/Prototypes/_starcup/Loadouts/dummy_entities.yml
@@ -0,0 +1,53 @@
+- 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
+    sprite: Objects/Specific/Chemistry/pills_canister.rsi
+    state: pill_canister
+
+- type: entity
+  parent: LoadoutDummyPillCanisterBase
+  id: LoadoutDummyEthyloxyephredine
+  categories: [ HideSpawnMenu ]
+  name: narcolepsy medication
+  description: A canister of ethyloxyephredine pills.
+
+- type: entity
+  parent: LoadoutDummyPillCanisterBase
+  id: LoadoutDummySoretizone
+  categories: [ HideSpawnMenu ]
+  name: painkiller medication
+  description: A canister of soretizone pills.
+
+- type: entity
+  parent: LoadoutDummyPillCanisterBase
+  id: LoadoutDummyAgonolexyne
+  categories: [ HideSpawnMenu ]
+  name: strong painkiller medication
+  description: A canister of agonolexyne pills.
+
+- type: entity
+  parent: LoadoutDummyPillCanisterBase
+  id: LoadoutDummyNeurozenium
+  categories: [ HideSpawnMenu ]
+  name: antidepressant medication
+  description: A canister of neurozenium pills.
+
+- type: entity
+  parent: LoadoutDummyPillCanisterBase
+  id: LoadoutDummyCalmafluxine
+  categories: [ HideSpawnMenu ]
+  name: anxiety medication
+  description: A canister of calmafluxine pills.
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