Port Adjustable Jumpsuits And Undergarments (#1720)

# Description Ports impstation/imp-station-14#375 and impstation/imp-station-14#384 Which are meant to go together. <details><summary><h1>Media</h1></summary> <p> ![image](https://github.com/user-attachments/assets/090482f0-3665-42c6-badd-0985a928adfd) </p> </details> # Changelog :cl: - add: Added the ability to roll down jumpsuits to the waist, as well as undergarment markings for wearing alongside said rolled jumpsuits. --------- Co-authored-by: V <[email protected]>
Simple-Station · Feb 6, 2025 · 40b78c3 · 40b78c3
1 parent bbd5820
commit 40b78c3
Show file tree

Hide file tree

Showing 127 changed files with 751 additions and 211 deletions.
diff --git a/Content.Shared/Humanoid/HumanoidVisualLayers.cs b/Content.Shared/Humanoid/HumanoidVisualLayers.cs
@@ -12,6 +12,8 @@ public enum HumanoidVisualLayers : byte
         Hair,
         FacialHair,
         Chest,
+        Underwear,
+        Undershirt,
         Head,
         Snout,
         HeadSide, // side parts (i.e., frills)

diff --git a/Content.Shared/Humanoid/Markings/MarkingCategories.cs b/Content.Shared/Humanoid/Markings/MarkingCategories.cs
@@ -22,6 +22,8 @@ public enum MarkingCategories : byte
         LeftLeg,
         LeftFoot,
         Wings,
+        Underwear,
+        Undershirt,
         Tail,
         Overlay
     }
@@ -39,6 +41,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop,
                 HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide,
                 HumanoidVisualLayers.Snout => MarkingCategories.Snout,
+                HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt,
+                HumanoidVisualLayers.Underwear => MarkingCategories.Underwear,
                 HumanoidVisualLayers.Chest => MarkingCategories.Chest,
                 HumanoidVisualLayers.RArm => MarkingCategories.RightArm,
                 HumanoidVisualLayers.LArm => MarkingCategories.LeftArm,

diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -12,3 +12,6 @@ fold-unzip-verb = Unzip
 # Jumpsuits
 fold-rollsleeves-verb = roll sleeves up
 fold-unrollsleeves-verb = roll sleeves down
+
+fold-verb-clothing-jacket = Take off jacket
+unfold-verb-clothing-jacket = Put on jacket
diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl
@@ -4,6 +4,9 @@ marking-TattooHiveChest = Back Tattoo (Hive)
 marking-TattooNightlingChest-tattoo_nightling = Chest Tattoo (nightling)
 marking-TattooNightlingChest = Chest Tattoo (Nightling)
 
+marking-TattooNanotrasenChest-tattoo_nanotrasen_chest = Chest Tattoo (Nanotrasen)
+marking-TattooNanotrasenChest = Chest Tattoo (Nanotrasen)
+
 marking-TattooSilverburghLeftLeg-tattoo_silverburgh_l_leg = Left Leg Tattoo (Silverburg)
 marking-TattooSilverburghLeftLeg = Left Leg Tattoo (Silverburg)
 

diff --git a/Resources/Locale/en-US/markings/undershirt.ftl b/Resources/Locale/en-US/markings/undershirt.ftl
@@ -0,0 +1,29 @@
+marking-UndershirtDefault-undershirt = Undershirt
+marking-UndershirtDefault = Undershirt (Default)
+
+marking-UndershirtRolled-rolled_undershirt = Undershirt
+marking-UndershirtRolled = Undershirt (Rolled)
+
+marking-UndershirtSleeveless-sleeveless = Tanktop
+marking-UndershirtSleeveless = Tanktop
+
+marking-UndershirtGrossSleeveless-gross_sleeveless = Tanktop
+marking-UndershirtGrossSleeveless = Tanktop (Gross)
+
+marking-UndershirtRolledSleeveless-rolled_undershirt_sleeveless = Tanktop
+marking-UndershirtRolledSleeveless = Tanktop (Rolled)
+
+marking-UndershirtNanotrasen-nanotrasen = Undershirt
+marking-UndershirtNanotrasen = Undershirt (Nanotrasen)
+
+marking-UndershirtBinder-binder = Binder
+marking-UndershirtBinder = Binder
+
+marking-UndershirtBraClassic-classic = Bra
+marking-UndershirtBraClassic = Bra (Classic)
+
+marking-UndershirtBraSports-sports = Bra
+marking-UndershirtBraSports = Bra (Sports)
+
+marking-UndershirtBraStrapless-strapless = Bra
+marking-UndershirtBraStrapless = Bra (Strapless)
diff --git a/Resources/Locale/en-US/markings/underwear.ftl b/Resources/Locale/en-US/markings/underwear.ftl
@@ -0,0 +1,14 @@
+marking-UnderwearDefault-boxers = Underwear
+marking-UnderwearDefault = Underwear (Default)
+
+marking-UnderwearBriefs-briefs = Underwear
+marking-UnderwearBriefs = Underwear (Briefs)
+
+marking-UnderwearLowriders-lowriders = Underwear
+marking-UnderwearLowriders = Underwear (Lowriders)
+
+marking-UnderwearSatin-satin = Underwear
+marking-UnderwearSatin = Underwear (Satin)
+
+marking-UnderwearTanga-tanga = Underwear
+marking-UnderwearTanga = Underwear (Tanga)
diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -31,3 +31,5 @@ markings-category-LeftLeg = Left Leg
 markings-category-LeftFoot = Left Foot
 markings-category-Tail = Tail
 markings-category-Overlay = Overlay
+markings-category-Undershirt = Undershirt
+markings-category-Underwear = Underwear
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -258,3 +258,14 @@
   - type: WirelessNetworkConnection
     range: 1200
   - type: StationLimitedNetwork
+
+- type: entity
+  abstract: true
+  id: ClothingUniformFoldableBase
+  components:
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: unfold-verb-clothing-jacket
+    foldVerbText: fold-verb-clothing-jacket
+  - type: FoldableClothing
+    foldedEquippedPrefix: folded
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
@@ -492,7 +492,7 @@
 
 # Rainbow Jumpsuit
 - type: entity
-  parent: ClothingUniformBase
+  parent: [ ClothingUniformBase, ClothingUniformFoldableBase ]
   id: ClothingUniformColorRainbow
   name: rainbow jumpsuit
   description: A multi-colored jumpsuit!