feat: Expand Loadout Options

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

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
 

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

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

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

Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml

@@ -215,6 +215,7 @@
   loadouts:
   - ParamedicWindbreaker
   - ParamedicWintercoat
+  - MedicalSweater # starcup
 
 - type: loadoutGroup
   parent: MedicalShoes # starcup

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

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

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

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:

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

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

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

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.

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.

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

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