Add Underwear & Undershirts

Content.Server/FloofStation/InteractionVerbs/Actions/ToggleLayersAction.cs

@@ -0,0 +1,47 @@
+using Content.Server.Humanoid;
+using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
+using Content.Shared.InteractionVerbs;
+
+namespace Content.Server.FloofStation.InteractionVerbs.Actions;
+
+/// <summary>
+///     Toggles a humanoid visual layer.
+/// </summary>
+[Serializable]
+public sealed partial class ToggleLayersAction : InteractionAction
+{
+    [DataField]
+    public HumanoidVisualLayers? NeededMarkingCategory;
+
+    [DataField]
+    public HashSet<HumanoidVisualLayers> ToggleLayers;
+
+    public override bool CanPerform(InteractionArgs args, InteractionVerbPrototype proto, bool isBefore, VerbDependencies deps)
+    {
+        if (NeededMarkingCategory == null)
+            return true;
+
+        var markingCategory = MarkingCategoriesConversion.FromHumanoidVisualLayers(NeededMarkingCategory.Value);
+
+        return deps.EntMan.TryGetComponent(args.Target, out HumanoidAppearanceComponent? bodyAppearance)
+           && bodyAppearance.MarkingSet.Markings.TryGetValue(markingCategory, out var markingList)
+           && markingList.Count > 0; // Check if at least one entry exists
+    }
+
+    public override bool Perform(InteractionArgs args, InteractionVerbPrototype proto, VerbDependencies deps)
+    {
+        if (deps.EntMan.TryGetComponent<HumanoidAppearanceComponent>(args.Target, out var humanoidAppearance))
+        {
+            foreach (HumanoidVisualLayers layer in ToggleLayers)
+            {
+                deps.EntMan.System<HumanoidAppearanceSystem>().SetLayerVisibility(
+                    args.Target,
+                    layer, humanoidAppearance.HiddenLayers.Contains(layer)
+                );
+            }
+        }
+
+        return true;
+    }
+}

Content.Shared/Floofstation/InteractionVerbs/Requirements/ClothingSlotBlacklistRequirement.cs

@@ -0,0 +1,20 @@
+using Content.Shared.InteractionVerbs;
+using Content.Shared.Inventory;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Floofstation.InteractionVerbs.Requirements;
+
+
+/// <summary>
+///     Requires a mob to not be wearing anything in this slot.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ClothingSlotBlacklistRequirement : InvertableInteractionRequirement
+{
+    [DataField] public string Slot;
+
+    public override bool IsMet(InteractionArgs args, InteractionVerbPrototype proto, InteractionAction.VerbDependencies deps)
+    {
+        return !deps.EntMan.System<InventorySystem>().TryGetSlotEntity(args.Target, Slot, out _);
+    }
+}

Content.Shared/Humanoid/HumanoidVisualLayers.cs

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

Content.Shared/Humanoid/Markings/MarkingCategories.cs

@@ -12,6 +12,8 @@ public enum MarkingCategories : byte
         HeadSide,
         Snout,
         Chest,
+        Underwear, // Floof, add underwear
+        Undershirt, // Floof, add underwear
         RightArm,
         RightHand,
         LeftArm,
@@ -38,6 +40,8 @@ public static MarkingCategories FromHumanoidVisualLayers(HumanoidVisualLayers la
                 HumanoidVisualLayers.HeadSide => MarkingCategories.HeadSide,
                 HumanoidVisualLayers.Snout => MarkingCategories.Snout,
                 HumanoidVisualLayers.Chest => MarkingCategories.Chest,
+                HumanoidVisualLayers.Underwear => MarkingCategories.Underwear, // Floof, add underwear
+                HumanoidVisualLayers.Undershirt => MarkingCategories.Undershirt, // Floof, add underwear
                 HumanoidVisualLayers.RArm => MarkingCategories.RightArm,
                 HumanoidVisualLayers.LArm => MarkingCategories.LeftArm,
                 HumanoidVisualLayers.RHand => MarkingCategories.RightHand,

Resources/Locale/en-US/Floof/interaction/verbs/underwear.ftl

@@ -0,0 +1,19 @@
+interaction-ToggleUndershirt-name = Toggle undershirt
+interaction-ToggleUndershirt-description = Toggle the undershirt of this person!
+
+interaction-ToggleUndershirt-success-self-popup = You toggle {THE($target)}'s undershirt.
+interaction-ToggleUndershirt-success-target-popup = {THE($user)} toggles your undershirt!
+interaction-ToggleUndershirt-fail-self-popup = You fail to toggle the undershirt.
+
+interaction-ToggleUndershirt-delayed-self-popup = You try to toggle {THE($target)}'s undershirt.
+interaction-ToggleUndershirt-delayed-target-popup = {THE($user)} is trying to toggle your undershirt!
+
+interaction-ToggleUnderwear-name = Toggle underwear
+interaction-ToggleUnderwear-description = Toggle the underwear of this person!
+
+interaction-ToggleUnderwear-success-self-popup = You toggle {THE($target)}'s underwear.
+interaction-ToggleUnderwear-success-target-popup = {THE($user)} toggles your underwear!
+interaction-ToggleUnderwear-fail-self-popup = You fail to toggle the underwear.
+
+interaction-ToggleUnderwear-delayed-self-popup = You try to toggle {THE($target)}'s underwear.
+interaction-ToggleUnderwear-delayed-target-popup = {THE($user)} is trying to toggle your underwear!

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

@@ -0,0 +1,41 @@
+markings-category-Undershirt = Undershirt
+markings-category-Underwear = Underwear
+
+marking-UndershirtStandard = Undershirt (Standard)
+marking-UndershirtStandard-t_undershirt = Undershirt
+
+marking-UndershirtSleeveless = Undershirt (Sleeveless)
+marking-UndershirtSleeveless-t_undershirt_sleeveless = Undershirt
+
+marking-UndershirtRolled = Undershirt (Rolled)
+marking-UndershirtRolled-t_rolled_undershirt = Undershirt
+
+marking-UndershirtRolledSleeveless = Undershirt (Sleeveless Rolled)
+marking-UndershirtRolledSleeveless-t_rolled_undershirt_sleeveless = Undershirt
+
+marking-UndershirtLong = Undershirt (Long)
+marking-UndershirtLong-t_long_undershirt = Undershirt
+
+marking-UndershirtClassic = Bra (Classic)
+marking-UndershirtClassic-snow_classic = Bra
+
+marking-UndershirtSports = Bra (Sport)
+marking-UndershirtSports-snow_sports = Bra
+
+marking-UndershirtStrapless = Bra (Strapless)
+marking-UndershirtStrapless-snow_strapless = Bra
+
+marking-UnderwearBoxers = Boxers
+marking-UnderwearBoxers-snow_boxers = Boxers
+
+marking-UnderwearBriefs = Briefs
+marking-UnderwearBriefs-snow_briefs = Briefs
+
+marking-UnderwearLowriders = Lowrides
+marking-UnderwearLowriders-snow_lowriders = Lowrides
+
+marking-UnderwearSatin = Satin
+marking-UnderwearSatin-snow_satin = Satin
+
+marking-UnderwearTanga = Tanga
+marking-UnderwearTanga-snow_tanga = Tanga

Resources/Prototypes/DeltaV/Entities/Mobs/Species/rodentia.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: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
       - map: [ "enum.HumanoidVisualLayers.RHand" ]

Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml

@@ -33,6 +33,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" ]

Resources/Prototypes/DeltaV/Species/rodentia.yml

@@ -28,6 +28,8 @@
     FacialHair: MobHumanoidAnyMarking
     Snout: MobHumanoidAnyMarking
     Chest: MobRodentiaTorso
+    Underwear: MobHumanoidAnyMarking
+    Undershirt: MobHumanoidAnyMarking
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
     Tail: MobHumanoidAnyMarking
@@ -45,6 +47,13 @@
 - type: markingPoints
   id: MobRodentiaMarkingLimits
   points:
+    Underwear:
+      points: 1
+      required: true
+      defaultMarkings: [ UnderwearBoxers ]
+    Undershirt:
+      points: 1
+      required: false
     Hair:
       points: 1
       required: false

Resources/Prototypes/DeltaV/Species/vulpkanin.yml

@@ -21,6 +21,8 @@
     FacialHair: MobHumanoidAnyMarking
     Snout: MobHumanoidAnyMarking
     Chest: MobVulpkaninTorso
+    Underwear: MobHumanoidAnyMarking
+    Undershirt: MobHumanoidAnyMarking
     HeadTop: MobHumanoidAnyMarking
     HeadSide: MobHumanoidAnyMarking
     Tail: MobHumanoidAnyMarking
@@ -38,6 +40,13 @@
 - type: markingPoints
   id: MobVulpkaninMarkingLimits
   points:
+    Underwear:
+      points: 1
+      required: true
+      defaultMarkings: [ UnderwearBoxers ]
+    Undershirt:
+      points: 1
+      required: false
     Hair:
       points: 1
       required: false

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

@@ -34,6 +34,8 @@
       color: "#e8b59b"
       sprite: Mobs/Species/Human/parts.rsi
       state: l_arm
+    - map: [ "enum.HumanoidVisualLayers.Underwear" ] # Floof, add underwear
+    - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # Floof, add underwear
     - map: [ "jumpsuit" ]
     - map: [ "enum.HumanoidVisualLayers.LHand" ]
       color: "#e8b59b"

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

@@ -92,6 +92,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ] # Floof, add underwear
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # Floof, add underwear
       - map: ["jumpsuit"]
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]

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

@@ -17,6 +17,8 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "enum.HumanoidVisualLayers.Underwear" ] # Floof, add underwear
+    - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # Floof, add underwear
     - map: ["jumpsuit"]
     - map: ["enum.HumanoidVisualLayers.LFoot"]
     - map: ["enum.HumanoidVisualLayers.RFoot"]
@@ -349,6 +351,8 @@
     - map: [ "enum.HumanoidVisualLayers.LArm" ]
     - map: [ "enum.HumanoidVisualLayers.RLeg" ]
     - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: ["enum.HumanoidVisualLayers.Undershirt"] # Floof, add underwear
+    - map: ["enum.HumanoidVisualLayers.Underwear"] # Floof, add underwear
     - shader: StencilClear
       sprite: Mobs/Species/Human/parts.rsi
       state: l_leg

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

@@ -24,6 +24,8 @@
       - map: [ "underpants" ]
       - map: [ "undershirt" ]
       - map: [ "socks" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ] # Floof, add underwear
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # Floof, add underwear
       - map: [ "jumpsuit" ]
       - map: ["enum.HumanoidVisualLayers.LFoot"]
       - map: ["enum.HumanoidVisualLayers.RFoot"]

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

@@ -80,6 +80,8 @@
       - map: [ "enum.HumanoidVisualLayers.LArm" ]
       - map: [ "enum.HumanoidVisualLayers.RLeg" ]
       - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.Underwear" ] # Floof, add underwear
+      - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # Floof, add underwear
       - map: [ "jumpsuit" ]
       - map: [ "enum.HumanoidVisualLayers.LHand" ]
       - map: [ "enum.HumanoidVisualLayers.RHand" ]

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

@@ -160,6 +160,8 @@
         - map: ["enum.HumanoidVisualLayers.LFoot"]
         - map: ["enum.HumanoidVisualLayers.RFoot"]
         - map: ["socks"]
+        - map: [ "enum.HumanoidVisualLayers.Underwear" ] # Floof, add underwear
+        - map: [ "enum.HumanoidVisualLayers.Undershirt" ] # Floof, add underwear
         - map: ["underpants"]
         - map: ["undershirt"]
         - map: ["jumpsuit"]

Resources/Prototypes/Floof/Entities/Mobs/Customization/Markings/undershirt.yml

@@ -0,0 +1,111 @@
+- type: marking
+  id: UndershirtStandard
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: t_undershirt
+
+- type: marking
+  id: UndershirtSleeveless
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: t_undershirt_sleeveless
+
+- type: marking
+  id: UndershirtRolled
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: t_rolled_undershirt
+
+- type: marking
+  id: UndershirtRolledSleeveless
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: t_rolled_undershirt_sleeveless
+
+- type: marking
+  id: UndershirtLong
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: t_long_undershirt
+
+- type: marking
+  id: UndershirtClassic
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: snow_bra
+
+- type: marking
+  id: UndershirtSports
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: snow_sports
+
+- type: marking
+  id: UndershirtStrapless
+  bodyPart: Undershirt
+  markingCategory: Undershirt
+  speciesRestriction: [Shadowkin, Diona, Arachnid, Reptilian, Moth, SlimePerson, Resomi, Rodentia, Human, Rodentia, Felinid, Oni, Vulpkanin, Harpy]
+  coloring:
+    default:
+      type:
+        !type:SimpleColoring
+          color: "#FFFFFF"
+  sprites:
+  - sprite: Floof/Mobs/Customization/undershirt.rsi
+    state: snow_strapless