Fix underwear loadouts

13lackHawk · Jun 11, 2024 · c8b72ab · c8b72ab
1 parent 4224872
commit c8b72ab
Show file tree

Hide file tree

Showing 49 changed files with 157 additions and 247 deletions.
diff --git a/Content.Shared/Inventory/SlotFlags.cs b/Content.Shared/Inventory/SlotFlags.cs
@@ -26,9 +26,9 @@ public enum SlotFlags
     LEGS = 1 << 13,
     FEET = 1 << 14,
     SUITSTORAGE = 1 << 15,
-    UNDERWEART = 1 << 10, // Andromeda-Underwear
-    UNDERWEARB = 1 << 10, // Andromeda-Underwear
-    SOCKS = 1 << 10, // Andromeda-Underwear
+    UNDERWEART = 1 << 16, // Andromeda-Underwear
+    UNDERWEARB = 1 << 17, // Andromeda-Underwear
+    SOCKS = 1 << 18, // Andromeda-Underwear
     All = ~NONE,
 
     WITHOUT_POCKET = All & ~POCKET

diff --git a/Resources/Prototypes/Andromeda/Entities/Clothing/Underwear/base.yml b/Resources/Prototypes/Andromeda/Entities/Clothing/Underwear/base.yml
@@ -1,14 +1,12 @@
 - type: entity
   abstract: true
   parent: Clothing
-  id: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBase
   components:
   - type: Sprite
     state: icon
   - type: Item
     size: Tiny
-  - type: Clothing
-    slots: [underwearb]
   - type: Butcherable
     butcheringType: Knife
     spawned:
@@ -23,69 +21,32 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 10
-  - type: Tag
-    tags:
+
+- type: entity
+  abstract: true
+  parent: ClothingUnderwearBase
+  id: ClothingUnderwearBottomBase
+  components:
+  - type: Clothing
+    slots:
     - underwearb
-    - ClothMade
   - type: StealTarget
     stealGroup: Panties
 
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: ClothingUnderwearBase
   id: ClothingUnderwearTopBase
   components:
-  - type: Sprite
-    state: icon
-  - type: Item
-    size: Tiny
   - type: Clothing
-    slots: [underweart]
-  - type: Butcherable
-    butcheringType: Knife
-    spawned:
-    - id: MaterialCloth1
-      amount: 1
-  - type: Food
-    requiresSpecialDigestion: true
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Fiber
-          Quantity: 10
-  - type: Tag
-    tags:
+    slots:
     - underweart
-    - ClothMade
 
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: ClothingUnderwearBase
   id: ClothingUnderwearSocksBase
   components:
-  - type: Sprite
-    state: icon
-  - type: Item
-    size: Tiny
   - type: Clothing
-    slots: [socks]
-  - type: Butcherable
-    butcheringType: Knife
-    spawned:
-    - id: MaterialCloth1
-      amount: 1
-  - type: Food
-    requiresSpecialDigestion: true
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 10
-        reagents:
-        - ReagentId: Fiber
-          Quantity: 10
-  - type: Tag
-    tags:
+    slots:
     - socks
-    - ClothMade
diff --git a/Resources/Prototypes/Andromeda/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Andromeda/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -2,7 +2,7 @@
 
 - type: loadout
   id: QMBoxers
-  equipment: CaptainBoxers
+  equipment: QMBoxers
 
 - type: startingGear
   id: QMBoxers

diff --git a/Resources/Prototypes/Andromeda/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Andromeda/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -26,7 +26,7 @@
 
 - type: loadout
   id: CMOBoxers
-  equipment: CaptainBoxers
+  equipment: CMOBoxers
 
 - type: startingGear
   id: CMOBoxers

diff --git a/Resources/Prototypes/Andromeda/Loadouts/Jobs/Sciense/research_director.yml b/Resources/Prototypes/Andromeda/Loadouts/Jobs/Sciense/research_director.yml
@@ -2,7 +2,7 @@
 
 - type: loadout
   id: RDBoxers
-  equipment: CaptainBoxers
+  equipment: RDBoxers
 
 - type: startingGear
   id: RDBoxers

diff --git a/Resources/Prototypes/Andromeda/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Andromeda/Loadouts/Jobs/Security/head_of_security.yml
@@ -2,7 +2,7 @@
 
 - type: loadout
   id: HOSBoxers
-  equipment: CaptainBoxers
+  equipment: HOSBoxers
 
 - type: startingGear
   id: HOSBoxers

diff --git a/Resources/Prototypes/Andromeda/Loadouts/Miscellaneous/underwear.yml b/Resources/Prototypes/Andromeda/Loadouts/Miscellaneous/underwear.yml
@@ -6,9 +6,8 @@
 
 - type: startingGear
   id: WhiteBoxers
-  storage:
-    back:
-    - ClothingUnderwearBottomBoxersWhite
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersWhite
 
 
 - type: loadout
@@ -17,9 +16,8 @@
 
 - type: startingGear
   id: WhitePanties
-  storage:
-    back:
-    - ClothingUnderwearBottomPantiesWhite
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesWhite
 
 
 - type: loadout
@@ -28,9 +26,8 @@
 
 - type: startingGear
   id: WhitePantiesNeko
-  storage:
-    back:
-    - ClothingUnderwearBottomPantiesNeko
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesNeko
 
 
 - type: loadout
@@ -39,9 +36,8 @@
 
 - type: startingGear
   id: PantiesLace
-  storage:
-    back:
-    - ClothingUnderwearBottomPantiesLace
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesLace
 
 
 - type: loadout
@@ -50,9 +46,8 @@
 
 - type: startingGear
   id: PantiesThong
-  storage:
-    back:
-    - ClothingUnderwearBottomPantiesThong
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesThong
 
 
 - type: loadout
@@ -61,23 +56,30 @@
 
 - type: startingGear
   id: PantiesElegant
-  storage:
-    back:
-    - ClothingUnderwearBottomElegantpanties
+  equipment:
+    underwearb: ClothingUnderwearBottomElegantpanties
 
 
 # Bra
 
+- type: loadout
+  id: BraWhite
+  equipment: BraWhite
+
+- type: startingGear
+  id: BraWhite
+  equipment:
+    underweart: ClothingUnderwearTopBraWhite
+
 
 - type: loadout
   id: BraSports
   equipment: BraSports
 
 - type: startingGear
   id: BraSports
-  storage:
-    back:
-    - ClothingUnderwearTopBraSports
+  equipment:
+    underweart: ClothingUnderwearTopBraSports
 
 
 - type: loadout
@@ -86,9 +88,8 @@
 
 - type: startingGear
   id: BraNeko
-  storage:
-    back:
-    - ClothingUnderwearTopNekoBra
+  equipment:
+    underweart: ClothingUnderwearTopNekoBra
 
 
 - type: loadout
@@ -97,9 +98,8 @@
 
 - type: startingGear
   id: BraLace
-  storage:
-    back:
-    - ClothingUnderwearToplaceBra
+  equipment:
+    underweart: ClothingUnderwearToplaceBra
 
 
 - type: loadout
@@ -108,9 +108,8 @@
 
 - type: startingGear
   id: BraSportsAlt
-  storage:
-    back:
-    - ClothingUnderwearTopBraSportsAlternative
+  equipment:
+    underweart: ClothingUnderwearTopBraSportsAlternative
 
 
 - type: loadout
@@ -119,9 +118,8 @@
 
 - type: startingGear
   id: BraWarm
-  storage:
-    back:
-    - ClothingUnderwearWarmbra
+  equipment:
+    underweart: ClothingUnderwearWarmbra
 
 
 #Socks