Triad-Sector · pandoraberry · May 8, 2026 · Jul 11, 2026 · Jul 11, 2026 · Jul 11, 2026
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -288,7 +288,14 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                     break;
             }
         }
-
+        // Triad - Use a skirt-specific displacement map when the equipped clothing is marked as a skirt. Intended for
+        // dresses, jumpskirts, robes and gowns for Avali
+        if (HasComp<SkirtDisplacementComponent>(equipment))
+        {
+            displacementData =
+                inventory.SkirtDisplacements.GetValueOrDefault(slot)
+                ?? displacementData;
+        }
         // add the new layers
         foreach (var (key, layerData) in ev.Layers)
         {

diff --git a/Content.Shared/Clothing/Components/SkirtDisplacementComponent.cs b/Content.Shared/Clothing/Components/SkirtDisplacementComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Clothing.Components;
+
+/// <summary>
+/// Triad - Marks clothing that should use a skirt-specific displacement map. (avali)
+/// </summary>
+[RegisterComponent]
+public sealed partial class SkirtDisplacementComponent : Component
+{
+}
diff --git a/Content.Shared/Clothing/Components/SkirtDisplacementComponent.xaml b/Content.Shared/Clothing/Components/SkirtDisplacementComponent.xaml
@@ -0,0 +1,5 @@
+<controls:SkirtDisplacementComponent
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Shared.Clothing.Components">
+
+</controls:SkirtDisplacementComponent>
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
@@ -39,6 +39,13 @@ public sealed partial class InventoryComponent : Component
     /// </summary>
     [DataField]
     public List<string> RelayBlockedSlots = new();
+
+    /// <summary>
+    /// Triad - Alternate displacement maps used by clothing marked as requiring
+    /// skirt-specific displacement.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DisplacementData> SkirtDisplacements = new();
 }
 
 /// <summary>

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -53,6 +53,7 @@
   - type: Clothing
     slots: [innerclothing]
     femaleMask: UniformTop
+  - type: SkirtDisplacement # Triad
 
 - type: entity
   abstract: true
@@ -80,6 +81,7 @@
   - type: Clothing
     slots: [innerclothing]
     femaleMask: UniformTop
+  - type: SkirtDisplacement # Triad
 
 - type: entity
   abstract: true

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -465,6 +465,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/performer.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/performer.rsi
+  - type: SkirtDisplacement # Triad
 
 - type: entity
   parent: ClothingUniformSkirtBase

diff --git a/Resources/Prototypes/_Mono/Loadouts/MedicalDispatch/universal_groups.yml b/Resources/Prototypes/_Mono/Loadouts/MedicalDispatch/universal_groups.yml
@@ -20,6 +20,12 @@
   - ContractorClothingUniformJumpskirtGenetics
   - ContractorClothingUniformJumpsuitPsychologist
   - ContractorClothingUniformJumpskirtPsychologist
+  # Triad Start
+  - ClothingUniformJumpskirtSuitNurse
+  - ClothingUniformJumpskirtCoroner
+  - ClothingUniformJumpsuitCoroner
+  - ClothingUniformJumpsuitCoronerAlt
+  # End Triad
   fallbacks:
   - MedicalDoctorJumpsuit
 
@@ -58,4 +64,4 @@
   minLimit: 0
   loadouts:
   - NitrileGloves
-  - LatexGloves
+  - LatexGloves
diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -217,6 +217,84 @@
   - ClothingUniformMNKBlackShoulder
   - ClothingUniformMNKTracksuitBlack
   # End Triad
+  # Triad start - Ported Starlight clothes
+  - BodysuitJeansUniformSuit
+  - CamoUniformSuit
+  - CandyClownUniformSuit
+  - CargoOverallsUniformSuit
+  - ClothingUniformColorJumpskirtRainbow
+  - ClothingUniformNobleSuit
+  - ClothingUniformElegantLadyDress
+  - ClothingUniformJulianneVA11HALLA
+  - ClothingUniformJumpskirtCapTurtleneck
+  - ClothingUniformJumpskirtCargoFormal
+  - ClothingUniformJumpskirtCargoSalvage
+  - ClothingUniformJumpskirtCargoSalvageFormal
+  - ClothingUniformJumpskirtClownFormal
+  - ClothingUniformJumpskirtDressRed
+  - ClothingUniformJumpskirtElegantMaid
+  - ClothingUniformJumpskirtGothic
+  - ClothingUniformJumpskirtHoPTurtleneck
+  - ClothingUniformJumpskirtHoSBlack
+  - ClothingUniformJumpskirtJournalist
+  - ClothingUniformJumpskirtMaid
+  - ClothingUniformJumpskirtMiningSpecialist
+  - ClothingUniformJumpskirtPencilTan
+  - ClothingUniformJumpskirtPerformerClown
+  - ClothingUniformJumpskirtPerformerMime
+  - ClothingUniformJumpskirtRDClassical
+  - ClothingUniformJumpskirtReporter
+  - ClothingUniformJumpskirtSalvageLead
+  - ClothingUniformJumpskirtSchool
+  - ClothingUniformJumpskirtScientistFormal
+  - ClothingUniformJumpskirtTango
+  - ClothingUniformJumpskirtVictorianBlack
+  - ClothingUniformJumpskirtVictorianRed
+  - ClothingUniformJumpsuitAerostatic
+  - ClothingUniformJumpsuitCaptainNoble
+  - ClothingUniformJumpsuitCapTurtleneck
+  - ClothingUniformJumpsuitCargoAlt
+  - ClothingUniformJumpsuitCargoFormal
+  - ClothingUniformJumpsuitClownFormal
+  - ClothingUniformJumpsuitHoPTurtleneck
+  - ClothingUniformJumpsuitHoSBlack
+  - ClothingUniformJumpsuitMimeSuaveBlack
+  - ClothingUniformJumpsuitMimeSuaveWhite
+  - ClothingUniformJumpsuitPerformerClown
+  - ClothingUniformJumpsuitPerformerMime
+  - ClothingUniformJumpsuitRDClassical
+  - ClothingUniformJumpsuitSalvageFormal
+  - ClothingUniformJumpsuitSuitCheckered
+  - ClothingUniformJumpsuitSuitTan
+  - ClothingUniformJumpsuitSuitWaiter
+  - ClothingUniformJumpsuitSuperstarCop
+  - ClothingUniformJumpsuitVampir
+  - ClothingUniformPastryDress
+  - CoolTanktopUniformSuit
+  - DruidRobesUniformSuit
+  - FlamboyantUniformSuit
+  - FlamencoUniformSuit
+  - FlyCaptainUniformSuit
+  - KiltUniformSuit
+  - LilacDressUniformSuit
+  - LittleBlackDressUniformSuit
+  - LumberjackOverallsUniformSuit
+  - MechanicOverallsUniformSuit
+  - MessyDressShirtUniformSuit
+  - MimeFrillsUniformSuit
+  - OldWomanUniformSuit
+  - PunkJeansUniformSuit
+  - RedRegaliaSuit
+  - RefereeUniformSuit
+  - SailorUniformSuit
+  - SpottedClownUniformSuit
+  - StripedClownUniformSuit
+  - SundressUniformSuit
+  - TatteredClothesUniformSuit
+  - TieDyeUniformSuit
+  - TogaUniformSuit
+  - VintageUniformSuit
+  # End Triad
 
   fallbacks:
   - ContractorClothingUniformJumpsuitColorGrey
@@ -508,6 +586,11 @@
   - ContractorClothingShoesSkates
   - ContractorClothingShoesClownLarge
   - ContractorClothingShoesBling
+  # Triad start - Ported Starlight
+  - ClothingShoesTallBlackFurBoots
+  - ClothingShoesHighheelShoes
+  - ClothingShoesBloodstainedAristocratBoots
+  # End Triad
   fallbacks:
   - ContractorClothingShoesColorBlack
 
@@ -597,6 +680,10 @@
   - ContractorClothingHeadHatTophat
   - ContractorClothingHeadHatUNSABeer
   - ContractorClothingHeadSanabi # Mono
+  # Triad start - Ported Starlight
+  - ClothingHeadWideBrimGildedHat
+  - RedRegaliaHat
+  # End Triad
 
 - type: loadoutGroup
   id: ContractorEars
@@ -718,6 +805,12 @@
   - ContractorClothingNeckMantleBH # Mono
   - ContractorClothingNeckCloakSanabi # Mono
   - ContractorClothingNeckUIOvercoat # Mono
+  # Triad start - Ported Starlight
+  - ClothingNeckNobleMantle
+  - RedRegaliaCloak
+  - ClothingNeckBloodstainedAristocratCloak
+  - ClothingNeckBlackFurCloak
+  # End Triad
 
 - type: loadoutGroup
   id: ContractorPDA
@@ -1019,3 +1112,4 @@
   loadouts:
   - ContractorArmorPlateBlunt_Slash
   - ContractorArmorPlatePierce
+
diff --git a/Resources/Prototypes/_NF/Loadouts/doc_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/doc_loadout_groups.yml
@@ -6,6 +6,12 @@
   - ChiefMedicalOfficerJumpskirt
   - ChiefMedicalOfficerTurtleneckJumpsuit
   - ChiefMedicalOfficerTurtleneckJumpskirt
+  # Triad Start - Ported Starlight Clothing
+  - ClothingUniformJumpskirtSuitNurse
+  - ClothingUniformJumpskirtCoroner
+  - ClothingUniformJumpsuitCoroner
+  - ClothingUniformJumpsuitCoronerAlt
+  # End Triad
   fallbacks:
   - ChiefMedicalOfficerJumpsuit
   - ChiefMedicalOfficerJumpskirt
@@ -57,6 +63,9 @@
   loadouts:
   - DocClothingCloakCmo
   - DocClothingNeckMantleCMO
+  # Triad Start - Ported Starlight Clothing
+  - ClothingNeckStethoscope
+  # End Triad
 
 - type: loadoutGroup
   id: DocPDA
@@ -76,4 +85,4 @@
   subgroups:
   - ContractorShoes
   fallbacks:
-  - DocClothingShoesColorWhite
+  - DocClothingShoesColorWhite
diff --git a/Resources/Prototypes/_StarLight/Entities/Mobs/Species/avali.yml b/Resources/Prototypes/_StarLight/Entities/Mobs/Species/avali.yml
@@ -68,6 +68,12 @@
             32:
               sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
               state: back
+      skirtDisplacements: # Triad start
+        jumpsuit:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: jumpskirt # end Triad
     - type: Butcherable
       butcheringType: Spike
       spawned:
@@ -211,5 +217,10 @@
             32:
               sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
               state: back
-
+      skirtDisplacements: # Triad start
+        jumpsuit:
+          sizeMaps:
+            32:
+              sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+              state: jumpskirt # End Triad
 # Chirp!
diff --git a/Resources/Prototypes/_StarLight/Inventory/inventories.yml b/Resources/Prototypes/_StarLight/Inventory/inventories.yml
@@ -44,5 +44,11 @@
           32:
             sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
             state: gloves
+    skirtDisplacements: # Triad Start
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: _Starlight/Mobs/Species/Avali/displacement.rsi
+            state: jumpskirt # End Triad
 
 
diff --git a/Resources/Prototypes/_Starlight/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Starlight/Entities/Clothing/Head/hats.yml
@@ -0,0 +1,23 @@
+# Starlight clothing.
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadWideBrimGildedHat
+  name: wide-brimmed gilded hat
+  description: A cream-white wide-brimmed hat with large white feathers and golden trim.
+  components:
+    - type: Sprite
+      sprite: _Starlight/Clothing/Head/Hats/belpero.rsi
+    - type: Clothing
+      sprite: _Starlight/Clothing/Head/Hats/belpero.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: RedRegaliaHat
+  name: red regalia hat
+  description: A fancy red hat like a mafioso would wear. # Triad - typo
+  components:
+    - type: Sprite
+      sprite: _Starlight/Clothing/Head/Hats/red_regalia.rsi
+    - type: Clothing
+      sprite: _Starlight/Clothing/Head/Hats/red_regalia.rsi
diff --git a/Resources/Prototypes/_Starlight/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Starlight/Entities/Clothing/Neck/cloaks.yml
@@ -0,0 +1,45 @@
+# Starlight clothing.
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckBlackFurCloak
+  name: black fur cloak
+  description: Neat cloak with fur around the neck and hem.
+  components:
+    - type: Sprite
+      sprite: _Starlight/Clothing/Neck/Cloaks/shuba.rsi
+    - type: Clothing
+      sprite: _Starlight/Clothing/Neck/Cloaks/shuba.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckBloodstainedAristocratCloak
+  name: bloodstained aristocrat cloak
+  description: A dark leather greatcoat soaked in blood.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Neck/Cloaks/ari.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/Neck/Cloaks/ari.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckNobleMantle
+  name: noble mantle
+  description: A light-colored cloak with golden patterns and lush white fur on the shoulders.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Neck/Cloaks/belpero.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/Neck/Cloaks/belpero.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: RedRegaliaCloak
+  name: red regalia cloak
+  description: A fancy red cloak like a mafioso would wear. # Triad - typo
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Neck/Cloaks/red_regalia.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/Neck/Cloaks/red_regalia.rsi
diff --git a/Resources/Prototypes/_Starlight/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_Starlight/Entities/Clothing/Shoes/boots.yml
@@ -0,0 +1,24 @@
+# Starlight clothing.
+
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ClothingShoesBloodstainedAristocratBoots
+  name: bloodstained aristocrat boots
+  description: Old boots with a gray sole, faint bloodstains are visible.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Shoes/Boots/ari.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/Shoes/Boots/ari.rsi
+
+- type: entity
+  parent: ClothingShoesBaseButcherable
+  id: ClothingShoesTallBlackFurBoots
+  name: tall black fur boots
+  description: Tall black thigh-high boots with fur, golden accents, and straps.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Clothing/Shoes/Boots/belpero.rsi
+  - type: Clothing
+    sprite: _Starlight/Clothing/Shoes/Boots/belpero.rsi
+  - type: Matchbox # Cool as fuck =}