diff --git a/Content.Shared/Inventory/SlotFlags.cs b/Content.Shared/Inventory/SlotFlags.cs
index b1f3871a309..fd6b4b3f970 100644
--- 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
index cb25bdc2f9c..207106d9190 100644
--- 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
index 5e67a01db0f..ed918e70aad 100644
--- 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
index 22257cae47e..bf624078d98 100644
--- 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
index 77811158a7f..b850d825700 100644
--- 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
index 0708b3f9f8f..60ab823c7e0 100644
--- 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
index dd6a8fe7ce4..d1914f26eae 100644
--- 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,13 +56,21 @@
 
 - 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
@@ -75,9 +78,8 @@
 
 - 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
diff --git a/Resources/Prototypes/Andromeda/Loadouts/loadout_groups.yml b/Resources/Prototypes/Andromeda/Loadouts/loadout_groups.yml
index 7c38b5da907..c58017ed7d6 100644
--- a/Resources/Prototypes/Andromeda/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Andromeda/Loadouts/loadout_groups.yml
@@ -38,8 +38,8 @@
   minLimit: 1
   maxLimit: 1
   loadouts:
-  - HoPBoxers
-  - HoPPanties
+  - HOPBoxers
+  - HOPPanties
 
 - type: loadoutGroup
   id: HoPUnderwearTop
@@ -47,8 +47,93 @@
   minLimit: 0
   maxLimit: 1
   loadouts:
-  - HoPBra
-  
+  - HOPBra
+
+- type: loadoutGroup
+  id: QMUnderwearBottom
+  name: Квартирмейстер, трусы
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - QMBoxers
+  - QMPanties
+
+- type: loadoutGroup
+  id: QMUnderwearTop
+  name: Квартирмейстер, бра
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - QMBra
+
+- type: loadoutGroup
+  id: CEUnderwearBottom
+  name: Старший инженер, трусы
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - CEBoxers
+  - CEPanties
+
+- type: loadoutGroup
+  id: CEUnderwearTop
+  name: Старший инженер, бра
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - CEBra
+
+- type: loadoutGroup
+  id: CMOUnderwearBottom
+  name: Главный врач, трусы
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - CMOBoxers
+  - CMOPanties
+
+- type: loadoutGroup
+  id: CMOUnderwearTop
+  name: Главный врач, бра
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - CMOBra
+
+- type: loadoutGroup
+  id: RDUnderwearBottom
+  name: Научный руководитель, трусы
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - RDBoxers
+  - RDPanties
+
+- type: loadoutGroup
+  id: RDUnderwearTop
+  name: Научный руководитель, бра
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - RDBra
+
+- type: loadoutGroup
+  id: HOSUnderwearBottom
+  name: Глава службы безопасности, трусы
+  minLimit: 1
+  maxLimit: 1
+  loadouts:
+  - HOSBoxers
+  - HOSPanties
+
+- type: loadoutGroup
+  id: HOSUnderwearTop
+  name: Глава службы безопасности, бра
+  minLimit: 0
+  maxLimit: 1
+  loadouts:
+  - HOSBra
+
 # Civilian
 
 - type: loadoutGroup
@@ -70,6 +155,7 @@
   minLimit: 0
   maxLimit: 1
   loadouts:
+  - BraWhite
   - BraSports
   - BraNeko
   - BraLace
@@ -107,4 +193,4 @@
   minLimit: 0
   maxLimit: 1
   loadouts:
-  - DruidBotanistCloak
\ No newline at end of file
+  - DruidBotanistCloak
diff --git a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
index 783833a1d37..68365fca429 100644
--- a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
@@ -15,9 +15,6 @@
       uiWindowPos: 3,0
       strippingWindowPos: 2,4
       displayName: Socks
-      whitelist:
-        tags:
-          - socks
     - name: underwearb # Andromeda-Underwear
       slotTexture: underwearb
       slotFlags: UNDERWEARB
@@ -25,9 +22,6 @@
       uiWindowPos: 3,1
       strippingWindowPos: 0,4
       displayName: Panties
-      whitelist:
-        tags:
-          - underwearb
     - name: underweart # Andromeda-Underwear
       slotTexture: underweart
       slotFlags: UNDERWEART
@@ -35,9 +29,6 @@
       uiWindowPos: 3,2
       strippingWindowPos: 1,4
       displayName: Bra
-      whitelist:
-        tags:
-          - underweart
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
diff --git a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml
index 335385076ec..d4178f7f0d8 100644
--- a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml
@@ -15,9 +15,6 @@
       uiWindowPos: 3,0
       strippingWindowPos: 2,4
       displayName: Socks
-      whitelist:
-        tags:
-          - socks
     - name: underwearb # Andromeda-Underwear
       slotTexture: underwearb
       slotFlags: UNDERWEARB
@@ -25,9 +22,6 @@
       uiWindowPos: 3,1
       strippingWindowPos: 0,4
       displayName: Panties
-      whitelist:
-        tags:
-          - underwearb
     - name: underweart # Andromeda-Underwear
       slotTexture: underweart
       slotFlags: UNDERWEART
@@ -35,9 +29,6 @@
       uiWindowPos: 3,2
       strippingWindowPos: 1,4
       displayName: Bra
-      whitelist:
-        tags:
-          - underweart
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 138e584cc36..efd6f25a629 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -10,9 +10,9 @@
   # A-13 Loadouts start
   - CaptainShoes
   - CaptainGloves
-  # - BasicUnderwearBottom
-  # - BasicUnderwearTop
-  # - BasicUnderwearSocks
+  - CaptainUnderwearTop
+  - CaptainUnderwearBottom
+  - BasicUnderwearSocks
   # A-13 Loadouts end
   - Trinkets
   - Inventory # Corvax-Loadouts
@@ -26,8 +26,8 @@
   - HoPBackpack
   - HoPOuterClothing
   # A-13 Loadouts start
-  - BasicUnderwearBottom
-  - BasicUnderwearTop
+  - HoPUnderwearTop
+  - HoPUnderwearBottom
   - BasicUnderwearSocks
   # A-13 Loadouts end
   - Glasses
@@ -240,8 +240,8 @@
   - QuartermasterOuterClothing
   - QuartermasterShoes
   # A-13 Loadouts start
-  - BasicUnderwearBottom
-  - BasicUnderwearTop
+  - QMUnderwearTop
+  - QMUnderwearBottom
   - BasicUnderwearSocks
   # A-13 Loadouts end
   - Glasses
@@ -291,8 +291,8 @@
   - ChiefEngineerOuterClothing
   - ChiefEngineerShoes
   # A-13 Loadouts start
-  - BasicUnderwearBottom
-  - BasicUnderwearTop
+  - CEUnderwearTop
+  - CEUnderwearBottom
   - BasicUnderwearSocks
   # A-13 Loadouts end
   - Trinkets
@@ -355,8 +355,8 @@
   - ScientistGloves
   - ResearchDirectorShoes
   # A-13 Loadouts start
-  - BasicUnderwearBottom
-  - BasicUnderwearTop
+  - RDUnderwearTop
+  - RDUnderwearBottom
   - BasicUnderwearSocks
   # A-13 Loadouts end
   - Glasses
@@ -409,8 +409,8 @@
   - HeadofSecurityOuterClothing
   - SecurityShoes
   # A-13 Loadouts start
-  - BasicUnderwearBottom
-  - BasicUnderwearTop
+  - HOSUnderwearTop
+  - HOSUnderwearBottom
   - BasicUnderwearSocks
   # A-13 Loadouts end
   - Trinkets
@@ -495,8 +495,8 @@
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerShoes
   # A-13 Loadouts start
-  - BasicUnderwearBottom
-  - BasicUnderwearTop
+  - CMOUnderwearTop
+  - CMOUnderwearBottom
   - BasicUnderwearSocks
   # A-13 Loadouts end
   - Glasses
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index 540f288aa84..64b39ff9471 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -18,6 +18,3 @@
     id: CargoPDA
     ears: ClothingHeadsetCargo
     pocket1: AppraisalTool
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 9a50e1b21c7..ded93b161e7 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -43,6 +43,3 @@
     ears: ClothingHeadsetQM
     belt: BoxFolderClipboard
     pocket1: AppraisalTool
-    underwearb: ClothingUnderwearBottomBoxersQM # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraQM # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesQM # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index 04ecc79105b..7b82163ace9 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -24,6 +24,3 @@
     jumpsuit: ClothingUniformJumpsuitSalvageSpecialist
     id: SalvagePDA
     ears: ClothingHeadsetCargo
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
index 78e79ade613..b245abb5f99 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
@@ -14,6 +14,3 @@
   equipment:
     id: PassengerPDA
     ears: ClothingHeadsetGrey
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
index 94b5ccb09a4..2fc70192181 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
@@ -24,6 +24,3 @@
     shoes: ClothingShoesColorBlack
     id: BartenderPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
index bcd979a9292..feed9e7e6bf 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml
@@ -21,6 +21,3 @@
     id: BotanistPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltPlantFilled
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index c7d026d6331..e3dc1cb23db 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -20,6 +20,3 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
index 64f74b654dd..2b915040821 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
@@ -25,6 +25,3 @@
     id: ChefPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltChefFilled
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index cda8cbb671a..1de36be17ae 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -36,6 +36,3 @@
     pocket2: ClownRecorder
     id: ClownPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
index d68b192a7a1..b768bd25be5 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml
@@ -22,9 +22,6 @@
     id: JanitorPDA
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
 
 - type: startingGear
   id: JanitorMaidGear
@@ -35,6 +32,3 @@
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index fd5e14aa1f9..9b4c9bd29cb 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -23,8 +23,5 @@
     id: LawyerPDA
     ears: ClothingHeadsetSecurity
     # TODO add copy of space law
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearToplaceBra # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesLace # Andromeda-Underwear
   inhand:
     - BriefcaseBrownFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
index 3ed9ad3c107..909d8da19da 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -18,6 +18,3 @@
     ears: ClothingHeadsetService
     pocket1: d10Dice
     pocket2: HandLabeler # for making named bestsellers
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 42dce30c96e..19d363b9c2d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -28,9 +28,6 @@
     pocket2: Paper
     id: MimePDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
 
 - type: entity
   id: ActionMimeInvisibleWall
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index ace3ce539ac..6733bd45ea0 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -22,6 +22,3 @@
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
index d830a36888b..83c95cacc8b 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -21,6 +21,3 @@
     shoes: ClothingShoesColorBlack
     id: ServiceWorkerPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 6eaef491998..3d03d9d7ee6 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -40,6 +40,3 @@
     gloves: ClothingHandsGlovesCaptain
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
-    underwearb: ClothingUnderwearBottomBoxersCap # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraCap # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesCap # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
index 17ee3cb18d8..20a4aabce14 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
@@ -29,5 +29,3 @@
     pocket1: BoxFolderBlack
     pocket2: PenCentcom
     underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearToplaceBra # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesLace # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 4897d3ce4ab..e430cee4b89 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -64,6 +64,3 @@
     gloves: ClothingHandsGlovesHop
     ears: ClothingHeadsetAltCommand
     belt: BoxFolderClipboard
-    underwearb: ClothingUnderwearBottomBoxersHOP # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraHOP # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesHOP # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index 912ffdbcaff..ce3ad9bc95f 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -23,6 +23,3 @@
     id: AtmosPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index e09817307e5..c71b454bd79 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -45,6 +45,3 @@
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
     belt: ClothingBeltUtilityEngineering
-    underwearb: ClothingUnderwearBottomBoxersCE # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraCE # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesCE # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index 82252624d23..87f2e9fe3a8 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -23,6 +23,3 @@
     eyes: ClothingEyesGlassesMeson
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index f0c1dffb940..e2be6a23390 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -27,6 +27,3 @@
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
     pocket2: BookEngineersHandbook
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index af7ca96d1a4..f24f0302fde 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -23,6 +23,3 @@
     belt: ChemBag
     pocket1: HandLabeler
     eyes: ClothingEyesGlassesChemical
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index e10760968d2..bdaf19a5584 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -43,6 +43,3 @@
     id: CMOPDA
     ears: ClothingHeadsetCMO
     belt: ClothingBeltMedicalFilled
-    underwearb: ClothingUnderwearBottomBoxersCMO # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraCMO # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesCMO # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index c93911c46c1..f574943c257 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -21,6 +21,3 @@
   equipment:
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index fd7bda6dfc4..57df49993f9 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -24,6 +24,3 @@
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
     pocket2: BookMedicalReferenceBook
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 7c993abb1b2..1ef1ba43ef2 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -25,6 +25,3 @@
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalEMTFilled
     pocket1: HandheldCrewMonitor # A-13
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraSportsAlternative # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index 578058aaadb..554c7ee10cb 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -23,6 +23,3 @@
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
     pocket2: BookScientistsGuidebook
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 8884133b3e3..d03f7a85295 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -35,6 +35,3 @@
   equipment:
     id: RnDPDA
     ears: ClothingHeadsetRD
-    underwearb: ClothingUnderwearBottomBoxersRD # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraRD # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesRD # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
index 1e7d38afbb6..8ba3d94826c 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml
@@ -18,7 +18,3 @@
   id: ScientistGear
   equipment:
     ears: ClothingHeadsetScience
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
-
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index a9c992102d3..13007d961cd 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -48,6 +48,3 @@
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
     pocket1: WeaponPistolMk58
-    underwearb: ClothingUnderwearBottomBoxersHOS # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraHOS # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesHOS # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 29ea0e867c8..f002dc55004 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -35,6 +35,3 @@
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58
     pocket2: BookSecurity
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraSportsAlternative # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index dbba068a87c..3e2847095ed 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -28,6 +28,3 @@
     eyes: ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraSportsAlternative # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 3d5659abde6..71af6cf6488 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -31,6 +31,3 @@
     id: WardenPDA
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraSportsAlternative # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
index 949970f56da..0f19323724a 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
@@ -17,6 +17,3 @@
     ears: ClothingHeadsetService
     shoes: ClothingShoesColorRed
     belt: ClothingBeltChampion
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraSports # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
index a63702ea602..d1d07c008c8 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -19,6 +19,3 @@
     shoes: ClothingShoesLeather
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
index bd26affb6a3..d2d70d856a5 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
@@ -16,6 +16,3 @@
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
index 07a94dd52c0..27e7fa65ff6 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
@@ -18,6 +18,3 @@
     shoes: ClothingShoesColorWhite
     id: ZookeeperPDA
     ears: ClothingHeadsetService
-    underwearb: ClothingUnderwearBottomBoxersWhite # Andromeda-Underwear
-  underweart: ClothingUnderwearTopBraWhite # Andromeda-Underwear
-  underwearb: ClothingUnderwearBottomPantiesWhite # Andromeda-Underwear