Port undergarments from ImpStation

Content.Shared/Humanoid/HumanoidVisualLayers.cs

@@ -11,6 +11,8 @@ public enum HumanoidVisualLayers : byte
         Hair,
         FacialHair,
         Chest,
+        Underwear, // DeltaV
+        Undershirt, // DeltaV
         Head,
         Snout,
         HeadSide, // side parts (i.e., frills)

Content.Shared/Humanoid/Markings/MarkingCategories.cs

@@ -13,6 +13,8 @@ public enum MarkingCategories : byte
         HeadSide,
         Snout,
         Chest,
+        Underwear, // DeltaV
+        Undershirt, // DeltaV
         Arms,
         Legs,
         Tail,
@@ -32,6 +34,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.HeadTop => MarkingCategories.HeadTop,
                 HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide,
                 HumanoidVisualLayers.Snout => MarkingCategories.Snout,
+                HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt, // DeltaV
+                HumanoidVisualLayers.Underwear => MarkingCategories.Underwear, // DeltaV
                 HumanoidVisualLayers.Chest => MarkingCategories.Chest,
                 HumanoidVisualLayers.RArm => MarkingCategories.Arms,
                 HumanoidVisualLayers.LArm => MarkingCategories.Arms,

Resources/Locale/en-US/_DV/markings/tattoos.ftl

@@ -6,3 +6,6 @@ marking-TattooNightlingChestMale = Chest Tattoo (Nightling)
 
 marking-TattooNightlingChestFemale-tattoo_nightling_female = Chest Tattoo (Nightling)
 marking-TattooNightlingChestFemale = Chest Tattoo (Nightling)
+
+marking-TattooNanotrasenChest-tattoo_nanotrasen_chest = Chest Tattoo (Nanotrasen)
+marking-TattooNanotrasenChest = Chest Tattoo (Nanotrasen)

Resources/Locale/en-US/_DV/preferences/ui/markings-picker.ftl

@@ -0,0 +1,2 @@
+markings-category-Undershirt = Undershirt
+markings-category-Underwear = Underwear

Resources/Locale/en-US/_Impstation/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)

Resources/Locale/en-US/_Impstation/markings/underwear.ftl

@@ -0,0 +1,10 @@
+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)

Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -2,7 +2,7 @@
   id: TattooHiveChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
   sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
   coloring:
     default:
@@ -17,7 +17,7 @@
   id: TattooNightlingChest
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
   sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos
   coloring:
     default:

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

@@ -83,6 +83,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV
       - map: ["jumpsuit"]
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]

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

@@ -19,6 +19,8 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV
+    - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV
     - map: ["jumpsuit"]
     - map: ["enum.HumanoidVisualLayers.LFoot"]
     - map: ["enum.HumanoidVisualLayers.RFoot"]
@@ -322,6 +324,8 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV
+    - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV
     - map: ["jumpsuit"]
     - map: ["enum.HumanoidVisualLayers.LFoot"]
     - map: ["enum.HumanoidVisualLayers.RFoot"]

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

@@ -84,6 +84,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ] # DeltaV
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # DeltaV
       - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
       - map: [ "enum.HumanoidVisualLayers.RHand" ]

Resources/Prototypes/Nyanotrasen/Species/Oni.yml

@@ -35,6 +35,12 @@
     Chest:
       points: 1
       required: false
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
     Legs:
       points: 6
       required: false

Resources/Prototypes/Nyanotrasen/Species/felinid.yml

@@ -28,6 +28,12 @@
     Chest:
       points: 1
       required: false
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
     Legs:
       points: 6
       required: false

Resources/Prototypes/Species/arachnid.yml

@@ -19,6 +19,8 @@
   sprites:
     Head: MobArachnidHead
     Snout: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobArachnidTorso
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
@@ -63,6 +65,14 @@
     Chest:
       points: 1
       required: false
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Legs:
       points: 6
       required: false

Resources/Prototypes/Species/diona.yml

@@ -19,6 +19,8 @@
     Head: MobDionaHead
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobDionaTorso
     Eyes: MobDionaEyes
     LArm: MobDionaLArm
@@ -49,6 +51,14 @@
     Legs:
       points: 2
       required: false
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Arms:
       points: 2
       required: false

Resources/Prototypes/Species/gingerbread.yml

@@ -15,6 +15,8 @@
     Head: MobGingerbreadHead
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobGingerbreadTorso
     Eyes: MobGingerbreadEyes
     LArm: MobGingerbreadLArm

Resources/Prototypes/Species/human.yml

@@ -22,6 +22,8 @@
     Hair: MobHumanoidAnyMarking
     FacialHair: MobHumanoidAnyMarking
     Snout: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobHumanTorso
     Eyes: MobHumanoidEyes
     HeadTop: MobHumanoidAnyMarking
@@ -60,6 +62,14 @@
     Chest:
       points: 1
       required: false
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Legs:
       points: 6
       required: false

Resources/Prototypes/Species/moth.yml

@@ -17,6 +17,8 @@
   sprites:
     Head: MobMothHead
     Snout: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobMothTorso
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
@@ -67,6 +69,14 @@
     Chest:
       points: 1
       required: false
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Legs:
       points: 6
       required: false

Resources/Prototypes/Species/reptilian.yml

@@ -17,6 +17,8 @@
   sprites:
     Head: MobReptilianHead
     Snout: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobReptilianTorso
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
@@ -58,6 +60,14 @@
     Chest:
       points: 3
       required: false
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Legs:
       points: 6
       required: false

Resources/Prototypes/Species/slime.yml

@@ -15,6 +15,8 @@
     Head: MobSlimeHead
     Hair: MobSlimeMarkingFollowSkin
     FacialHair: MobSlimeMarkingFollowSkin
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobSlimeTorso
     Eyes: MobHumanoidEyes
     LArm: MobSlimeLArm
@@ -38,6 +40,14 @@
     Chest:
       points: 1
       required: false
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Legs:
       points: 4
       required: false

Resources/Prototypes/Species/vox.yml

@@ -21,6 +21,8 @@
     Snout: MobHumanoidAnyMarking
     Hair: MobHumanoidAnyMarking
     FacialHair: MobHumanoidAnyMarking
+    Underwear: MobHumanoidAnyMarking # DeltaV
+    Undershirt: MobHumanoidAnyMarking # DeltaV
     Chest: MobVoxTorso
     Eyes: MobVoxEyes
     LArm: MobVoxLArm
@@ -58,6 +60,14 @@
       points: 4
       required: true
       defaultMarkings: [ VoxLLegScales, VoxRLegScales, VoxRFootScales, VoxLFootScales ]
+    # Begin DeltaV changes.
+    Underwear:
+      points: 1
+      required: false
+    Undershirt:
+      points: 1
+      required: false
+    # End DeltaV changes.
     Chest:
       points: 1
       required: false

Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/tattoos.yml

@@ -2,7 +2,7 @@
   id: TattooHiveChestFemale # DeltaV: Splitting the scars and tattoos
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
   sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos
   coloring:
     default:
@@ -17,7 +17,7 @@
   id: TattooNightlingChestFemale # DeltaV: Splitting the scars and tattoos
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni
+  speciesRestriction: [Human, Dwarf, SlimePerson, Felinid, Oni] # Delta V - SlimePerson, Felinid, Oni
   sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos
   coloring:
     default:
@@ -27,3 +27,17 @@
   sprites:
   - sprite: _DV/Mobs/Customization/tattoos.rsi
     state: tattoo_nightling_female
+
+- type: marking
+  id: TattooNanotrasenChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf, SlimePerson]
+  coloring:
+    default:
+      type:
+        !type:TattooColoring
+      fallbackColor: "#666666"
+  sprites:
+  - sprite: _DV/Mobs/Customization/tattoos.rsi
+    state: tattoo_nanotrasen_chest

Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml

@@ -42,6 +42,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ]
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
       - map: [ "underpants" ]
       - map: [ "undershirt" ]
       - map: [ "socks" ]
@@ -175,6 +177,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ]
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
       - map: [ "underpants" ]
       - map: [ "undershirt" ]
       - map: [ "socks" ]

Resources/Prototypes/_DV/Entities/Mobs/Species/rodentia.yml

@@ -45,6 +45,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ]
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ]
       - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
       - map: [ "enum.HumanoidVisualLayers.RHand" ]