Merge remote-tracking branch 'upstream/master' into ups

Resources/Prototypes/Loadouts/Jobs/Civilian/bomzh.yml

@@ -7,6 +7,31 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitWhiteBomzh
 
+# HEAD
+- type: itemLoadout # WD
+  id: BomzhHeadCap
+  equipment: BomzhHeadCap
+- type: startingGear
+  id: BomzhHeadCap
+  equipment:
+   head: ClothingHeadHatBomzhCap
+
+- type: itemLoadout # WD
+  id: BomzhHeadHat
+  equipment: BomzhHeadHat
+- type: startingGear
+  id: BomzhHeadHat
+  equipment:
+    head: ClothingHeadHatBomzhHat
+
+- type: itemLoadout # WD
+  id: BomzhHeadHatMelon
+  equipment: BomzhHeadHatMelon
+- type: startingGear
+  id: BomzhHeadHatMelon
+  equipment:
+    head: ClothingHeadHatWatermelon
+
 # PDA
 - type: itemLoadout # WD
   id: BomzhPDA

Resources/Prototypes/Loadouts/Jobs/Command/maid.yml

@@ -15,6 +15,24 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtMaidMini
 
+# Head
+- type: itemLoadout # WD
+  id: MaidHeadMobCap
+  equipment: MaidHeadMobCap
+- type: startingGear
+  id: MaidHeadMobCap
+  equipment:
+    head: ClothingHeadHatMobCap
+
+# Eyes
+- type: itemLoadout # WD
+  id: MaidGlasses
+  equipment: MaidGlasses
+- type: startingGear
+  id: MaidGlasses
+  equipment:
+    eyes: ClothingEyesGlassesMaid
+
 # Back
 - type: itemLoadout # WD
   id: MaidSatchel
@@ -60,15 +78,6 @@
   equipment:
     shoes: ClothingShoesMaid
 
-# Glasses
-- type: itemLoadout # WD
-  id: MaidGlasses
-  equipment: MaidGlasses
-- type: startingGear
-  id: MaidGlasses
-  equipment:
-    eyes: ClothingEyesGlassesSecurity
-
 # Job Trinkets
 - type: itemLoadout # WD
   id: MaidSpray

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

@@ -0,0 +1,110 @@
+# Head
+- type: itemLoadout # WD
+  id: BrigmedicWhiteBeret
+  equipment: BrigmedicWhiteBeret
+- type: startingGear
+  id: BrigmedicWhiteBeret
+  equipment:
+    head: ClothingHeadHatBeretBrigmedic
+
+- type: itemLoadout # WD
+  id: BrigmedicSurgcapBlue
+  equipment: BrigmedicSurgcapBlue
+- type: startingGear
+  id: BrigmedicSurgcapBlue
+  equipment:
+    head: ClothingHeadHatSurgcapBlue
+
+# Ears
+- type: itemLoadout # WD
+  id: HeadsetBrigmedic
+  equipment: HeadsetBrigmedic
+- type: startingGear
+  id: HeadsetBrigmedic
+  equipment:
+    ears: ClothingHeadsetBrigmedic
+
+# Uniform
+- type: itemLoadout # WD
+  id: BrigmedicWhiteJumpsuit
+  equipment: BrigmedicWhiteJumpsuit
+- type: startingGear
+  id: BrigmedicWhiteJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBrigmedic
+
+- type: itemLoadout # WD
+  id: BrigmedicWhiteJumpskirt
+  equipment: BrigmedicWhiteJumpskirt
+- type: startingGear
+  id: BrigmedicWhiteJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtBrigmedic
+
+# Back
+- type: itemLoadout # WD
+  id: BackpackBrigmedic
+  equipment: BackpackBrigmedic
+- type: startingGear
+  id: BackpackBrigmedic
+  equipment:
+    back: ClothingBackpackBrigmedicFilled
+
+- type: itemLoadout # WD
+  id: SatchelBrigmedic
+  equipment: SatchelBrigmedic
+- type: startingGear
+  id: SatchelBrigmedic
+  equipment:
+    back: ClothingBackpackSatchelBrigmedicFilled
+
+- type: itemLoadout # WD
+  id: DuffelBrigmedic
+  equipment: DuffelBrigmedic
+- type: startingGear
+  id: DuffelBrigmedic
+  equipment:
+    back: ClothingBackpackDuffelBrigmedicFilled
+
+# Outerclothing
+- type: itemLoadout # WD
+  id: ArmorCoatBrigmedic
+  equipment: ArmorCoatBrigmedic
+- type: startingGear
+  id: ArmorCoatBrigmedic
+  equipment:
+    outerClothing: ClothingOuterCoatAMG
+
+- type: itemLoadout # WD
+  id: LabcoatBasic
+  equipment: LabcoatBasic
+- type: startingGear
+  id: LabcoatBasic
+  equipment:
+    outerClothing: ClothingOuterCoatLab
+
+# Shoes
+- type: itemLoadout # WD
+  id: JackBootsBrigmedic
+  equipment: JackBootsBrigmedic
+- type: startingGear
+  id: JackBootsBrigmedic
+  equipment:
+    shoes: ClothingShoesBootsJack
+
+- type: itemLoadout # WD
+  id: RedShoesBrigmedic
+  equipment: RedShoesBrigmedic
+- type: startingGear
+  id: RedShoesBrigmedic
+  equipment:
+    shoes: ClothingShoesColorRed
+
+# PDA
+- type: itemLoadout
+  id: BrigmedicPDA
+  equipment: BrigmedicPDA
+- type: startingGear
+  id: BrigmedicPDA
+  equipment:
+    id: BrigmedicPDA

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -1,28 +1,4 @@
-#Bottom
-- type: loadoutGroup # WD!?
-  id: CommonBottom
-  name: loadout-group-bottom
-  loadouts:
-  - BottomPantiesWhite
-  - BottomBoxersWhite
-  - BottomBeeShorts
-  - BottomBoxersHeart
-  - BottomBoxersStriped
-  - BottomBriefs
-  - BottomFishnetLower
-  - BottomJockstrap
-  - BottomMankini
-  - BottomPantiesBeeKini
-  - BottomPantiesKinky
-  - BottomPantiesNeko
-  - BottomPantiesSlim
-  - BottomPantiesSwimming
-  - BottomPantiesThin
-  - BottomPantiesStripped
-  - BottomPantiesThong
-  - BottomWebLower
 
-# Miscellaneous
 - type: loadoutGroup
   id: Trinkets
   name: loadout-group-trinkets
@@ -1509,6 +1485,57 @@
   loadouts:
   - SecurityPDA
 
+- type: loadoutGroup # WD
+  id: BrigmedicHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - BrigmedicWhiteBeret
+  - BrigmedicSurgcapBlue
+
+- type: loadoutGroup # WD
+  id: BrigmedicHeadset
+  name: loadout-group-ears
+  loadouts:
+  - HeadsetBrigmedic
+
+- type: loadoutGroup # WD
+  id: BrigmedicUniform
+  name: loadout-group-jumpsuit
+  loadouts:
+  - BrigmedicWhiteJumpsuit
+  - BrigmedicWhiteJumpskirt
+
+- type: loadoutGroup # WD
+  id: BrigmedicBackpack
+  name: loadout-group-backpack
+  loadouts:
+  - BackpackBrigmedic
+  - SatchelBrigmedic
+  - DuffelBrigmedic
+  - CommonSatchelLeatherSecurity
+
+- type: loadoutGroup # WD
+  id: BrigmedicOuterClothing
+  name: loadout-group-outerclothing
+  minLimit: 0
+  loadouts:
+  - ArmorCoatBrigmedic
+  - LabcoatBasic
+
+- type: loadoutGroup # WD
+  id: BrigmedicShoes
+  name: loadout-group-shoes
+  loadouts:
+  - JackBootsBrigmedic
+  - RedShoesBrigmedic
+
+- type: loadoutGroup # WD
+  id: BrigmedicPDA
+  name: loadout-group-pda
+  loadouts:
+  - BrigmedicPDA
+
 - type: loadoutGroup
   id: DetectiveHead
   name: loadout-group-head
@@ -2174,6 +2201,13 @@
   - InspectorBriefcaseInhand
 
 # Maid
+- type: loadoutGroup # WD
+  id: MaidSelfDefenceDevices
+  name: loadout-group-self-defence-devices
+  minLimit: 0
+  loadouts:
+  - Flash
+
 - type: loadoutGroup # WD
   id: MaidGlasses
   name: loadout-group-eyes
@@ -2181,6 +2215,13 @@
   loadouts:
   - MaidGlasses
 
+- type: loadoutGroup # WD
+  id: MaidHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - MaidHeadMobCap
+
 - type: loadoutGroup # WD
   id: MaidJumpsuit
   name: loadout-group-jumpsuit
@@ -2230,6 +2271,15 @@
   loadouts:
   - BomzhJumpsuit
 
+- type: loadoutGroup # WD
+  id: BomzhHead
+  name: loadout-group-head
+  minLimit: 0
+  loadouts:
+  - BomzhHeadHat
+  - BomzhHeadCap
+  - BomzhHeadHatMelon
+
 - type: loadoutGroup # WD
   id: BomzhPDA
   name: loadout-group-pda

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -45,12 +45,13 @@
   groups:
   - MaidGlasses # WD
   - CommonCommandHeadset # WD
+  - MaidHead
   - MaidJumpsuit
   - MaidGloves # WD
   - MaidBackpack
   - MaidShoes
   - MaidPDA # WD
-  - SelfDefenceDevices # WD
+  - MaidSelfDefenceDevices # WD
   - MaidJobTrinkets
   - CommonUnderwearBottom
   - CommonUnderwearBra
@@ -266,6 +267,7 @@
   groups:
   - BomzhJumpsuit
   - BomzhPDA
+  - BomzhHead
   - BomzhOuterclothing
   - BomzhJobTrinkets
   - CommonUnderwearBottom
@@ -557,6 +559,23 @@
   - CommonUnderwearBra
   - CommonUnderwearSocks
 
+- type: roleLoadout
+  id: JobBrigmedic
+  groups:
+  - BrigmedicHead
+  - BrigmedicHeadset
+  - BrigmedicUniform
+  - BrigmedicBackpack
+  - BrigmedicOuterClothing
+  - CommonMedicalGloves
+  - BrigmedicShoes
+  - CommonMedicalMask
+  - BrigmedicPDA
+  - Trinkets
+  - CommonUnderwearBottom
+  - CommonUnderwearBra
+  - CommonUnderwearSocks
+
 - type: roleLoadout
   id: JobSecurityOfficer
   groups: