[FEATURE] Costume Bundles + Rearrange AutoDrobe

Resources/Prototypes/Catalog/Fills/Crates/service.yml

@@ -126,8 +126,11 @@
       entity_storage: !type:AllSelector
         children:
         - id: BarberScissors
-        - id: ClothingOuterSuitMonkey
-        - id: ClothingHeadHatAnimalMonkey
+        # Begin DEN: Costume bundles
+        # - id: ClothingOuterSuitMonkey
+        # - id: ClothingHeadHatAnimalMonkey
+        - id: CostumeBundleMonkey
+        # End DEN
         - id: ClothingUniformJumpskirtJanimaid
         - id: ClothingUniformJumpskirtOldDress
         - id: ClothingHeadHatMagician
@@ -151,11 +154,14 @@
           - id: ClothingMaskMime
           - id: ClothingBeltSuspendersRed
           - id: ClothingBeltSuspendersBlack
-        - !type:AllSelector # Performer starter kit
-          children:
-          - id: ClothingUniformJumpskirtPerformer
-          - id: ClothingShoesBootsPerformer
-          - id: ClothingHeadPerformerWig
+        # Begin DEN: Costume bundles
+        # - !type:AllSelector # Performer starter kit
+        #   children:
+        #   - id: ClothingUniformJumpskirtPerformer
+        #   - id: ClothingShoesBootsPerformer
+        #   - id: ClothingHeadPerformerWig
+        - id: CostumeBundlePerformer
+        # End DEN
 
 - type: entity
   parent: CrateGenericSteel

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -1,53 +1,95 @@
+# DEN: Autodrobe's inventory is sorted into three sections:
+# "Performer" job clothing (clown/mime), costume bundles, and miscellaneous accessories.
+
 - type: vendingMachineInventory
   id: AutoDrobeInventory
   startingInventory:
-    ClothingHeadHatJester: 1
-    ClothingUniformJumpsuitJester: 1
-    ClothingHeadHatJesterAlt: 1
-    ClothingUniformJumpsuitJesterAlt: 1
-    ClothingShoesJester: 2
+    ## DEN comment - Section 1 - Performer job clothing
+    # BEGIN Den: Costume bundles
+    # ClothingHeadHatJester: 1
+    # ClothingUniformJumpsuitJester: 1
+    # ClothingHeadHatJesterAlt: 1
+    # ClothingUniformJumpsuitJesterAlt: 1
+    # ClothingShoesJester: 2
+    CostumeBundleJester: 1
+    # END Den
+    ClothingHeadHatBeretFrench: 2 # Den: Moved to performer section
+    ClothingMaskSadMime: 1 # Den: Moved to performer section
+    ClothingMaskScaredMime: 1 # Den: Moved to performer section
     ClothingOuterWinterClown: 1
     ClothingOuterWinterMime: 1
     ClothingOuterWinterMusician: 1
+    ClothingOuterClownPriest: 1 # Den: Moved to performer section
+
+    # DEN comment - Section 2 - Costume bundles
+    # DEN start: Costume bundles
+    CostumeBundleCardborg: 2
+    CostumeBundleChicken: 2
+    CostumeBundleGladiator: 2
+    CostumeBundleJudge: 2
+    CostumeBundleMonkey: 2
+    CostumeBundleRedRaccoon: 2
+    CostumeBundleSanta: 2
+    CostumeBundleShrineMaiden: 2
+    CostumeBundleSkub: 2
+    CostumeBundleWitch: 2
+    CostumeBundleYakuza: 2
+    # DEN end
+
+    # DEN comment - Section 3 - Unbundled accessories
     ClothingMaskJoy: 2
-    ClothingHeadHatCardborg: 2
-    ClothingOuterCardborg: 2
+    # BEGIN Den: Costume bundles
+    # ClothingHeadHatCardborg: 2
+    # ClothingOuterCardborg: 2
+    # END Den
     ClothingHeadHatSombrero: 2
     ClothingOuterPonchoClassic: 2
-    ClothingHeadHatPwig: 2
-    ClothingOuterRobesJudge: 2
+    # BEGIN Den: Costume bundles
+    # ClothingHeadHatPwig: 2
+    # ClothingOuterRobesJudge: 2
+    # END Den
     ClothingOuterPoncho: 2
-    ClothingHeadHatSantahat: 2
-    ClothingOuterSanta: 2
-    ClothingHeadHatSkub: 2
-    ClothingOuterSkub: 2
-    ClothingHeadHatBeretFrench: 2
-    ClothingOuterSuitChicken: 2
-    ClothingHeadHatChickenhead: 2
-    ClothingOuterSuitMonkey: 2
+    # BEGIN Den: Costume bundles, etc.
+    # ClothingHeadHatSantahat: 2
+    # ClothingOuterSanta: 2
+    # ClothingHeadHatSkub: 2
+    # ClothingOuterSkub: 2
+    # ClothingHeadHatBeretFrench: 2 # Den: Move this up with performer items
+    # ClothingOuterSuitChicken: 2
+    # ClothingHeadHatChickenhead: 2
+    # ClothingOuterSuitMonkey: 2
+    # END Den
     ClothingHeadHatPumpkin: 2
-    ClothingHeadHatShrineMaidenWig: 2
-    ClothingOuterSuitShrineMaiden: 2
-    Gohei: 2
-    ClothingOuterSuitWitchRobes: 2
-    ClothingHeadHatWitch1: 2
-    ClothingHeadHatRedRacoon: 2
-    ClothingOuterRedRacoon: 2
+    # BEGIN Den: Costume bundles
+    # ClothingHeadHatShrineMaidenWig: 2
+    # ClothingOuterSuitShrineMaiden: 2
+    # Gohei: 2
+    # ClothingOuterSuitWitchRobes: 2
+    # ClothingHeadHatWitch1: 2
+    # ClothingHeadHatRedRacoon: 2
+    # ClothingOuterRedRacoon: 2
+    # END Den
     ClothingHeadPaperSack: 2
     ClothingHeadPaperSackSmile: 2
     ClothingEyesBlindfold: 1
     ClothingHeadRastaHat: 2
-    ClothingUniformJumpsuitDameDane: 2
-    ClothingShoesDameDane: 2
-    ClothingOuterDameDane: 2
-    ClothingOuterClownPriest: 1
-    ClothingMaskSadMime: 1
-    ClothingMaskScaredMime: 1
+    # BEGIN Den: Costume bundles, etc.
+    # ClothingUniformJumpsuitDameDane: 2
+    # ClothingShoesDameDane: 2
+    # ClothingOuterDameDane: 2
+    # ClothingOuterClownPriest: 1 # Den: Move this up with performer items
+    # ClothingMaskSadMime: 1 # Den: Move this up with performer items
+    # ClothingMaskScaredMime: 1 # Den: Move this up with performer items
+    # END Den
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
     FoodPoppy: 1
-    ClothingHeadHatGladiator: 1
-    ClothingUniformJumpsuitGladiator: 1
+    # BEGIN Den: Costume bundles
+    # ClothingHeadHatGladiator: 1
+    # ClothingUniformJumpsuitGladiator: 1
+    # END Den
+    # TODO DEN: Consider consolidating cowboy accessories into bundles.
+    # I'm not doing this right now b/c they're not "costumes" - just hats/boots.
     ClothingHeadHatCowboyBrown: 1
     ClothingHeadHatCowboyBlack: 1
     ClothingHeadHatCowboyWhite: 1

Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml

@@ -534,6 +534,9 @@
           Quantity: 10
         - ReagentId: Allicin
           Quantity: 5
+  - type: Tag # DEN: Allow item to be inserted in costume bundles
+    tags:
+    - CostumeItem
 # Tastes like pain.
 
 - type: entity

Resources/Prototypes/Entities/Objects/Fun/weapons.yml

@@ -211,6 +211,9 @@
       sprite: Objects/Weapons/Melee/cutlass.rsi
     shape:
     - 0,0,0,2
+  - type: Tag # DEN: Allow item be inserted in costume bundles
+    tags:
+    - CostumeItem
 
 - type: entity
   parent: [ BaseItem, BaseToySword ]

Resources/Prototypes/Entities/Objects/Weapons/Melee/gohei.yml

@@ -15,3 +15,6 @@
   - type: Item
     size: Small
     sprite: Objects/Weapons/Melee/gohei.rsi
+  - type: Tag # DEN: Allow item be inserted in costume bundles
+    tags:
+    - CostumeItem