Revert "Revert "New clothing (Rxup#701)""

BrigChill3000 · Sep 21, 2024 · b8a9bfa · b8a9bfa
1 parent 4fe6401
commit b8a9bfa
Show file tree

Hide file tree

Showing 312 changed files with 3,587 additions and 12 deletions.
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"},
+        {"underpants", "UNDERPANTS"}, //backmen:underclothing
+        {"undershirt", "UNDERSHIRT"}, //backmen:underclothing
+        {"socks", "SOCKS"}, //backmen:underclothing
     };
 
     [Dependency] private readonly IResourceCache _cache = default!;

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,
+    UNDERPANTS = 1 << 16, //backmen:underclothing
+    UNDERSHIRT = 1 << 17, //backmen:underclothing
+    SOCKS = 1 << 18, //backmen:underclothing
     All = ~NONE,
 
     WITHOUT_POCKET = All & ~POCKET

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -19,19 +19,13 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    - shader: StencilClear
-      sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
-      # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
-      # sprite refactor when
-      state: l_leg
-    - shader: StencilMask
-      map: ["enum.HumanoidVisualLayers.StencilMask"]
-      sprite: Mobs/Customization/masking_helpers.rsi
-      state: unisex_full
-      visible: false
-    - map: ["jumpsuit"]
+#    - map: ["jumpsuit"]
     - map: ["enum.HumanoidVisualLayers.LFoot"]
     - map: ["enum.HumanoidVisualLayers.RFoot"]
+    - map: ["socks"] #backmen:underclothing
+    - map: ["underpants"] #backmen:underclothing
+    - map: ["undershirt"] #backmen:underclothing
+    - map: ["jumpsuit"]
     - map: ["enum.HumanoidVisualLayers.LHand"]
     - map: ["enum.HumanoidVisualLayers.RHand"]
     - map: [ "gloves" ]

diff --git a/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
@@ -15,6 +15,29 @@
       uiWindowPos: 0,1
       strippingWindowPos: 0,2
       displayName: Jumpsuit
+    #backmen:underclothing-start
+    - name: undershirt
+      slotTexture: undershirt
+      slotFlags: UNDERSHIRT
+      stripTime: 8
+      uiWindowPos: 4,1
+      strippingWindowPos: 3,1
+      displayName: Undershirt
+    - name: underpants
+      slotTexture: underpants
+      slotFlags: UNDERPANTS
+      stripTime: 12
+      uiWindowPos: 4,0
+      strippingWindowPos: 3,2
+      displayName: Underpants
+    - name: socks
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 8
+      uiWindowPos: 4,2
+      strippingWindowPos: 3,3
+      displayName: Socks
+    #backmen:underclothing-end
     - name: gloves
       slotTexture: gloves
       slotFlags: GLOVES

diff --git a/Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/corpse_inventory_template.yml
@@ -22,6 +22,29 @@
       uiWindowPos: 1,1
       strippingWindowPos: 1,2
       displayName: Suit
+      #backmen:underclothing-start
+    - name: undershirt
+      slotTexture: undershirt
+      slotFlags: UNDERSHIRT
+      stripTime: 8
+      uiWindowPos: 4,1
+      strippingWindowPos: 3,1
+      displayName: Undershirt
+    - name: underpants
+      slotTexture: underpants
+      slotFlags: UNDERPANTS
+      stripTime: 12
+      uiWindowPos: 4,0
+      strippingWindowPos: 3,2
+      displayName: Underpants
+    - name: socks
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 8
+      uiWindowPos: 4,2
+      strippingWindowPos: 3,3
+      displayName: Socks
+      #backmen:underclothing-end
     - name: gloves
       slotTexture: gloves
       slotFlags: GLOVES

diff --git a/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/diona_inventory_template.yml
@@ -16,6 +16,29 @@
       uiWindowPos: 1,1
       strippingWindowPos: 1,2
       displayName: Suit
+      #backmen:underclothing-start
+    - name: undershirt
+      slotTexture: undershirt
+      slotFlags: UNDERSHIRT
+      stripTime: 8
+      uiWindowPos: 4,1
+      strippingWindowPos: 3,1
+      displayName: Undershirt
+    - name: underpants
+      slotTexture: underpants
+      slotFlags: UNDERPANTS
+      stripTime: 12
+      uiWindowPos: 4,0
+      strippingWindowPos: 3,2
+      displayName: Underpants
+    - name: socks
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 8
+      uiWindowPos: 4,2
+      strippingWindowPos: 3,3
+      displayName: Socks
+      #backmen:underclothing-end
     - name: gloves
       slotTexture: gloves
       slotFlags: GLOVES

diff --git a/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/human_inventory_template.yml
@@ -22,6 +22,29 @@
       uiWindowPos: 1,1
       strippingWindowPos: 1,2
       displayName: Suit
+      #backmen:underclothing-start
+    - name: undershirt
+      slotTexture: undershirt
+      slotFlags: UNDERSHIRT
+      stripTime: 8
+      uiWindowPos: 4,1
+      strippingWindowPos: 3,1
+      displayName: Undershirt
+    - name: underpants
+      slotTexture: underpants
+      slotFlags: UNDERPANTS
+      stripTime: 12
+      uiWindowPos: 4,0
+      strippingWindowPos: 3,2
+      displayName: Underpants
+    - name: socks
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 8
+      uiWindowPos: 4,2
+      strippingWindowPos: 3,3
+      displayName: Socks
+      #backmen:underclothing-end
     - name: gloves
       slotTexture: gloves
       slotFlags: GLOVES

diff --git a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
@@ -58,3 +58,26 @@
     whitelist:
       tags:
         - MonkeyWearable
+      #backmen:underclothing-start
+  - name: undershirt
+    slotTexture: undershirt
+    slotFlags: UNDERSHIRT
+    stripTime: 8
+    uiWindowPos: 4,1
+    strippingWindowPos: 3,1
+    displayName: Undershirt
+  - name: underpants
+    slotTexture: underpants
+    slotFlags: UNDERPANTS
+    stripTime: 12
+    uiWindowPos: 4,0
+    strippingWindowPos: 3,2
+    displayName: Underpants
+  - name: socks
+    slotTexture: socks
+    slotFlags: SOCKS
+    stripTime: 8
+    uiWindowPos: 4,2
+    strippingWindowPos: 3,3
+    displayName: Socks
+    #backmen:underclothing-end