lzk228 · lzk228 · Sep 26, 2024 · Sep 26, 2024 · Sep 27, 2024 · Oct 7, 2024
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -47,6 +47,9 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},
         {"suitstorage", "SUITSTORAGE"},
+	    {"socks", "SOCKS"},
+	    {"underweart", "UNDERWEART"},
+	    {"underwearb", "UNDERWEARB"},
     };
 
     [Dependency] private readonly IResourceCache _cache = default!;

diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -150,7 +150,7 @@ public void UpdateMenu()
             // for now: shit-code
             // this breaks for drones (too many hands, lots of empty vertical space), and looks shit for monkeys and the like.
             // but the window is realizable, so eh.
-            _strippingMenu.SetSize = new Vector2(220, snare?.IsEnsnared == true ? 550 : 530);
+            _strippingMenu.SetSize = new Vector2(220, snare?.IsEnsnared == true ? 600 : 600);
         }
 
         private void AddHandButton(Hand hand)

diff --git a/Content.Shared/Inventory/SlotFlags.cs b/Content.Shared/Inventory/SlotFlags.cs
@@ -26,6 +26,9 @@ public enum SlotFlags
     LEGS = 1 << 13,
     FEET = 1 << 14,
     SUITSTORAGE = 1 << 15,
+    UNDERWEART = 1 << 16,
+    UNDERWEARB = 1 << 17,
+    SOCKS = 1 << 18,
     All = ~NONE,
 
     WITHOUT_POCKET = All & ~POCKET

diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
@@ -1,2 +1,19 @@
 loadout-group-inventory = Мой инвентарь
 loadout-group-chief-engineer-backpack = Рюкзак старшего инженера
+loadout-groups-captain-underwearbottom = Капитан, трусы
+loadout-group-captain-underweartop = Капитан, бра
+loadout-group-hop-underwearbottom = ГП, трусы
+loadout-group-hop-underweartop = ГП, бра
+loadout-group-qm-underwearbottom = КМ, трусы
+loadout-group-qm-underweartop = КМ, бра
+loadout-group-ce-underwearbottom = СИ, трусы
+loadout-group-ce-underweartop = СИ, бра
+loadout-group-cmo-underwearbottom = ГВ, трусы
+loadout-group-cmo-underweartop = ГВ, бра
+loadout-group-rd-underwearbottom = НР, трусы
+loadout-group-rd-underweartop = НР, бра
+loadout-group-hos-underwearbottom = ГСБ, трусы
+loadout-group-hos-underweartop = ГСБ, бра
+loadout-group-general-underwearbottom = Общий, трусы
+loadout-group-general-underweartop = Общий, бра
+loadout-group-general-socks = Общий, носки
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -0,0 +1,18 @@
+# Panties
+
+- type: loadout
+  id: QMBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersQM
+
+- type: loadout
+  id: QMPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesQM
+
+# Bra
+
+- type: loadout
+  id: QMBra
+  equipment:
+    underweart: ClothingUnderwearTopBraQM
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Command/captain.yml
@@ -8,3 +8,22 @@
   id: CaptainJumpskirtTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpskirtCapTurtleneck
+
+# Panties
+
+- type: loadout
+  id: CaptainBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersCap
+
+- type: loadout
+  id: CaptainPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesCap
+
+# Bra
+
+- type: loadout
+  id: CaptainBra
+  equipment:
+    underweart: ClothingUnderwearTopBraCap
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -8,3 +8,22 @@
   id: HoPJumpskirtTurtleneck
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoPTurtleneck
+
+# Panties
+
+- type: loadout
+  id: HOPBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersHOP
+
+- type: loadout
+  id: HOPPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesHOP
+
+# Bra
+
+- type: loadout
+  id: HOPBra
+  equipment:
+    underweart: ClothingUnderwearTopBraHOP
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Engineering/chief_engineer.yml
@@ -13,3 +13,22 @@
   id: ChiefEngineerDuffel
   equipment:
     back: ClothingBackpackDuffelCE
+
+# Panties
+
+- type: loadout
+  id: CEBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersCE
+
+- type: loadout
+  id: CEPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesCE
+
+# Bra
+
+- type: loadout
+  id: CEBra
+  equipment:
+    underweart: ClothingUnderwearTopBraCE
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -0,0 +1,18 @@
+# Panties
+
+- type: loadout
+  id: CMOBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersCMO
+
+- type: loadout
+  id: CMOPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesCMO
+
+# Bra
+
+- type: loadout
+  id: CMOBra
+  equipment:
+    underweart: ClothingUnderwearTopBraCMO
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Science/research_director.yml
@@ -8,3 +8,22 @@
   id: ResearchDirectorJumpskirtClassical
   equipment:
     jumpsuit: ClothingUniformJumpskirtRDClassical
+
+# Panties
+
+- type: loadout
+  id: RDBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersRD
+
+- type: loadout
+  id: RDPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesRD
+
+# Bra
+
+- type: loadout
+  id: RDBra
+  equipment:
+    underweart: ClothingUnderwearTopBraRD
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Security/head_of_security.yml
@@ -8,3 +8,22 @@
   id: HeadofSecurityJumpskirtBlack
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoSBlack
+
+# Panties
+
+- type: loadout
+  id: HOSBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersHOS
+
+- type: loadout
+  id: HOSPanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesHOS
+
+# Bra
+
+- type: loadout
+  id: HOSBra
+  equipment:
+    underweart: ClothingUnderwearTopBraHOS
diff --git a/Resources/Prototypes/Corvax/Loadouts/Miscellaneous/underwear.yml b/Resources/Prototypes/Corvax/Loadouts/Miscellaneous/underwear.yml
@@ -0,0 +1,100 @@
+# Panties
+
+- type: loadout
+  id: WhiteBoxers
+  equipment:
+    underwearb: ClothingUnderwearBottomBoxersWhite
+
+- type: loadout
+  id: WhitePanties
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesWhite
+
+- type: loadout
+  id: WhitePantiesNeko
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesNeko
+
+- type: loadout
+  id: PantiesLace
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesLace
+
+- type: loadout
+  id: PantiesThong
+  equipment:
+    underwearb: ClothingUnderwearBottomPantiesThong
+
+# Bra
+
+- type: loadout
+  id: BraWhite
+  equipment:
+    underweart: ClothingUnderwearTopBraWhite
+
+- type: loadout
+  id: BraSports
+  equipment:
+    underweart: ClothingUnderwearTopBraSports
+
+- type: loadout
+  id: BraNeko
+  equipment:
+    underweart: ClothingUnderwearTopNekoBra
+
+- type: loadout
+  id: BraLace
+  equipment:
+    underweart: ClothingUnderwearToplaceBra
+
+- type: loadout
+  id: BraSportsAlt
+  equipment:
+    underweart: ClothingUnderwearTopBraSportsAlternative
+
+#Socks
+
+- type: loadout
+  id: SocksNormal
+  equipment:
+    socks: ClothingUnderwearSocksNormal
+
+- type: loadout
+  id: SocksHigh
+  equipment:
+    socks: ClothingUnderwearSocksHigh
+
+- type: loadout
+  id: SocksShort
+  equipment:
+    socks: ClothingUnderwearSocksShort
+
+- type: loadout
+  id: SocksBee
+  equipment:
+    socks: ClothingUnderSocksBee
+
+- type: loadout
+  id: SocksCoder
+  equipment:
+    socks: ClothingUnderSocksCoder
+
+- type: loadout
+  id: SocksPantyhose
+  equipment:
+    socks: ClothingUnderwearSocksPantyhose
+
+- type: loadout
+  id: SocksFishnettights
+  equipment:
+    socks: ClothingUnderwearSocksFishnettights
+
+- type: loadout
+  id: SocksGarters
+  equipment:
+    socks: ClothingUnderwearSocksGarters
+
+- type: loadout
+  id: SocksRich
+  equipment:
+    socks: ClothingUnderwearSocksRich