[feature] ТРУСЫ (#12)

* Трусы и бра

* Тэги и тэмплейты инвентаря

* Спрайты

* Тэги и темплейт

* Флаги

* Перевод и прототипы

* Иконки

* Добавил слои

* Исправил циферки во флагах

* НОСКИ

* Трусы всем

* Блять

* СПРАЙТЫ БРА

* Насрано

* х2

* Примерно миллион трусов

* fff

* Носки(дохуя)

* Сука

* ааааааааааааааааааа

* Ебаные трусы блять

* Фикс иконок

---------

Co-authored-by: Mona Hmiza <>

Content.Client/Clothing/ClientClothingSystem.cs

@@ -43,6 +43,11 @@ public sealed class ClientClothingSystem : ClothingSystem
         {"pocket1", "POCKET1"},
         {"pocket2", "POCKET2"},
         {"suitstorage", "SUITSTORAGE"},
+        //WHITE EDIT
+        {"socks", "SOCKS"},
+        {"underweart", "UNDERWEART"},
+        {"underwearb", "UNDERWEARB"},
+        // WHITE EDIT
     };
 
     [Dependency] private readonly IResourceCache _cache = default!;

Content.Shared/Inventory/SlotFlags.cs

@@ -26,5 +26,8 @@ public enum SlotFlags
     LEGS = 1 << 13,
     FEET = 1 << 14,
     SUITSTORAGE = 1 << 15,
+    UNDERWEART = 1 << 16, // White
+    UNDERWEARB = 1 << 17, // White
+    SOCKS = 1 << 18,      // White
     All = ~NONE,
 }

Content.Shared/Roles/StartingGearPrototype.cs

@@ -1,3 +1,4 @@
+using Content.Shared.Humanoid;
 using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
 
@@ -24,6 +25,14 @@ namespace Content.Shared.Roles
         [DataField]
         public List<EntProtoId> Inhand = new(0);
 
+        // White underwear
+        [DataField("underweart")]
+        private string _underweart = string.Empty;
+
+        [DataField("underwearb")]
+        private string _underwearb = string.Empty;
+        // White underwear end
+
         [ViewVariables]
         [IdDataField]
         public string ID { get; private set; } = string.Empty;
@@ -38,6 +47,12 @@ namespace Content.Shared.Roles
                     return Satchel;
                 if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(Duffelbag))
                     return Duffelbag;
+                // White underwear
+                if (slot == "underweart" && profile.Sex == Sex.Female && !string.IsNullOrEmpty(_underweart))
+                    return _underweart;
+                if (slot == "underwearb" && profile.Sex == Sex.Female && !string.IsNullOrEmpty(_underwearb))
+                    return _underwearb;
+                // White underwear end
             }
 
             return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty;

Resources/Locale/ru-RU/clothing/socks.ftl

@@ -0,0 +1,78 @@
+ent-ClothingUnderwearSocksBeeKnee = носки
+    .desc = Желто-черные.
+
+ent-ClothingUnderwearSocksBeeNorm = носки
+    .desc = Желто-черные.
+
+ent-ClothingUnderwearSocksBeeThigh = носки
+    .desc = Желто-черные.
+
+ent-ClothingUnderwearSocksFishnet = чулки
+    .desc = Сетчатые.
+
+ent-ClothingUnderwearSocksGarter = носки
+    .desc = С подтяжками.
+
+ent-ClothingUnderwearSocksPantyhose = колготки
+    .desc = Прозрачные.
+
+ent-ClothingUnderwearSocksPantyhoseRipped = колготки
+    .desc = Порванные.
+
+ent-ClothingUnderwearSocksRainbowKnee = носки
+    .desc = Радужные.
+
+ent-ClothingUnderwearSocksRainbowThigh = носки
+    .desc = Радужные.
+
+ent-ClothingUnderwearSocksRainbowThigh = носки
+    .desc = Радужные.
+
+ent-ClothingUnderwearSocksHigh = высокие носки
+    .desc = Белые.
+
+ent-ClothingUnderwearSocksNormal = носки
+    .desc = Белые.
+
+ent-ClothingUnderwearSocksShort = короткие носки
+    .desc = Белые.
+
+ent-ClothingUnderwearSocksThigh = чулки
+    .desc = Прозрачные.
+
+ent-ClothingUnderwearStockingsBlue = чулки
+    .desc = Голубые.
+
+ent-ClothingUnderwearStockingsCyan = чулки
+    .desc = Циановые.
+
+ent-ClothingUnderwearStockingsPink = чулки
+    .desc = Розовые.
+
+ent-ClothingUnderwearStockingsGreen = чулки
+    .desc = Зеленые.
+
+ent-ClothingUnderwearStockingsLightPink = чулки
+    .desc = Светло-розовые.
+
+ent-ClothingUnderwearStockingsLightOrange = чулки
+    .desc = Оранжевые.
+
+ent-ClothingUnderwearStockingsLightPurple = чулки
+    .desc = Светло-фиолетовые.
+
+ent-ClothingUnderwearStockingsLightYellow = чулки
+    .desc = Желтые.
+
+ent-ClothingUnderwearSocksStripedKnee = носки
+    .desc = Черно-белые.
+
+ent-ClothingUnderwearSocksStripedThigh = носки
+    .desc = Черно-белые.
+
+ent-ClothingUnderwearSocksThinKnee = носки
+    .desc = Прозрачные.
+
+ent-ClothingUnderwearSocksThinThigh = носки
+    .desc = Прозрачные.
+

Resources/Locale/ru-RU/clothing/top.ftl

@@ -0,0 +1,88 @@
+ent-ClothingUnderwearTopBraCap = бра
+    .desc = Бра капитана.
+
+ent-ClothingUnderwearTopBraCE = бра
+    .desc = Бра старшего инженера.
+
+ent-ClothingUnderwearTopBraCMO = бра
+    .desc = Бра главного врача.
+
+ent-ClothingUnderwearTopBraHOP = бра главы персонала
+    .desc = Бра главы персонала.
+
+ent-ClothingUnderwearTopBraHOS = бра
+    .desc = Бра главы службы безопасности.
+
+ent-ClothingUnderwearTopBraQM = бра
+    .desc = Бра квартирмейстера.
+
+ent-ClothingUnderwearTopBraRD = бра
+    .desc = Бра научного руководителя.
+
+ent-ClothingUnderwearTopBraWhite = бра
+    .desc = Белый лифчик.
+
+ent-ClothingUnderwearTopBraSports = спортивное бра
+    .desc = Белый лифчик для занятий спортом.
+
+ent-ClothingUnderwearTopBraSportsAlternative = спортивное бра
+    .desc = Белый лифчик для занятий спортом.
+
+ent-ClothingUnderwearTopBraBeeKini = бра
+    .desc = На этикетке написано "собственность РОЙ ПЧЕЛ"!
+
+ent-ClothingUnderwearTopBraBinder = бра
+    .desc = Утягивает.
+
+ent-ClothingUnderwearTopBraBinderStrapless = бра
+    .desc = Утягивает, да еще и без бретелек!
+
+ent-ClothingUnderwearTopBraKinky = бра
+    .desc = Эксцентричное...
+
+ent-ClothingUnderwearTopBraNeko = бра
+    .desc = Мяукает.
+
+ent-ClothingUnderwearTopBraStrapless = бра
+    .desc = Без бретелек.
+
+ent-ClothingUnderwearTopBraStraplessAlt = бра
+    .desc = Без бретелек.
+
+ent-ClothingUnderwearTopBraSwimming = бра
+    .desc = Для плавания.
+
+ent-ClothingUnderwearTopBraSwimmingAlt = бра
+    .desc = Для плавания.
+
+ent-ClothingUnderwearTopBraThin = бра
+    .desc = Тонкое.
+
+ent-ClothingUnderwearTopFishnetBody = бра
+    .desc = Сеточка.
+
+ent-ClothingUnderwearTopFishnetBodyGloves = бра
+    .desc = Сеточка с перчатками.
+
+ent-ClothingUnderwearTopFishnetBodySleeves = бра
+    .desc = Сеточка с рукавами.
+
+ent-ClothingUnderwearTopBraHalterneck = бра
+    .desc = С коротким вырезом.
+
+ent-ClothingUnderwearTopBraShibari = бра
+    .desc = Шибари.
+
+ent-ClothingUnderwearTopBraShibariSleeves = бра
+    .desc = Шибари с рукавами.
+
+ent-ClothingUnderwearTopBraStriped = бра
+    .desc = В полосочку.
+
+ent-ClothingUnderwearTopBraTubetop = бра
+    .desc = Трубчатый...
+
+ent-ClothingUnderwearTopBraCow = бра
+    .desc = Му-ууу.
+
+

Resources/Locale/ru-RU/clothing/underwear.ftl

@@ -0,0 +1,95 @@
+ent-ClothingUnderwearBottomPantiesWhite = трусики
+    .desc = Белые.
+
+ent-ClothingUnderwearBottomBoxersWhite = боксеры
+    .desc = Белые.
+
+ent-ClothingUnderwearBottomBoxersCap = боксеры
+    .desc = Боксеры капитана.
+
+ent-ClothingUnderwearBottomBoxersCE = боксеры
+    .desc = Боксеры старшего инженера.
+
+ent-ClothingUnderwearBottomBoxersCMO = боксеры
+    .desc = Боксеры главного врача.
+
+ent-ClothingUnderwearBottomBoxersHOP = боксеры
+    .desc = Боксеры главы персонала.
+
+ent-ClothingUnderwearBottomBoxersHOS = боксеры
+    .desc = Боксеры главы службы безопасности.
+
+ent-ClothingUnderwearBottomBoxersQM = боксеры
+    .desc = Боксеры квартирмейстера.
+
+ent-ClothingUnderwearBottomBoxersRD = боксеры
+    .desc = Боксеры научного руководителя.
+
+ent-ClothingUnderwearBottomPantiesCap = трусики
+    .desc = Трусики капитана.
+
+ent-ClothingUnderwearBottomPantiesCE = трусики
+    .desc = Трусики старшего инженера.
+
+ent-ClothingUnderwearBottomPantiesCMO = трусики
+    .desc = Трусики главного врача.
+
+ent-ClothingUnderwearBottomPantiesHOP = трусики
+    .desc = Трусики главы персонала.
+
+ent-ClothingUnderwearBottomPantiesHOS = трусики
+    .desc = Трусики главы службы безопасности.
+
+ent-ClothingUnderwearBottomPantiesQM = трусики
+    .desc = Трусики квартирмейстера.
+
+ent-ClothingUnderwearBottomPantiesRD = трусики
+    .desc = Трусики научного руководителя.
+
+ent-ClothingUnderwearBottomBeeShorts = шорты
+    .desc = Пчелки...
+
+ent-ClothingUnderwearBottomBoxersHeart = боксеры
+    .desc = С сердечками.
+
+ent-ClothingUnderwearBottomBoxersStriped = боксеры
+    .desc = В полосочку.
+
+ent-ClothingUnderwearBottomBriefs = трусики
+    .desc = Брифы.
+
+ent-ClothingUnderwearBottomFishnetLower = трусики
+    .desc = В сеточку.
+
+ent-ClothingUnderwearBottomJockstrap = трусы
+    .desc = Джоки.
+
+ent-ClothingUnderwearBottomMankini = манкини
+    .desc = Удобное.
+
+ent-ClothingUnderwearBottomPantiesBeeKini = трусики
+    .desc = Пчелки.
+
+
+ent-ClothingUnderwearBottomPantiesKinky = трусики
+    .desc = Эксцентричное...
+
+ent-ClothingUnderwearBottomPantiesNeko = трусики
+    .desc = Мяу...
+
+ent-ClothingUnderwearBottomPantiesSlim = трусики
+    .desc = Узкие.
+
+ent-ClothingUnderwearBottomPantiesSwimming = трусики
+    .desc = Для плаванья.
+
+ent-ClothingUnderwearBottomPantiesThin = трусики
+    .desc = Тоненькие.
+
+ent-ClothingUnderwearBottomPantiesStripped = трусики
+    .desc = В полосочку.
+
+ent-ClothingUnderwearBottomPantiesThong = трусики
+    .desc = Стринги.
+
+

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -80,6 +80,77 @@
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
+
+    #White bra start
+    ClothingUnderwearTopBraWhite: 5
+    ClothingUnderwearTopBraSports: 5
+    ClothingUnderwearTopBraSportsAlternative: 5
+    ClothingUnderwearTopBraBeeKini: 2
+    ClothingUnderwearTopBraBinder: 2
+    ClothingUnderwearTopBraBinderStrapless: 2
+    ClothingUnderwearTopBraKinky: 2
+    ClothingUnderwearTopBraNeko: 2
+    ClothingUnderwearTopBraStrapless: 2
+    ClothingUnderwearTopBraStraplessAlt: 2
+    ClothingUnderwearTopBraSwimming: 2
+    ClothingUnderwearTopBraSwimmingAlt: 2
+    ClothingUnderwearTopBraThin: 2
+    ClothingUnderwearTopFishnetBody: 1
+    ClothingUnderwearTopFishnetBodyGloves: 1
+    ClothingUnderwearTopFishnetBodySleeves: 1
+    ClothingUnderwearTopBraHalterneck: 3
+    ClothingUnderwearTopBraShibari: 1
+    ClothingUnderwearTopBraShibariSleeves: 1
+    ClothingUnderwearTopBraStriped: 1
+    ClothingUnderwearTopBraTubetop: 2
+    ClothingUnderwearTopCow: 1
+    #white end
+
+    #White panties start
+    ClothingUnderwearBottomBeeShorts: 2
+    ClothingUnderwearBottomBoxersHeart: 2
+    ClothingUnderwearBottomBoxersStriped: 2
+    ClothingUnderwearBottomBriefs: 2
+    ClothingUnderwearBottomFishnetLower: 1
+    ClothingUnderwearBottomJockstrap: 2
+    ClothingUnderwearBottomMankini: 2
+    ClothingUnderwearBottomPantiesBeeKini: 2
+    ClothingUnderwearBottomPantiesKinky: 1
+    ClothingUnderwearBottomPantiesNeko: 2
+    ClothingUnderwearBottomPantiesSlim: 2
+    ClothingUnderwearBottomPantiesSwimming: 2
+    ClothingUnderwearBottomPantiesThin: 1
+    ClothingUnderwearBottomPantiesStripped: 2
+    ClothingUnderwearBottomPantiesThong: 3
+    #white end
+
+    #white socks start
+    ClothingUnderwearSocksBeeKnee: 2
+    ClothingUnderwearSocksBeeNorm: 2
+    ClothingUnderwearSocksBeeThigh: 2
+    ClothingUnderwearSocksFishnet: 1
+    ClothingUnderwearSocksGarter: 1
+    ClothingUnderwearSocksPantyhose: 1
+    ClothingUnderwearSocksPantyhoseRipped: 1
+    ClothingUnderwearSocksRainbowKnee: 2
+    ClothingUnderwearSocksRainbowThigh: 2
+    ClothingUnderwearSocksHigh: 5
+    ClothingUnderwearSocksNormal: 5
+    ClothingUnderwearSocksShort: 5
+    ClothingUnderwearSocksThigh: 5
+    ClothingUnderwearStockingsBlue: 2
+    ClothingUnderwearStockingsCyan: 2
+    ClothingUnderwearStockingsPink: 2
+    ClothingUnderwearStockingsGreen: 2
+    ClothingUnderwearStockingsLightPink: 2
+    ClothingUnderwearStockingsLightOrange: 2
+    ClothingUnderwearStockingsLightPurple: 2
+    ClothingUnderwearStockingsLightYellow: 2
+    ClothingUnderwearSocksStripedKnee: 2
+    ClothingUnderwearSocksStripedThigh: 2
+    ClothingUnderwearSocksThinKnee: 1
+    ClothingUnderwearSocksThinThigh: 1
+    # white end
   contrabandInventory:
     ClothingUniformJumpsuitTacticool: 1
     ClothingUniformJumpskirtTacticool: 1

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

@@ -27,9 +27,12 @@
       sprite: Mobs/Customization/masking_helpers.rsi
       state: unisex_full
       visible: false
+    - map: [ "underwearb" ] #White
+    - map: [ "underweart" ] #White
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    - map: [ "socks" ] #White
     - map: ["jumpsuit"]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
     - map: ["enum.HumanoidVisualLayers.LHand"]
     - map: ["enum.HumanoidVisualLayers.RHand"]
     - map: [ "gloves" ]
@@ -340,9 +343,12 @@
       sprite: Mobs/Customization/masking_helpers.rsi
       state: unisex_full
       visible: false
+    - map: [ "underwearb" ] #White
+    - map: [ "underweart" ] #White
+    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
+    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
+    - map: [ "socks" ] #White
     - map: ["jumpsuit"]
-    - map: ["enum.HumanoidVisualLayers.LFoot"]
-    - map: ["enum.HumanoidVisualLayers.RFoot"]
     - map: ["enum.HumanoidVisualLayers.LHand"]
     - map: ["enum.HumanoidVisualLayers.RHand"]
     - map: ["enum.HumanoidVisualLayers.Handcuffs"]

Resources/Prototypes/InventoryTemplates/human_inventory_template.yml

@@ -8,6 +8,36 @@
       uiWindowPos: 1,0
       strippingWindowPos: 1,3
       displayName: Shoes
+    - name: socks #WD slot
+      slotTexture: socks
+      slotFlags: SOCKS
+      stripTime: 6
+      uiWindowPos: 4,1
+      strippingWindowPos: 3,3
+      displayName: Socks
+      whitelist:
+        tags:
+          - socks
+    - name: underwearb #WD slot
+      slotTexture: underwearb
+      slotFlags: UNDERWEARB
+      stripTime: 6
+      uiWindowPos: 4,2
+      strippingWindowPos: 3,2
+      displayName: Panties
+      whitelist:
+        tags:
+          - underwearb
+    - name: underweart #WD slot
+      slotTexture: underweart
+      slotFlags: UNDERWEART
+      stripTime: 6
+      uiWindowPos: 4,3
+      strippingWindowPos: 3,1
+      displayName: Bra
+      whitelist:
+        tags:
+          - underweart
     - name: jumpsuit
       slotTexture: uniform
       slotFlags: INNERCLOTHING
@@ -114,3 +144,4 @@
       uiWindowPos: 3,0
       strippingWindowPos: 0,5
       displayName: Back
+

Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml

@@ -4,24 +4,26 @@
   description: job-description-cargotech
   playTimeTracker: JobCargoTechnician
   startingGear: CargoTechGear
-  icon: "JobIconCargoTechnician"
-  supervisors: job-supervisors-qm
+  icon: "CargoTechnician"
+  supervisors: job-supervisors-hop-qm
   access:
   - Cargo
   - Maintenance
-  extendedAccess:
-  - Salvage
+  - External
 
 - type: startingGear
   id: CargoTechGear
   equipment:
     head: ClothingHeadHatCargosoft
     jumpsuit: ClothingUniformJumpsuitCargo
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackFilled
     shoes: ClothingShoesColorBlack
     id: CargoPDA
     ears: ClothingHeadsetCargo
     pocket1: AppraisalTool
-  innerClothingSkirt: ClothingUniformJumpskirtCargo
-  satchel: ClothingBackpackSatchelCargoFilled
-  duffelbag: ClothingBackpackDuffelCargoFilled
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtCargo
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -4,39 +4,29 @@
   description: job-description-qm
   playTimeTracker: JobQuartermaster
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobCargoTechnician
-      time: 21600 #6 hrs
     - !type:RoleTimeRequirement
       role: JobSalvageSpecialist
-      time: 10800 #3 hrs
+      time: 3600
     - !type:DepartmentTimeRequirement
       department: Cargo
-      time: 36000 #10 hours
+      time: 18000
     - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
+      time: 108000
   weight: 10
   startingGear: QuartermasterGear
-  icon: "JobIconQuarterMaster"
-  supervisors: job-supervisors-captain
+  icon: "QuarterMaster"
+  supervisors: job-supervisors-hop
   whitelistedSpecies:
     - Human
     - Dwarf
-    - Felinid
-  canBeAntag: true
+  canBeAntag: false
   access:
   - Cargo
   - Salvage
   - Quartermaster
   - Maintenance
+  - External
   - Command
-  - Brig
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: QuartermasterGear
@@ -47,8 +37,10 @@
     shoes: ClothingShoesColorBrown
     id: QuartermasterPDA
     ears: ClothingHeadsetQM
-    belt: BoxFolderClipboard
     pocket1: AppraisalTool
-  innerClothingSkirt: ClothingUniformJumpskirtQM
+    underwearb: ClothingUnderwearBottomBoxersQM # White-Underwear
+  underweart: ClothingUnderwearTopBraQM # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesQM # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtQM
   satchel: ClothingBackpackSatchelQuartermasterFilled
   duffelbag: ClothingBackpackDuffelQuartermasterFilled

Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml

@@ -26,5 +26,8 @@
     shoes: ClothingShoesBootsSalvage
     id: SalvagePDA
     ears: ClothingHeadsetCargo
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
   satchel: ClothingBackpackSatchelSalvageFilled
   duffelbag: ClothingBackpackDuffelSalvageFilled

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -4,7 +4,7 @@
   description: job-description-passenger
   playTimeTracker: JobPassenger
   startingGear: PassengerGear
-  icon: "JobIconPassenger"
+  icon: "Passenger"
   supervisors: job-supervisors-everyone
   access:
   - Maintenance
@@ -17,6 +17,9 @@
     shoes: ClothingShoesColorBlack
     id: PassengerPDA
     ears: ClothingHeadsetGrey
-  innerClothingSkirt: ClothingUniformJumpskirtColorGrey
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorGrey
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml

@@ -8,7 +8,7 @@
       department: Civilian
       time: 1800
   startingGear: BartenderGear
-  icon: "JobIconBartender"
+  icon: "Bartender"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -23,11 +23,14 @@
   equipment:
     head: ClothingHeadHatTophat
     jumpsuit: ClothingUniformJumpsuitBartender
-    outerClothing: ClothingOuterVest
+    outerClothing: ClothingOuterVestKevlar
     back: ClothingBackpackFilled
     shoes: ClothingShoesColorBlack
     id: BartenderPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpskirtBartender
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtBartender
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml

@@ -4,7 +4,7 @@
   description: job-description-botanist
   playTimeTracker: JobBotanist
   startingGear: BotanistGear
-  icon: "JobIconBotanist"
+  icon: "Botanist"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -24,6 +24,9 @@
     ears: ClothingHeadsetService
     outerClothing: ClothingOuterApronBotanist
     belt: ClothingBeltPlantFilled
-  innerClothingSkirt: ClothingUniformJumpskirtHydroponics
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtHydroponics
   satchel: ClothingBackpackSatchelHydroponicsFilled
   duffelbag: ClothingBackpackDuffelHydroponicsFilled

Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml

@@ -4,7 +4,7 @@
   description: job-description-chaplain
   playTimeTracker: JobChaplain
   startingGear: ChaplainGear
-  icon: "JobIconChaplain"
+  icon: "Chaplain"
   supervisors: job-supervisors-hop
   access:
   - Chapel
@@ -22,6 +22,9 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpskirtChaplain
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtChaplain
   satchel: ClothingBackpackSatchelChaplainFilled
   duffelbag: ClothingBackpackDuffelChaplainFilled

Resources/Prototypes/Roles/Jobs/Civilian/chef.yml

@@ -8,7 +8,7 @@
       department: Civilian
       time: 1800
   startingGear: ChefGear
-  icon: "JobIconChef"
+  icon: "Chef"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -24,12 +24,13 @@
     jumpsuit: ClothingUniformJumpsuitChef
     head: ClothingHeadHatChef
     back: ClothingBackpackFilled
-    mask: ClothingMaskItalianMoustache
     shoes: ClothingShoesColorBlack
     id: ChefPDA
     ears: ClothingHeadsetService
     outerClothing: ClothingOuterApronChef
-    belt: ClothingBeltChefFilled
-  innerClothingSkirt: ClothingUniformJumpskirtChef
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtChef
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/clown.yml

@@ -37,5 +37,8 @@
     pocket2: ClownRecorder
     id: ClownPDA
     ears: ClothingHeadsetService
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
   satchel: ClothingBackpackSatchelClownFilled
   duffelbag: ClothingBackpackDuffelClownFilled

Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml

@@ -4,10 +4,9 @@
   description: job-description-janitor
   playTimeTracker: JobJanitor
   startingGear: JanitorGear
-  icon: "JobIconJanitor"
+  icon: "Janitor"
   supervisors: job-supervisors-hop
   access:
-  - Service
   - Janitor
   - Maintenance
   special:
@@ -23,10 +22,12 @@
     shoes: ClothingShoesGaloshes
     head: ClothingHeadHatPurplesoft
     id: JanitorPDA
-    gloves: ClothingHandsGlovesJanitor
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-  innerClothingSkirt: ClothingUniformJumpskirtJanitor
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtJanitor
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
 
@@ -36,10 +37,9 @@
     jumpsuit: ClothingUniformJumpskirtJanimaid
     back: ClothingBackpackFilled
     id: JanitorPDA
-    gloves: ClothingHandsGlovesJanitor
     head: ClothingHeadHatCatEars
     ears: ClothingHeadsetService
     belt: ClothingBeltJanitorFilled
-  innerClothingSkirt: ClothingUniformJumpskirtJanimaid
+  innerclothingskirt: ClothingUniformJumpskirtJanimaid
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml

@@ -24,6 +24,9 @@
     id: LawyerPDA
     ears: ClothingHeadsetSecurity
     # TODO add copy of space law
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
   inhand:
     - BriefcaseBrownFilled
   innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack

Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml

@@ -4,7 +4,7 @@
   description: job-description-librarian
   playTimeTracker: JobLibrarian
   startingGear: LibrarianGear
-  icon: "JobIconLibrarian"
+  icon: "Librarian"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -19,7 +19,13 @@
     id: LibrarianPDA
     ears: ClothingHeadsetService
     pocket1: d10Dice
+    belt: BooksBag
     pocket2: HandLabeler # for making named bestsellers
-  innerClothingSkirt: ClothingUniformJumpskirtLibrarian
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  inhand:
+    right hand: BriefcaseBrownFilled
+  innerclothingskirt: ClothingUniformJumpskirtColorLightBrown
   satchel: ClothingBackpackSatchelLibrarianFilled
   duffelbag: ClothingBackpackDuffelLibrarianFilled

Resources/Prototypes/Roles/Jobs/Civilian/mime.yml

@@ -3,11 +3,8 @@
   name: job-name-mime
   description: job-description-mime
   playTimeTracker: JobMime
-  requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 14400 #4 hrs
   startingGear: MimeGear
-  icon: "JobIconMime"
+  icon: "Mime"
   supervisors: job-supervisors-hop
   access:
   - Theatre
@@ -31,18 +28,9 @@
     mask: ClothingMaskMime
     id: MimePDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpskirtMime
-  satchel: ClothingBackpackSatchelMimeFilled
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtMime
+  satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelMimeFilled
-
-- type: entity
-  id: ActionMimeInvisibleWall
-  name: Create Invisible Wall
-  description: Create an invisible wall in front of you, if placeable there.
-  noSpawn: true
-  components:
-  - type: InstantAction
-    priority: -1
-    useDelay: 30
-    icon: Structures/Walls/solid.rsi/full.png
-    event: !type:InvisibleWallActionEvent

Resources/Prototypes/Roles/Jobs/Civilian/musician.yml

@@ -23,5 +23,8 @@
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA
     ears: ClothingHeadsetService
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
   satchel: ClothingBackpackSatchelMusicianFilled
   duffelbag: ClothingBackpackDuffelMusicianFilled

Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml

@@ -4,7 +4,7 @@
   description: job-description-serviceworker
   playTimeTracker: JobServiceWorker
   startingGear: ServiceWorkerGear
-  icon: "JobIconServiceWorker"
+  icon: "ServiceWorker"
   supervisors: job-supervisors-service
   canBeAntag: false
   access:
@@ -23,6 +23,9 @@
     shoes: ClothingShoesColorBlack
     id: ServiceWorkerPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpskirtBartender
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtBartender
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -6,47 +6,43 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 54000 # 15 hours
+      time: 18000
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 54000 # 15 hours
+      time: 18000
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 54000 # 15 hours
-    - !type:DepartmentTimeRequirement
-      department: Command
-      time: 54000 # 15 hours
+      time: 18000
+    - !type:OverallPlaytimeRequirement
+      time: 108000
   weight: 20
   startingGear: CaptainGear
-  icon: "JobIconCaptain"
+  icon: "Captain"
   requireAdminNotify: true
   joinNotifyCrew: true
   supervisors: job-supervisors-centcom
   whitelistedSpecies:
     - Human
-    - Felinid
+    - Dwarf
   canBeAntag: false
   accessGroups:
   - AllAccess
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: CaptainGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitCaptain
     back: ClothingBackpackCaptainFilled
-    shoes: ClothingShoesBootsLaceup
+    shoes: ClothingShoesColorBlack
     head: ClothingHeadHatCaptain
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesCaptain
     outerClothing: ClothingOuterArmorCaptainCarapace
     id: CaptainPDA
     ears: ClothingHeadsetAltCommand
-  innerClothingSkirt: ClothingUniformJumpskirtCaptain
+    underwearb: ClothingUnderwearBottomBoxersCap # White-Underwear
+  underweart: ClothingUnderwearTopBraCap # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesCap # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtCaptain
   satchel: ClothingBackpackSatchelCaptainFilled
   duffelbag: ClothingBackpackDuffelCaptainFilled

Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml

@@ -5,24 +5,25 @@
   playTimeTracker: JobCentralCommandOfficial
   setPreference: false
   startingGear: CentcomGear
-  icon: "JobIconNanotrasen"
+  icon: "Nanotrasen"
   supervisors: job-supervisors-hos
   canBeAntag: false
   accessGroups:
   - AllAccess
-  access:
-  - CentralCommand
 
 - type: startingGear
   id: CentcomGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomOfficial
-    shoes: ClothingShoesBootsCombatFilled
+    shoes: ClothingShoesBootsJack
     head: ClothingHeadHatCentcom
     eyes: ClothingEyesGlassesSunglasses
     gloves: ClothingHandsGlovesColorBlack
-    outerClothing: ClothingOuterArmorBasic
+    outerClothing: ClothingOuterVestKevlar
     id: CentcomPDA
-    ears: ClothingHeadsetAltCentCom
-    pocket1: BoxFolderBlack
-    pocket2: PenCentcom
+    ears: ClothingHeadsetAltCommand
+    pocket1: Paper
+    pocket2: Pen
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -6,25 +6,23 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 36000 # 10 hours
+      time: 3600
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 36000 # 10 hours
+      time: 3600
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 # 10 hrs
-    - !type:DepartmentTimeRequirement
-      department: Command
-      time: 36000 # 10 hours
+      time: 3600
+    - !type:OverallPlaytimeRequirement
+      time: 108000
   weight: 20
   startingGear: HoPGear
-  icon: "JobIconHeadOfPersonnel"
+  icon: "HeadOfPersonnel"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human
-    - Felinid
-  canBeAntag: true
+  canBeAntag: false
   access:
   - Command
   - HeadOfPersonnel
@@ -38,25 +36,6 @@
   - Hydroponics
   - External
   # I mean they'll give themselves the rest of the access levels *anyways*.
-  # As of 15/03/23 they can't do that so here's MOST of the rest of the access levels.
-  # Head level access that isn't their own was deliberately left out, get AA from the captain instead.
-  - Chemistry
-  - Engineering
-  - Research
-  - Detective
-  - Salvage
-  - Security
-  - Brig
-  - Lawyer
-  - Cargo
-  - Atmospherics
-  - Medical
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: HoPGear
@@ -66,9 +45,10 @@
     shoes: ClothingShoesColorBrown
     head: ClothingHeadHatHopcap
     id: HoPPDA
-    gloves: ClothingHandsGlovesHop
     ears: ClothingHeadsetAltCommand
-    belt: BoxFolderClipboard
-  innerClothingSkirt: ClothingUniformJumpskirtHoP
+    underwearb: ClothingUnderwearBottomBoxersHOP # White-Underwear
+  underweart: ClothingUnderwearTopBraHOP # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesHOP # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtHoP
   satchel: ClothingBackpackSatchelHOPFilled
   duffelbag: ClothingBackpackDuffelHOPFilled

Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml

@@ -6,11 +6,11 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 54000 # 15 hrs
+      time: 3600
   startingGear: AtmosphericTechnicianGear
-  icon: "JobIconAtmosphericTechnician"
+  icon: "AtmosphericTechnician"
   supervisors: job-supervisors-ce
-  canBeAntag: true
+  canBeAntag: false
   access:
   - Maintenance
   - Engineering
@@ -21,12 +21,15 @@
   id: AtmosphericTechnicianGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitAtmos
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackEngineeringFilled
     shoes: ClothingShoesColorWhite
     eyes: ClothingEyesGlassesMeson
     id: AtmosPDA
-    belt: ClothingBeltUtilityEngineering
+    belt: ClothingBeltUtilityFilled
     ears: ClothingHeadsetEngineering
-  innerClothingSkirt: ClothingUniformJumpskirtAtmos
-  satchel: ClothingBackpackSatchelAtmosphericsFilled
-  duffelbag: ClothingBackpackDuffelAtmosphericsFilled
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtAtmos
+  satchel: ClothingBackpackSatchelEngineeringFilled
+  duffelbag: ClothingBackpackDuffelEngineeringFilled

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -6,25 +6,21 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobAtmosphericTechnician
-      time: 21600 #6 hrs
-    - !type:RoleTimeRequirement
-      role: JobStationEngineer
-      time: 21600 #6 hrs
+      time: 3600
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 36000 #10 hrs
+      time: 18000
     - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
+      time: 108000
   weight: 10
   startingGear: ChiefEngineerGear
-  icon: "JobIconChiefEngineer"
+  icon: "ChiefEngineer"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human
     - Dwarf
-    - Felinid
-  canBeAntag: true
+  canBeAntag: false
   access:
   - Maintenance
   - Engineering
@@ -32,13 +28,6 @@
   - External
   - ChiefEngineer
   - Atmospherics
-  - Brig
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: ChiefEngineerGear
@@ -50,7 +39,10 @@
     id: CEPDA
     eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetCE
-    belt: ClothingBeltUtilityEngineering
-  innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer
+    belt: ClothingBeltChiefEngineerFilled
+    underwearb: ClothingUnderwearBottomBoxersCE # White-Underwear
+  underweart: ClothingUnderwearTopBraCE # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesCE # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtChiefEngineer
   satchel: ClothingBackpackSatchelChiefEngineerFilled
   duffelbag: ClothingBackpackDuffelChiefEngineerFilled

Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml

@@ -6,9 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 14400 #4 hrs
+      time: 1800
   startingGear: StationEngineerGear
-  icon: "JobIconStationEngineer"
+  icon: "StationEngineer"
   supervisors: job-supervisors-ce
   access:
   - Maintenance
@@ -27,8 +27,11 @@
     outerClothing: ClothingOuterVestHazard
     id: EngineerPDA
     eyes: ClothingEyesGlassesMeson
-    belt: ClothingBeltUtilityEngineering
+    belt: ClothingBeltUtilityFilled
     ears: ClothingHeadsetEngineering
-  innerClothingSkirt: ClothingUniformJumpskirtEngineering
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtEngineering
   satchel: ClothingBackpackSatchelEngineeringFilled
   duffelbag: ClothingBackpackDuffelEngineeringFilled

Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml

@@ -6,12 +6,12 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
-      time: 54000 #15 hrs
+      time: 28800
       inverted: true # stop playing intern if you're good at engineering!
   startingGear: TechnicalAssistantGear
-  icon: "JobIconTechnicalAssistant"
+  icon: "TechnicalAssistant"
   supervisors: job-supervisors-engineering
-  canBeAntag: true
+  canBeAntag: false
   access:
   - Maintenance
   - Engineering
@@ -20,12 +20,16 @@
 - type: startingGear
   id: TechnicalAssistantGear
   equipment:
+    head: ClothingHeadHatWelding
     jumpsuit: ClothingUniformJumpsuitColorYellow
     back: ClothingBackpackEngineeringFilled
     shoes: ClothingShoesBootsWork
     id: TechnicalAssistantPDA
-    belt: ClothingBeltUtilityEngineering
+    belt: ClothingBeltUtilityFilled
     ears: ClothingHeadsetEngineering
-  innerClothingSkirt: ClothingUniformJumpskirtColorYellow
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorYellow
   satchel: ClothingBackpackSatchelEngineeringFilled
   duffelbag: ClothingBackpackDuffelEngineeringFilled

Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml

@@ -8,9 +8,6 @@
     id: CluwnePDA
     gloves: ClothingHandsGlovesCluwne
     pocket1: CluwneHorn
-
-- type: startingGear
-  id: HoloClownGear
-  equipment:
-    pocket1: BikeHorn
-
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear

Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml

@@ -10,7 +10,10 @@
     shoes: ClothingShoesCult
     id: PassengerPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
 
@@ -24,6 +27,9 @@
     shoes: ClothingShoesColorRed
     id: PassengerPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml

@@ -6,65 +6,48 @@
   playTimeTracker: JobERTLeader
   setPreference: false
   startingGear: ERTLeaderGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   - AllAccess
-  access:
-  - CentralCommand
 
 - type: startingGear
   id: ERTLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
     back: ClothingBackpackERTLeaderFilled
-    shoes: ClothingShoesBootsCombatFilled
-    head: ClothingHeadHelmetERTLeader
+    shoes: ClothingShoesBootsJack
+    head: ClothingHeadHelmetHelmet
     eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterVestKevlar
     id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-    pocket2: FlashlightSeclite
+    ears: ClothingHeadsetAltCommand
+    belt: ClothingBeltSecurityWebbing
+    pocket1: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 - type: startingGear
   id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
     back: ClothingBackpackERTLeaderFilled
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
+    shoes: ClothingShoesBootsMag
+    mask: ClothingMaskBreath
     eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
+    gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterHardsuitERTLeader
-    suitstorage: AirTankFilled
+    suitstorage: OxygenTankFilled
     id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-    pocket2: FlashlightSeclite
-
-- type: startingGear
-  id: ERTLeaderGearEVALecter
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderFilled
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTLeader
-    suitstorage: WeaponRifleLecter
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: MagazineRifle
-    pocket2: MagazineRifle
-  inhand:
-    - AirTankFilled
+    pocket1: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 # Engineer
 - type: job
@@ -74,13 +57,11 @@
   playTimeTracker: JobERTEngineer
   setPreference: false
   startingGear: ERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   - AllAccess
-  access:
-  - CentralCommand
 
 - type: startingGear
   id: ERTEngineerGear
@@ -88,15 +69,17 @@
     jumpsuit: ClothingUniformJumpsuitERTEngineer
     back: ClothingBackpackERTEngineerFilled
     shoes: ClothingShoesBootsWork
-    head: ClothingHeadHelmetERTEngineer
+    head: ClothingHeadHelmetHelmet
     eyes: ClothingEyesGlassesMeson
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTEngineerPDA
-    ears: ClothingHeadsetAltCentCom
+    gloves: ClothingHandsGlovesColorYellow
+    outerClothing: ClothingOuterVestKevlar
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
-    pocket2: GasAnalyzer
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 - type: startingGear
   id: ERTEngineerGearEVA
@@ -104,16 +87,18 @@
     jumpsuit: ClothingUniformJumpsuitERTEngineer
     back: ClothingBackpackERTEngineerFilled
     shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
+    mask: ClothingMaskBreath
     eyes: ClothingEyesGlassesMeson
-    gloves: ClothingHandsGlovesCombat
+    gloves: ClothingHandsGlovesColorYellow
     outerClothing: ClothingOuterHardsuitERTEngineer
-    suitstorage: AirTankFilled
-    id: ERTEngineerPDA
-    ears: ClothingHeadsetAltCentCom
+    suitstorage: OxygenTankFilled
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
-    pocket2: GasAnalyzer
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 # Security
 - type: job
@@ -123,29 +108,29 @@
   playTimeTracker: JobERTSecurity
   setPreference: false
   startingGear: ERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   - AllAccess
-  access:
-  - CentralCommand
 
 - type: startingGear
   id: ERTSecurityGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
     back: ClothingBackpackERTSecurityFilled
-    shoes: ClothingShoesBootsCombatFilled
-    head: ClothingHeadHelmetERTSecurity
+    shoes: ClothingShoesBootsJack
+    head: ClothingHeadHelmetHelmet
     eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTSecurityPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-    pocket2: FlashlightSeclite
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterVestKevlar
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
+    belt: ClothingBeltSecurityWebbing
+    pocket1: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 - type: startingGear
   id: ERTSecurityGearEVA
@@ -153,35 +138,18 @@
     jumpsuit: ClothingUniformJumpsuitERTSecurity
     back: ClothingBackpackERTSecurityFilled
     shoes: ClothingShoesBootsMag
-    mask: ClothingMaskGasERT
+    mask: ClothingMaskBreath
     eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
+    gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterHardsuitERTSecurity
-    suitstorage: AirTankFilled
-    id: ERTSecurityPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-    pocket2: FlashlightSeclite
-
-- type: startingGear
-  id: ERTSecurityGearEVALecter
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityFilled
-    shoes: ClothingShoesBootsMag
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTSecurity
-    suitstorage: WeaponRifleLecter
-    id: ERTSecurityPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: MagazineRifle
-    pocket2: MagazineRifle
-  inhand:
-    - AirTankFilled
+    suitstorage: OxygenTankFilled
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
+    belt: ClothingBeltSecurityWebbing
+    pocket1: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 # Medical
 - type: job
@@ -191,29 +159,30 @@
   playTimeTracker: JobERTMedical
   setPreference: false
   startingGear: ERTMedicalGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   - AllAccess
-  access:
-  - CentralCommand
 
 - type: startingGear
   id: ERTMedicalGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackERTMedicalFilled
-    shoes: ClothingShoesBootsCombatFilled
-    head: ClothingHeadHelmetERTMedic
+    shoes: ClothingShoesBootsJack
+    head: ClothingHeadHelmetHelmet
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTMedicPDA
-    ears: ClothingHeadsetAltCentCom
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterVestKevlar
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltMedicalFilled
     pocket1: HandheldHealthAnalyzer
     pocket2: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 - type: startingGear
   id: ERTMedicalGearEVA
@@ -221,16 +190,19 @@
     jumpsuit: ClothingUniformJumpsuitERTMedic
     back: ClothingBackpackERTMedicalFilled
     shoes: ClothingShoesBootsMag
-    mask: ClothingMaskGasERT
+    mask: ClothingMaskBreath
     eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesNitrile
+    gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterHardsuitERTMedical
-    suitstorage: AirTankFilled
-    id: ERTMedicPDA
-    ears: ClothingHeadsetAltCentCom
+    suitstorage: OxygenTankFilled
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltMedicalFilled
     pocket1: HandheldHealthAnalyzer
     pocket2: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 # Janitor
 - type: job
@@ -240,13 +212,11 @@
   playTimeTracker: JobERTJanitor
   setPreference: false
   startingGear: ERTJanitorGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   - AllAccess
-  access:
-  - CentralCommand
 
 - type: startingGear
   id: ERTJanitorGear
@@ -254,13 +224,16 @@
     jumpsuit: ClothingUniformJumpsuitERTJanitor
     back: ClothingBackpackERTJanitorFilled
     shoes: ClothingShoesGaloshes
-    head: ClothingHeadHelmetERTJanitor
-    gloves: ClothingHandsGlovesColorPurple
-    outerClothing: ClothingOuterArmorBasicSlim
-    id: ERTJanitorPDA
-    ears: ClothingHeadsetAltCentCom
+    head: ClothingHeadHelmetHelmet
+    gloves: ClothingHandsGlovesColorBlack
+    outerClothing: ClothingOuterVestKevlar
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
 
 - type: startingGear
   id: ERTJanitorGearEVA
@@ -268,11 +241,14 @@
     jumpsuit: ClothingUniformJumpsuitERTJanitor
     back: ClothingBackpackERTJanitorFilled
     shoes: ClothingShoesBootsMag
-    mask: ClothingMaskGasERT
-    gloves: ClothingHandsGlovesColorPurple
+    mask: ClothingMaskBreath
+    gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterHardsuitERTJanitor
-    suitstorage: AirTankFilled
-    id: ERTJanitorPDA
-    ears: ClothingHeadsetAltCentCom
+    suitstorage: OxygenTankFilled
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCommand
     belt: ClothingBeltJanitorFilled
     pocket1: Flare
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -1,12 +1,28 @@
 #Misc outfit startingGear definitions.
 
+#IHS Void Suit Outfit
+- type: startingGear
+  id: IHSGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorBlack
+    back: ClothingBackpackFilled
+    head: ClothingHeadHelmetIHSVoidHelm
+    gloves: ClothingHandsGlovesIhscombat
+    outerClothing: IHSVoidsuit
+    shoes: ClothingShoesBootsJack
+    id: PassengerPDA
+    ears: ClothingHeadsetService
+  innerclothingskirt: ClothingUniformJumpskirtColorBlack
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled
+
 #Skeleton Biker
 - type: startingGear
   id: SkeletonBiker
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBlack
     back: ClothingBackpackFilled
-    head: ClothingHeadBandSkull
+    head: HatBandSkull
     eyes: ClothingEyesGlassesSunglasses
     outerClothing: ClothingOuterCoatGentle
     gloves: ClothingHandsGlovesFingerless
@@ -15,7 +31,7 @@
     ears: ClothingHeadsetGrey
     pocket1: VehicleSkeletonMotorcycle
     pocket2: VehicleKeySkeletonMotorcycle
-  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
+  innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled
 
@@ -23,64 +39,50 @@
 - type: startingGear
   id: SpaceNinjaGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitNinja
-    # belt holds katana so satchel has the tools for sabotaging things
-    back: ClothingBackpackSatchelTools
-    mask: ClothingMaskNinja
+    jumpsuit: ClothingUniformJumpsuitColorBlack
+    back: ClothingBackpackFilled
     head: ClothingHeadHelmetSpaceNinja
-    eyes: ClothingEyesVisorNinja
     gloves: ClothingHandsGlovesSpaceNinja
-    outerClothing: ClothingOuterSuitSpaceNinja
+    outerClothing: ClothingOuterSuitSpaceninja
     shoes: ClothingShoesSpaceNinja
-    id: AgentIDCard
-    ears: ClothingHeadsetGrey
-    pocket1: SpiderCharge
-    pocket2: PinpointerStation
-    belt: EnergyKatana
-    suitstorage: YellowOxygenTankFilled
-  inhand:
-    - JetpackBlackFilled
+    id: PassengerPDA
+  innerclothingskirt: ClothingUniformJumpskirtColorBlack
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled
 
 #Deathsquad Outfit
 - type: startingGear
-  id: DeathSquadGear
+  id: DeadsquadGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDeathSquadFilled
-    mask: ClothingMaskGasDeathSquad
-    eyes: ClothingEyesHudSecurity
-    ears: ClothingHeadsetAltCentCom
+    jumpsuit: ClothingUniformJumpsuitColorBlack
+    back: ClothingBackpackDuffelSyndicateAmmo
+    mask: ClothingMaskBreath
+    eyes: ClothingEyesGlassesSecurity
+    ears: ClothingHeadsetAltCommand
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitDeathsquad
-    suitstorage: AirTankFilled
-    shoes: ClothingShoesBootsMagAdv
-    id: DeathsquadPDA
+    suitstorage: YellowOxygenTankFilled
+    shoes: ClothingShoesChameleonNoSlips
+    id: CentcomPDA
     pocket1: EnergySword
-    pocket2: EnergyShield
-    belt: ClothingBeltMilitaryWebbingMedFilled
-  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
+    belt: ClothingBeltChiefEngineerFilled
+  innerclothingskirt: ClothingUniformJumpskirtColorBlack
+  satchel: ClothingBackpackDuffelSyndicateAmmo
+  duffelbag: ClothingBackpackDuffelSyndicateAmmo
 
-# Syndicate Operative Outfit - Monkey
-- type: startingGear
-  id: SyndicateOperativeGearMonkey
-  equipment:
-    head: ClothingHeadHatOutlawHat
-    jumpsuit: ClothingUniformJumpsuitOperative
-    mask: CigaretteSyndicate
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
 
-# Syndicate Operative Outfit - Barratry
+# Syndicate Operative Outfit - Poverty
 - type: startingGear
   id: SyndicateOperativeGearExtremelyBasic
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     back: ClothingBackpackDuffelSyndicateOperative
     shoes: ClothingShoesBootsCombatFilled
-    gloves: ClothingHandsGlovesColorBlack
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
+  innerclothingskirt: ClothingUniformJumpsuitOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
+
 #Syndicate Operative Outfit - Basic
 - type: startingGear
   id: SyndicateOperativeGearBasic
@@ -91,8 +93,8 @@
     gloves: ClothingHandsGlovesCombat
     shoes: ClothingShoesBootsCombatFilled
     pocket1: BaseUplinkRadio40TC
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
+    id: AgentIDCard
+  innerclothingskirt: ClothingUniformJumpsuitOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
@@ -103,159 +105,68 @@
     jumpsuit: ClothingUniformJumpsuitOperative
     back: ClothingBackpackDuffelSyndicateOperative
     mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
+  # eyes: Night Vision Goggles whenever they're made
+    eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitSyndie
     shoes: ClothingShoesBootsCombatFilled
-    id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
+    id: AgentIDCard
+    pocket1: ExtendedEmergencyOxygenTankFilled
     pocket2: BaseUplinkRadio40TC
     belt: ClothingBeltMilitaryWebbing
-  innerClothingSkirt: ClothingUniformJumpskirtOperative
+  innerclothingskirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
-#Nuclear Operative Commander Gear
 - type: startingGear
   id: SyndicateCommanderGearFull
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     back: ClothingBackpackDuffelSyndicateOperative
     mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
+  # eyes: Night Vision Goggles whenever they're made
+    eyes: ClothingEyesGlassesMeson
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitSyndieCommander
     shoes: ClothingShoesBootsCombatFilled
     id: SyndiPDA
-    pocket1: DoubleEmergencyOxygenTankFilled
+    pocket1: ExtendedEmergencyOxygenTankFilled
     pocket2: BaseUplinkRadio40TC
     belt: ClothingBeltMilitaryWebbing
-  inhand:
-    - NukeOpsDeclarationOfWar
-  innerClothingSkirt: ClothingUniformJumpskirtOperative
+  innerclothingskirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
-#Nuclear Operative Medic Gear
 - type: startingGear
   id: SyndicateOperativeMedicFull
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     back: ClothingBackpackDuffelSyndicateOperativeMedic
-    mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
+    mask: ClothingMaskBreathMedical
+    eyes: ClothingEyesHudMedical
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieMedic
+    outerClothing: ClothingOuterHardsuitSyndieElite
     shoes: ClothingShoesBootsMagSyndie
-    id: SyndiAgentPDA
+    id: SyndiPDA
     pocket1: DoubleEmergencyOxygenTankFilled
     pocket2: BaseUplinkRadio40TC
     belt: ClothingBeltMilitaryWebbingMedFilled
-  innerClothingSkirt: ClothingUniformJumpskirtOperative
+  innerclothingskirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperativeMedic
   duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic
 
-# Syndicate Footsoldier Gear - Unarmed
-- type: startingGear
-  id: SyndicateFootsoldierGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Syndicate Footsoldier Gear - Knife
-- type: startingGear
-  id: SyndicateFootsoldierGearKnife
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    pocket1: CombatKnife
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Syndicate Footsoldier Gear - Energy Sword
-- type: startingGear
-  id: SyndicateFootsoldierGearESword
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: EnergySword
-    pocket2: EnergyShield
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Syndicate Footsoldier Gear - Viper
-- type: startingGear
-  id: SyndicateFootsoldierGearPistol
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    pocket1: WeaponPistolViper
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Nanotrasen Paramilitary Unit Gear - pistol
-- type: startingGear
-  id: NanotrasenParamilitaryGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitSec
-    back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSecurity
-    head: ClothingHeadHelmetSwat
-    mask: ClothingMaskGasSwat
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetSecurity
-    gloves: ClothingHandsGlovesCombat
-  innerClothingSkirt: ClothingUniformJumpskirtSec
-  satchel: ClothingBackpackSatchelSecurityFilled
-  duffelbag: ClothingBackpackDuffelSecurityFilled
-
 #CBURN Unit Gear - Full Kit
 - type: startingGear
   id: CBURNGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorBrown
-    back: ClothingBackpackDuffelCBURNFilled
-    mask: ClothingMaskGasERT
+    back: ClothingBackpackDuffelCBURN
+    mask: ClothingMaskGasExplorer
     eyes: ClothingEyesGlassesSecurity
-    ears: ClothingHeadsetAltCentCom
+    ears: ClothingHeadsetAltCommand
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitCBURN
     shoes: ClothingShoesBootsCombatFilled
@@ -264,94 +175,14 @@
     pocket2: WeaponLaserGun
     suitstorage: YellowOxygenTankFilled
     belt: ClothingBeltBandolier
-  innerClothingSkirt: ClothingUniformJumpsuitColorBrown
-  satchel: ClothingBackpackDuffelCBURNFilled
-  duffelbag: ClothingBackpackDuffelCBURNFilled
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpsuitColorBrown
+  satchel: ClothingBackpackDuffelCBURN
+  duffelbag: ClothingBackpackDuffelCBURN
 
 - type: startingGear
   id: BoxingKangarooGear
   equipment:
     gloves: ClothingHandsGlovesBoxingBlue
-
-- type: startingGear
-  id: MobMonkeyGear
-  equipment:
-    head: ClothingHeadHatTophat
-    ears: ClothingHeadsetService
-    jumpsuit: ClothingUniformJumpsuitJacketMonkey
-    id: PunPunIDCard
-
-# Passenger but without the ID, bag, or headset
-
-- type: startingGear
-  id: LimitedPassengerGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitColorGrey
-    shoes: ClothingShoesColorBlack
-  innerClothingSkirt: ClothingUniformJumpskirtColorGrey
-
-# DeathMatch Gear
-
-- type: startingGear
-  id: DeathMatchGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitColorWhite
-    shoes: ClothingShoesBootsJack
-    ears: ClothingHeadsetGrey
-    gloves: ClothingHandsGlovesFingerless
-  innerClothingSkirt: ClothingUniformJumpskirtColorWhite
-  inhand:
-    - WeaponMeleeToolboxRobust
-
-#Brigmedic
-
-- type: startingGear
-  id: BrigmedicGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitBrigmedic
-    outerClothing: ClothingOuterCoatAMG
-    back: ClothingBackpackBrigmedic
-    shoes: ClothingShoesColorRed
-    gloves: ClothingHandsGlovesNitrile
-    eyes: ClothingEyesHudMedical
-    head: ClothingHeadHatBeretBrigmedic
-    id: BrigmedicPDA
-    ears: ClothingHeadsetBrigmedic
-    mask: ClothingMaskBreathMedicalSecurity
-    belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
-  satchel: ClothingBackpackSatchelBrigmedicFilled
-  duffelbag: ClothingBackpackDuffelBrigmedicFilled
-
-#Head Rev Gear
-- type: startingGear
-  id: HeadRevGear
-  equipment:
-    pocket2: Flash
-
-#Gladiator with spear
-- type: startingGear
-  id: GladiatorGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitGladiator
-    back: SpearBone
-    head: ClothingHeadHatGladiator
-    shoes: ClothingShoesCult
-
-#Ash Walker
-- type: startingGear
-  id: AshWalker
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitGladiator
-    outerClothing: ClothingOuterArmorBone
-    back: SpearBone
-    head: ClothingHeadHelmetBone
-    shoes: ClothingShoesCult
-
-#Banana Clown
-- type: startingGear
-  id: BananaClown
-  equipment:
-    shoes: ClothingShoesClownBanana
-    jumpsuit: ClothingUniformJumpsuitClownBanana
-    mask: ClothingMaskClownBanana

Resources/Prototypes/Roles/Jobs/Medical/chemist.yml

@@ -6,9 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 14400 #4 hrs
+      time: 1800
   startingGear: ChemistGear
-  icon: "JobIconChemist"
+  icon: "Chemist"
   supervisors: job-supervisors-cmo
   access:
   - Medical
@@ -27,6 +27,9 @@
     belt: ChemBag
     pocket1: HandLabeler
     # the purple glasses?
-  innerClothingSkirt: ClothingUniformJumpskirtChemistry
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtChemistry
   satchel: ClothingBackpackSatchelChemistryFilled
   duffelbag: ClothingBackpackDuffelChemistryFilled

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -6,39 +6,26 @@
   description: job-description-cmo
   playTimeTracker: JobChiefMedicalOfficer
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobChemist
-      time: 10800 #3 hrs
-    - !type:RoleTimeRequirement
-      role: JobMedicalDoctor
-      time: 21600 #6 hrs
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 36000 #10 hrs
+      time: 18000
     - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
+      time: 108000
   weight: 10
   startingGear: CMOGear
-  icon: "JobIconChiefMedicalOfficer"
+  icon: "ChiefMedicalOfficer"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human
-    - Felinid
-  canBeAntag: true
+    - Dwarf
+  canBeAntag: false
   access:
   - Medical
   - Command
   - Maintenance
   - Chemistry
   - ChiefMedicalOfficer
-  - Brig
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: CMOGear
@@ -50,6 +37,9 @@
     id: CMOPDA
     ears: ClothingHeadsetCMO
     belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtCMO
+    underwearb: ClothingUnderwearBottomBoxersCMO # White-Underwear
+  underweart: ClothingUnderwearTopBraCMO # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesCMO # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtCMO
   satchel: ClothingBackpackSatchelCMOFilled
   duffelbag: ClothingBackpackDuffelCMOFilled

Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml

@@ -6,9 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 14400 #4 hrs
+      time: 1800
   startingGear: DoctorGear
-  icon: "JobIconMedicalDoctor"
+  icon: "MedicalDoctor"
   supervisors: job-supervisors-cmo
   access:
   - Medical
@@ -26,6 +26,9 @@
     id: MedicalPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml

@@ -6,12 +6,12 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical
-      time: 54000 # 15 hrs
+      time: 28800
       inverted: true # stop playing intern if you're good at med!
   startingGear: MedicalInternGear
-  icon: "JobIconMedicalIntern"
+  icon: "MedicalIntern"
   supervisors: job-supervisors-medicine
-  canBeAntag: true
+  canBeAntag: false
   access:
   - Medical
   - Maintenance
@@ -25,6 +25,9 @@
     id: MedicalInternPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
-  innerClothingSkirt: ClothingUniformJumpskirtColorWhite
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorWhite
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml

@@ -1,4 +1,4 @@
-- type: job
+- type: job
   id: ResearchAssistant
   name: job-name-research-assistant
   description: job-description-research-assistant
@@ -6,12 +6,12 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 54000 #15 hrs
+      time: 28800
       inverted: true # stop playing intern if you're good at science!
   startingGear: ResearchAssistantGear
-  icon: "JobIconResearchAssistant"
-  supervisors: job-supervisors-science
-  canBeAntag: true
+  icon: "ResearchAssistant"
+  supervisors: job-supervisors-rd
+  canBeAntag: false
   access:
   - Research
   - Maintenance
@@ -24,6 +24,9 @@
     shoes: ClothingShoesColorWhite
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
-  innerClothingSkirt: ClothingUniformJumpskirtColorWhite
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorWhite
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -6,30 +6,23 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 36000 #10 hrs
+      time: 18000
     - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
+      time: 108000
   weight: 10
   startingGear: ResearchDirectorGear
-  icon: "JobIconResearchDirector"
+  icon: "ResearchDirector"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human
-    - Felinid
-  canBeAntag: true
+    - Dwarf
+  canBeAntag: false
   access:
   - Research
   - Command
   - Maintenance
   - ResearchDirector
-  - Brig
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: ResearchDirectorGear
@@ -37,9 +30,12 @@
     jumpsuit: ClothingUniformJumpsuitResearchDirector
     back: ClothingBackpackResearchDirectorFilled
     shoes: ClothingShoesColorBrown
-    outerClothing: ClothingOuterCoatRD
+    outerClothing: ClothingOuterCoatRnd
     id: RnDPDA
     ears: ClothingHeadsetRD
-  innerClothingSkirt: ClothingUniformJumpskirtResearchDirector
+    underwearb: ClothingUnderwearBottomBoxersRD # White-Underwear
+  underweart: ClothingUnderwearTopBraRD # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesRD # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtResearchDirector
   satchel: ClothingBackpackSatchelResearchDirectorFilled
   duffelbag: ClothingBackpackDuffelResearchDirectorFilled

Resources/Prototypes/Roles/Jobs/Science/scientist.yml

@@ -6,9 +6,9 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Science
-      time: 14400 #4 hrs
+      time: 1800
   startingGear: ScientistGear
-  icon: "JobIconScientist"
+  icon: "Scientist"
   supervisors: job-supervisors-rd
   access:
   - Research
@@ -23,6 +23,9 @@
     outerClothing: ClothingOuterCoatRnd
     id: SciencePDA
     ears: ClothingHeadsetScience
-  innerClothingSkirt: ClothingUniformJumpskirtScientist
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraWhite # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtScientist
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled

Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml

@@ -0,0 +1,46 @@
+- type: job
+  id: Brigmedic
+  name: job-name-brigmedic
+  description: job-description-brigmedic
+  playTimeTracker: JobBrigmedic
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 18000
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 7200
+  startingGear: BrigmedicGear
+  icon: "Brigmedic"
+  supervisors: job-supervisors-hos
+  whitelistedSpecies:
+    - Human
+    - Dwarf
+  canBeAntag: false
+  access:
+  - Medical
+  - Security
+  - Brig
+  - Maintenance
+  - External
+
+- type: startingGear
+  id: BrigmedicGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+    outerClothing: ClothingOuterCoatAMG
+    back: ClothingBackpackBrigmedicFilled
+    shoes: ClothingShoesColorRed
+    gloves: ClothingHandsGlovesNitrile
+    eyes: ClothingEyesHudMedical
+    head: ClothingHeadHatBeretBrigmedic
+    id: BrigmedicPDA
+    ears: ClothingHeadsetBrigmedic
+    mask: ClothingMaskBreathMedicalSecurity
+    belt: ClothingBeltMedicalFilled
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtBrigmedic
+  satchel: ClothingBackpackSatchelBrigmedicFilled
+  duffelbag: ClothingBackpackDuffelBrigmedicFilled

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -6,14 +6,13 @@
   requirements:
   - !type:DepartmentTimeRequirement
     department: Security
-    time: 54000 # 15 hours
+    time: 7200 #2 hrs
   startingGear: DetectiveGear
-  icon: "JobIconDetective"
+  icon: "Detective"
   supervisors: job-supervisors-hos
   whitelistedSpecies:
     - Human
     - Dwarf
-    - Felinid
   canBeAntag: false
   access:
   - Security
@@ -21,22 +20,24 @@
   - Maintenance
   - Service
   - Detective
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: DetectiveGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitDetective
-    back: ClothingBackpackSecurityFilledDetective
-    shoes: ClothingShoesBootsCombatFilled
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsJack
     eyes: ClothingEyesGlassesSunglasses
     head: ClothingHeadHatFedoraBrown
     outerClothing: ClothingOuterVestDetective
     id: DetectivePDA
     ears: ClothingHeadsetSecurity
-    belt: ClothingBeltHolsterFilled
-  innerClothingSkirt: ClothingUniformJumpskirtDetective
-  satchel: ClothingBackpackSatchelSecurityFilledDetective
-  duffelbag: ClothingBackpackDuffelSecurityFilledDetective
+    pocket1: ForensicPad
+    pocket2: ForensicScanner
+    belt: ClothingBeltHolster
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtDetective
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -6,22 +6,20 @@
   requirements:
     - !type:RoleTimeRequirement
       role: JobWarden
-      time: 10800 #3 hrs
-    - !type:RoleTimeRequirement
-      role: JobSecurityOfficer
-      time: 36000 #10 hrs
+      time: 3600
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 108000 # 30 hrs
+      time: 18000
     - !type:OverallPlaytimeRequirement
-      time: 144000 #40 hrs
+      time: 108000
   weight: 10
   startingGear: HoSGear
-  icon: "JobIconHeadOfSecurity"
+  icon: "HeadOfSecurity"
   requireAdminNotify: true
   supervisors: job-supervisors-captain
   whitelistedSpecies:
     - Human
+    - Dwarf
   canBeAntag: false
   access:
   - HeadOfSecurity
@@ -33,12 +31,6 @@
   - Service
   - External
   - Detective
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
-  - !type:AddComponentSpecial
-    components:
-      - type: CommandStaff
 
 - type: startingGear
   id: HoSGear
@@ -47,13 +39,15 @@
     back: ClothingBackpackHOSFilled
     shoes: ClothingShoesBootsCombatFilled
     outerClothing: ClothingOuterCoatHoSTrench
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHatBeretHoS
     id: HoSPDA
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-  innerClothingSkirt: ClothingUniformJumpskirtHoS
+    underwearb: ClothingUnderwearBottomBoxersHOS # White-Underwear
+  underweart: ClothingUnderwearTopBraHOS # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesHOS # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtHoS
   satchel: ClothingBackpackSatchelHOSFilled
   duffelbag: ClothingBackpackDuffelHOSFilled

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -1,39 +1,38 @@
-- type: job
+- type: job
   id: SecurityCadet
   name: job-name-cadet
   description: job-description-cadet
   playTimeTracker: JobSecurityCadet
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 36000 #10 hrs
+      time: 18000 #5 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 54000 #15 hrs
+      time: 28800 #8 hrs
       inverted: true # stop playing intern if you're good at security!
   startingGear: SecurityCadetGear
-  icon: "JobIconSecurityCadet"
+  icon: "SecurityCadet"
   supervisors: job-supervisors-security
   whitelistedSpecies:
     - Human
+    - Dwarf
   canBeAntag: false
   access:
   - Security
   - Brig
   - Maintenance
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: SecurityCadetGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
     back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsCombatFilled
-    outerClothing: ClothingOuterArmorBasic
+    shoes: ClothingShoesBootsJack
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
-    pocket1: WeaponPistolMk58Nonlethal
-  innerClothingSkirt: ClothingUniformJumpskirtColorRed
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtColorRed
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -6,12 +6,13 @@
   requirements:
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 36000 #10 hrs
+      time: 3600 #1 hr
   startingGear: SecurityOfficerGear
-  icon: "JobIconSecurityOfficer"
+  icon: "SecurityOfficer"
   supervisors: job-supervisors-hos
   whitelistedSpecies:
     - Human
+    - Dwarf
   canBeAntag: false
   access:
   - Security
@@ -19,23 +20,22 @@
   - Maintenance
   - Service
   - External
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: SecurityOfficerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitSec
     back: ClothingBackpackSecurityFilled
-    shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSunglasses
-    head: ClothingHeadHelmetBasic
-    outerClothing: ClothingOuterArmorBasic
+    shoes: ClothingShoesBootsJack
+    eyes: ClothingEyesGlassesSecurity
+    head: ClothingHeadHelmetHelmetOld
+    outerClothing: ClothingOuterVestKevlar
     id: SecurityPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-  innerClothingSkirt: ClothingUniformJumpskirtSec
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtSec
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -4,26 +4,24 @@
   description: job-description-warden
   playTimeTracker: JobWarden
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobSecurityOfficer
-      time: 36000 #10 hrs
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 10800
   startingGear: WardenGear
-  icon: "JobIconWarden"
+  icon: "Warden"
   supervisors: job-supervisors-hos
   whitelistedSpecies:
     - Human
+    - Dwarf
   canBeAntag: false
   access:
   - Security
-  - Brig
   - Armory
   - Maintenance
   - Service
+  - Brig
   - External
   - Detective
-  special:
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: WardenGear
@@ -32,12 +30,14 @@
     jumpsuit: ClothingUniformJumpsuitWarden
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
-    eyes: ClothingEyesGlassesSunglasses
+    eyes: ClothingEyesGlassesSecurity
     outerClothing: ClothingOuterCoatWarden
     id: WardenPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
-  innerClothingSkirt: ClothingUniformJumpskirtWarden
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSportsAlternative # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpskirtWarden
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -4,7 +4,7 @@
   description: job-description-boxer
   playTimeTracker: JobBoxer
   startingGear: BoxerGear
-  icon: "JobIconBoxer"
+  icon: "Boxer"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -20,6 +20,9 @@
     gloves: ClothingHandsGlovesBoxingRed
     shoes: ClothingShoesColorRed
     belt: ClothingBeltChampion
-  innerClothingSkirt: UniformShortsRedWithTop
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSports # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: UniformShortsRedWithTop
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml

@@ -4,7 +4,7 @@
   description: job-description-psychologist
   playTimeTracker: JobPsychologist
   startingGear: PsychologistGear
-  icon: "JobIconPsychologist"
+  icon: "Psychologist"
   supervisors: job-supervisors-cmo
   access:
   - Medical
@@ -20,6 +20,9 @@
     shoes: ClothingShoesLeather
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
-  innerClothingSkirt: ClothingUniformJumpsuitPsychologist
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSports # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpsuitPsychologist
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml

@@ -4,7 +4,7 @@
   description: job-description-reporter
   playTimeTracker: JobReporter
   startingGear: ReporterGear
-  icon: "JobIconReporter"
+  icon: "Reporter"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -18,6 +18,9 @@
     shoes: ClothingShoesColorWhite
     id: ReporterPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpsuitJournalist
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSports # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpsuitJournalist
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml

@@ -4,7 +4,7 @@
   description: job-description-zookeeper
   playTimeTracker: JobZookeeper
   startingGear: ZookeeperGear
-  icon: "JobIconZookeeper"
+  icon: "Zookeeper"
   supervisors: job-supervisors-hop
   access:
   - Service
@@ -19,6 +19,9 @@
     shoes: ClothingShoesColorWhite
     id: ZookeeperPDA
     ears: ClothingHeadsetService
-  innerClothingSkirt: ClothingUniformJumpsuitSafari
+    underwearb: ClothingUnderwearBottomBoxersWhite # White-Underwear
+  underweart: ClothingUnderwearTopBraSports # White-Underwear
+  underwearb: ClothingUnderwearBottomPantiesWhite # White-Underwear
+  innerclothingskirt: ClothingUniformJumpsuitSafari
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml

@@ -0,0 +1,302 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: ClothingUnderwearBottomBase
+  name: based underwearb
+  description: "You should not see this. If you see it, let Neko Dar#8948 know."
+  components:
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: 1
+  - type: Clothing
+    slots: [underwearb]
+  - type: Tag
+    tags:
+      - underwearb
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesWhite
+  name: panties
+  description: Standard Nanotrasen underwear for station female employees. Painted white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersWhite
+  name: boxers
+  description: Standard Nanotrasen underwear for station employees. Dyed white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/boxers.rsi
+
+#Underwear-for-the-heads
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersCap
+  name: captain's boxers
+  description: Standard station captain's underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/capitan/boxers.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersCE
+  name: chief engineer's boxers
+  description: Standard station chief engineer underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/ce/boxers.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersCMO
+  name: chief medical officer's boxers
+  description: Standard station chief physician's underwear. For some reason they smell like chloral hydrate...
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/cmo/boxers.rsi
+    state: icon
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersHOP
+  name: head of personnel's boxers
+  description: The standard underwear of the station's chief of staff.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/hop/boxers.rsi
+    state: icon
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersHOS
+  name: head of security's boxers
+  description: Standard station head of security underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/hos/boxers.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersQM
+  name: quartermaster's boxers
+  description: Standard station quartermaster underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/qm/boxers.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersRD
+  name: research director's boxers
+  description: Standard research director's underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/rd/boxers.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesCap
+  name: captain's panties
+  description: Standard station captain underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/capitan/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesCE
+  name: chief engineer's panties
+  description: Standard station chief engineer underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/ce/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesCMO
+  name: chief medical officer's panties
+  description: Standard station chief physician's underwear. For some reason they smell like chloral hydrate...
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/cmo/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesHOP
+  name: head of personnel's panties
+  description: The standard underwear of the station's chief of staff.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/hop/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesHOS
+  name: head of security's panties
+  description: Standard station head of security underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/hos/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesQM
+  name: quartermaster's panties
+  description: Standard station quartermaster underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/qm/panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesRD
+  name: research director's panties
+  description: Standard research director's underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Bottom/heads/rd/panties.rsi
+
+
+# ТРУСЫ БЛЯТЬ
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBeeShorts
+  name: Shorts
+  description: Bees.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/bee_shorts.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersHeart
+  name: Boxers
+  description: With hearts.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/boxers_heart.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBoxersStriped
+  name: Boxers
+  description: Striped.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/boxers_striped.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomBriefs
+  name: Panties
+  description: Briefs.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/briefs.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomFishnetLower
+  name: Panties
+  description: Fishnet.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/fishnet_lower.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomJockstrap
+  name: Jockstrap
+  description: Jockstrap.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/jockstrap.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomMankini
+  name: Mankini
+  description: Bikini but for man.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/mankini.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesBeeKini
+  name: Panties BeeKini
+  description: Bee.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/panties_bee_kini.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesKinky
+  name: Panties
+  description: Kinky.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/panties_kinky.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesNeko
+  name: Panties
+  description: Neko.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/panties_neko.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesSlim
+  name: Panties
+  description: Slim.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/panties_slim.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesSwimming
+  name: Panties
+  description: For swimming.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/panties_swimming.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesThin
+  name: Panties
+  description: Thin.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/panties_thin.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesStripped
+  name: Panties
+  description: Stripped.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/striped_panties.rsi
+
+- type: entity
+  parent: ClothingUnderwearBottomBase
+  id: ClothingUnderwearBottomPantiesThong
+  name: Panties
+  description: Thong.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Bottom/thong.rsi
+

Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml

@@ -0,0 +1,243 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: ClothingUnderwearSocksBase
+  name: based socks
+  description: "You should not see this."
+  components:
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: 5
+  - type: Clothing
+    slots: [socks]
+  - type: Tag
+    tags:
+      - socks
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksBeeKnee
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Dyed black-yellow.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/bee_knee.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksBeeNorm
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Dyed black-yellow.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/bee_norm.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksBeeThigh
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Dyed black-yellow.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/bee_thigh.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksFishnet
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Fishnet.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/fishnet.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksGarter
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Fishnet.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/garter.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksPantyhose
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Pantyhose.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/pantyhose.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksPantyhoseRipped
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Pantyhose ripped.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/pantyhose_ripped.rsi
+
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksRainbowKnee
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Dyed rainbow.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/rainbow_knee.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksRainbowThigh
+  name: Socks
+  description: Standard Nanotrasen stockings for station employees. Dyed rainbow.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Underwear/Socks/rainbow_thigh.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksHigh
+  name: high socks
+  description: Nanotrasen high socks for station employees. Painted white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/socks_knee.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksNormal
+  name: socks
+  description: Standard Nanotrasen socks for station employees. Dyed white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/socks_norm.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksShort
+  name: short socks
+  description: Nanotrasen short socks for station employees. Dyed white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/socks_short.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksThigh
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/socks_thigh.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsBlue
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed blue.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_blue.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsCyan
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed cyan.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_cyan.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsPink
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed pink.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_dpink.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsGreen
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed green.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_green.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsLightPink
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed light pink.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_lpink.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsLightOrange
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed orange.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_orange.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsLightPurple
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed purple.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_purple.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearStockingsLightYellow
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed yellow.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/stockings_yellow.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksStripedKnee
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed black-white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/striped_knee.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksStripedThigh
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Dyed black-white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/striped_thigh.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksThinKnee
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Transparent.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/thin_knee.rsi
+
+- type: entity
+  parent: ClothingUnderwearSocksBase
+  id: ClothingUnderwearSocksThinThigh
+  name: stockings
+  description: Standard Nanotrasen stockings for station employees. Transparent.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Socks/thin_thigh.rsi
+

Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml

@@ -0,0 +1,281 @@
+- type: entity
+  abstract: true
+  parent: Clothing
+  id: ClothingUnderwearTopBase
+  name: based underweart
+  description: "You should not see this."
+  components:
+  - type: Sprite
+    state: icon
+  - type: Item
+    size: 1
+  - type: Clothing
+    slots: [underweart]
+  - type: Tag
+    tags:
+      - underweart
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraWhite
+  name: bra
+  description: Standard Nanotrasen bra for station staff. Painted white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraSports
+  name: sports bra
+  description: Sports bra. Painted white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/sportsbra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraSportsAlternative
+  name: alternative sports bra
+  description: Sports bra. Alternate version. Painted white.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/sportsbraalt.rsi
+
+#Underwear-for-the-heads
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraCap
+  name: captain's bra
+  description: Standard station captain's underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/capitan/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraCE
+  name: chief engineer's bra
+  description: Standard station chief engineer's underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/ce/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraCMO
+  name: chief medical officer's bra
+  description: Standard underwear of the station chief medical officer. For some reason it smells like chloral hydrate...
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/cmo/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraHOP
+  name: head of personnel's bra
+  description: The standard underwear of the station's chief of staff.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/hop/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraHOS
+  name: head of security's bra
+  description: Standard underwear of the station's head of security.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/hos/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraQM
+  name: quartermaster's bra
+  description: Standard station quartermaster underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/qm/bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraRD
+  name: research director's bra
+  description: Standard research director's underwear.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/heads/rd/bra.rsi
+
+
+#SPLURT
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraBeeKini
+  name: Bee-Kini
+  description: Bee-Kini bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_bee_kini.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraBinder
+  name: Binder bra
+  description: Binder bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_binder.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraBinderStrapless
+  name: Binder bra strapless
+  description: Binder bra strapless.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_binder_strapless.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraKinky
+  name: Kinky bra
+  description: Kinky bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_kinky.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraNeko
+  name: Neko bra
+  description: Neko bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_neko.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraStrapless
+  name: Strapless Bra
+  description: Strapless bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_strapless.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraStraplessAlt
+  name: Strapless Bra
+  description: Strapless bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_strapless_alt.rsi
+
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraSwimming
+  name: Swimming Bra
+  description: Swimming bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_swimming.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraSwimmingAlt
+  name: Swimming Bra
+  description: Swimming bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_swimming_alt.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraThin
+  name: Thin Bra
+  description: Thin bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/bra_thin.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopFishnetBody
+  name: Fishnet Bra
+  description: Fishnet bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/fishnet_body.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopFishnetBodyGloves
+  name: Fishnet Bra with gloves
+  description: Fishnet bra with gloves.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/fishnet_gloves.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopFishnetBodySleeves
+  name: Fishnet Bra with sleeves
+  description: Fishnet bra with sleeves.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/fishnet_sleeves.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraHalterneck
+  name: Halterneck Bra
+  description: Halterneck bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/halterneck_bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraShibari
+  name: Shibari Bra
+  description: Shibari bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/shibari.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraShibariSleeves
+  name: Shibari Bra with sleeves
+  description: Shibari bra with sleeves.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/shibari_sleeves.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraStriped
+  name: Striped Bra
+  description: Striped bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/striped_bra.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopBraTubetop
+  name: Tubetop Bra
+  description: Tubetop bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/tubetop.rsi
+
+- type: entity
+  parent: ClothingUnderwearTopBase
+  id: ClothingUnderwearTopCow
+  name: Cow Bra
+  description: Cow bra.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Underwear/Top/cow.rsi

Resources/Prototypes/tags.yml

@@ -1182,3 +1182,18 @@
   id: WriteIgnoreStamps
 
 # PUT YOUR TAGS IN ALPHABETICAL ORDER
+
+# WHITE
+- type: Tag
+  id: socks
+
+- type: Tag
+  id: underwearb
+
+- type: Tag
+  id: underweart
+
+- type: Tag
+  id: Crystal
+
+# WHITE END

Resources/Textures/White/Clothing/Underwear/Bottom/bee_shorts.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/boxers.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/boxers_heart.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/boxers_striped.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/briefs.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/fishnet_lower.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/heads/capitan/boxers.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}

Resources/Textures/White/Clothing/Underwear/Bottom/heads/capitan/panties.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13",
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-UNDERWEARB",
+      "directions": 4
+    },
+    {
+      "name": "equipped-UNDERWEARB-body-slim",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}