Нижнее белье

Content.Client/Clothing/ClientClothingSystem.cs

@@ -40,6 +40,9 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"belt", "BELT"},
         {"gloves", "HAND"},
         {"shoes", "FEET"},
+        {"pants", "PANTS"}, // Sunrise-edit
+        {"socks", "SOCKS"}, // Sunrise-edit
+        {"bra", "BRA"}, // Sunrise-edit
         {"id", "IDCARD"},
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},

Content.Shared/Inventory/SlotFlags.cs

@@ -26,6 +26,9 @@ public enum SlotFlags
     LEGS = 1 << 13,
     FEET = 1 << 14,
     SUITSTORAGE = 1 << 15,
+    PANTS = 1 << 16, // Sunrise-edit
+    BRA = 1 << 17, // Sunrise-edit
+    SOCKS = 1 << 18, // Sunrise-edit
     All = ~NONE,
 
     WITHOUT_POCKET = All & ~POCKET

Content.Shared/Preferences/Loadouts/Effects/SexLoadoutEffect.cs

@@ -0,0 +1,25 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Humanoid;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Preferences.Loadouts.Effects;
+
+public sealed partial class SexLoadoutEffect : LoadoutEffect
+{
+    [DataField(required: true)]
+    public List<Sex> Sex = new();
+
+    public override bool Validate(HumanoidCharacterProfile profile, RoleLoadout loadout, LoadoutPrototype proto, ICommonSession session, IDependencyCollection collection,
+        [NotNullWhen(false)] out FormattedMessage? reason)
+    {
+        if (Sex.Contains(profile.Sex))
+        {
+            reason = null;
+            return true;
+        }
+
+        reason = FormattedMessage.FromUnformatted(Loc.GetString("loadout-group-sex-restriction"));
+        return false;
+    }
+}

Resources/Changelog/ChangelogSunrise.yml

@@ -304,3 +304,10 @@ Entries:
     type: Tweak
   id: 26
   time: '2024-06-07T08:24:40.104466+00:00'
+- author: VigersRay
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0438\u0436\
+      \u043D\u0435\u0435 \u0431\u0435\u043B\u044C\u0435."
+    type: Add
+  id: 27
+  time: '2024-06-07T17:08:00.724523+00:00'

Resources/Locale/ru-RU/preferences/loadout-groups.ftl

@@ -154,3 +154,8 @@ loadout-group-paramedic-backpack = Парамедик, рюкзак
 loadout-group-reporter-jumpsuit = Репортёр, комбинезон
 loadout-group-boxer-jumpsuit = Боксёр, комбинезон
 loadout-group-boxer-gloves = Боксёр, перчатки
+
+# Sunrise-edit
+loadout-group-pants = Трусы
+loadout-group-bra = Бюстгальтер
+loadout-group-socks = Носки

Resources/Locale/ru-RU/preferences/loadouts.ftl

@@ -4,3 +4,5 @@ loadouts-min-limit = Мин. кол-во: { $count }
 loadouts-max-limit = Макс. кол-во: { $count }
 loadouts-points-limit = Очки: { $count } / { $max }
 loadouts-points-restriction = Не хватает очков
+loadout-group-species-restriction = Не доступно для данной рассы
+loadout-group-sex-restriction = Не доступно для данного пола

Resources/Prototypes/Entities/Clothing/Under/under.yml

@@ -2,7 +2,7 @@
 # I would cry if we didn't have them. -swept
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: ClothingSocksBaseButcherable # Sunrise-end
   id: ClothingUnderSocksBee
   name: bee socks
   description: Make them loins buzz!
@@ -13,7 +13,7 @@
     sprite: Clothing/Under/Socks/bee.rsi
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: ClothingSocksBaseButcherable # Sunrise-end
   id: ClothingUnderSocksCoder
   name: coder socks
   description: It's time to code sisters!!11!
@@ -22,3 +22,4 @@
     sprite: Clothing/Under/Socks/coder.rsi
   - type: Clothing
     sprite: Clothing/Under/Socks/coder.rsi
+

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -90,9 +90,14 @@
         sprite: Mobs/Customization/masking_helpers.rsi
         state: unisex_full
         visible: false
-      - map: ["jumpsuit"]
+      # Sunrise-start
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["bra"]
+      - map: ["pants"]
+      - map: ["socks"]
+      - map: ["jumpsuit"]
+      # Sunrise-end
       - map: ["enum.HumanoidVisualLayers.LHand"]
       - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "gloves" ]

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -27,9 +27,14 @@
       sprite: Mobs/Customization/masking_helpers.rsi
       state: unisex_full
       visible: false
-    - map: ["jumpsuit"]
+    # Sunrise-start
     - map: ["enum.HumanoidVisualLayers.LFoot"]
     - map: ["enum.HumanoidVisualLayers.RFoot"]
+    - map: ["bra"]
+    - map: ["pants"]
+    - map: ["socks"]
+    - map: ["jumpsuit"]
+    # Sunrise-end
     - map: ["enum.HumanoidVisualLayers.LHand"]
     - map: ["enum.HumanoidVisualLayers.RHand"]
     - map: [ "gloves" ]
@@ -321,9 +326,14 @@
       sprite: Mobs/Customization/masking_helpers.rsi
       state: unisex_full
       visible: false
-    - map: ["jumpsuit"]
+    # Sunrise-start
     - map: ["enum.HumanoidVisualLayers.LFoot"]
     - map: ["enum.HumanoidVisualLayers.RFoot"]
+    - map: ["bra"]
+    - map: ["pants"]
+    - map: ["socks"]
+    - map: ["jumpsuit"]
+    # Sunrise-end
     - map: ["enum.HumanoidVisualLayers.LHand"]
     - map: ["enum.HumanoidVisualLayers.RHand"]
     - map: ["enum.HumanoidVisualLayers.Handcuffs"]

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -84,11 +84,16 @@
         sprite: Mobs/Customization/masking_helpers.rsi
         state: unisex_full
         visible: false
-      - map: [ "jumpsuit" ]
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+      # Sunrise-start
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["bra"]
+      - map: ["pants"]
+      - map: ["socks"]
+      - map: ["jumpsuit"]
+      # Sunrise-end
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
       - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
         color: "#ffffff"
         sprite: Objects/Misc/handcuffs.rsi

Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml

@@ -1,6 +1,29 @@
 - type: inventoryTemplate
   id: arachnid
   slots:
+    # Sunrise-start
+    - name: bra
+      slotTexture: bra
+      slotFlags: BRA
+      stripTime: 3
+      uiWindowPos: 3,2
+      strippingWindowPos: 2,1
+      displayName: Bra
+    - name: pants
+      slotTexture: pants
+      slotFlags: PANTS
+      stripTime: 6
+      uiWindowPos: 3,1
+      strippingWindowPos: 2,2
+      displayName: Pants
+    - name: socks
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 3
+      uiWindowPos: 3,0
+      strippingWindowPos: 2,3
+      displayName: Socks
+    # Sunrise-end
     - name: shoes
       slotTexture: shoes
       slotFlags: FEET
@@ -19,7 +42,7 @@
       slotTexture: gloves
       slotFlags: GLOVES
       uiWindowPos: 2,1
-      strippingWindowPos: 2,2
+      strippingWindowPos: 2,0 # Sunrise-edit
       displayName: Gloves
     - name: neck
       slotTexture: neck
@@ -45,7 +68,7 @@
       slotFlags: EARS
       stripTime: 3
       uiWindowPos: 2,2
-      strippingWindowPos: 2,0
+      strippingWindowPos: 2,-1 # Sunrise-edit
       displayName: Ears
     - name: head
       slotTexture: head
@@ -70,7 +93,7 @@
       slotGroup: SecondHotbar
       stripTime: 6
       uiWindowPos: 3,1
-      strippingWindowPos: 2,3
+      strippingWindowPos: 2,6 # Sunrise-edit
       displayName: Belt
     - name: back
       slotTexture: back
@@ -79,7 +102,7 @@
       slotGroup: SecondHotbar
       stripTime: 6
       uiWindowPos: 3,0
-      strippingWindowPos: 0,3
+      strippingWindowPos: 2,5 # Sunrise-edit
       displayName: Back
 
     - name: pocket4
@@ -135,7 +158,7 @@
       slotGroup: MainHotbar
       stripTime: 3
       uiWindowPos: 2,0
-      strippingWindowPos: 2,5
+      strippingWindowPos: 0,3 # Sunrise-edit
       dependsOn: outerClothing
       dependsOnComponents:
       - type: AllowSuitStorage

Resources/Prototypes/InventoryTemplates/human_inventory_template.yml

@@ -1,6 +1,29 @@
 - type: inventoryTemplate
   id: human
   slots:
+    # Sunrise-start
+    - name: bra
+      slotTexture: bra
+      slotFlags: BRA
+      stripTime: 3
+      uiWindowPos: 3,2
+      strippingWindowPos: 2,1
+      displayName: Bra
+    - name: pants
+      slotTexture: pants
+      slotFlags: PANTS
+      stripTime: 6
+      uiWindowPos: 3,1
+      strippingWindowPos: 2,2
+      displayName: Pants
+    - name: socks
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 3
+      uiWindowPos: 3,0
+      strippingWindowPos: 2,3
+      displayName: Socks
+    # Sunrise-end
     - name: shoes
       slotTexture: shoes
       slotFlags: FEET
@@ -26,7 +49,7 @@
       slotTexture: gloves
       slotFlags: GLOVES
       uiWindowPos: 2,1
-      strippingWindowPos: 2,2
+      strippingWindowPos: 2,0 # Sunrise-edit
       displayName: Gloves
     - name: neck
       slotTexture: neck
@@ -52,7 +75,7 @@
       slotFlags: EARS
       stripTime: 3
       uiWindowPos: 2,2
-      strippingWindowPos: 2,0
+      strippingWindowPos: 2,-1 # Sunrise-edit
       displayName: Ears
     - name: head
       slotTexture: head
@@ -88,7 +111,7 @@
       slotGroup: MainHotbar
       stripTime: 3
       uiWindowPos: 2,0
-      strippingWindowPos: 2,5
+      strippingWindowPos: 0,3 # Sunrise-edit
       dependsOn: outerClothing
       dependsOnComponents:
       - type: AllowSuitStorage