Merge remote-tracking branch 'WD-core/master' into upstream-core

Resources/Prototypes/Loadouts/Jobs/common.yml

@@ -319,6 +319,16 @@
   equipment:
     gloves: ClothingHandsGlovesColorBlack
 
+
+- type: itemLoadout # WD
+  id: GlovesColorBlackSecurity
+  equipment: GlovesColorBlackSecurity
+- type: startingGear
+  id: GlovesColorBlackSecurity
+  equipment:
+    gloves: ClothingHandsGlovesColorBlackSecurity
+
+
 - type: itemLoadout
   id: GlovesColorWhite
   equipment: GlovesColorWhite

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -745,6 +745,7 @@
   - GlovesColorBlack
   - GlovesFingerless
 
+
 - type: loadoutGroup # Amour
   id: AssistentGloves
   name: loadout-group-gloves
@@ -754,6 +755,15 @@
   - GlovesColorBlack
   - GlovesFingerless
 
+
+- type: loadoutGroup # WD
+  id: CommonGlovesSecurity
+  name: loadout-group-gloves
+  minLimit: 0
+  loadouts:
+  - GlovesColorBlackSecurity
+  - GlovesFingerless
+
 - type: loadoutGroup
   id: CommonShoes
   name: loadout-group-shoes
@@ -1593,7 +1603,7 @@
   minLimit: 0
   loadouts:
   - GlovesLatex
-  - GlovesColorBlack
+  - GlovesColorBlackSecurity # WD
   - GlovesForensic
 
 - type: loadoutGroup

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -506,7 +506,7 @@
   - HeadofSecurityNeck
   - HeadofSecurityJumpsuit
   - CommonBottom # WD
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
   - CommonSecurityBelt # WD
   - CommonSecurityBackpack
   - CommonSecurityShoes
@@ -528,7 +528,7 @@
   - WardenJumpsuit
   - CommonBottom # WD
   - CommonSecurityBackpack
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
   - CommonSecurityBelt # WD
   - CommonSecurityShoes
   - WardenPDA
@@ -550,7 +550,7 @@
   - CommonSecurityBackpack
   - SecurityOuterClothing
   - CommonSecurityBelt # WD
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
   - CommonSecurityShoes
   - SeniorOfficerPDA
   - CommonSecurityJobTrinkets # WD
@@ -588,7 +588,7 @@
   - CommonSecurityBackpack
   - SecurityOuterClothing
   - CommonSecurityBelt # WD
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
   - CommonSecurityShoes
   - SecurityPDA
   - CommonSecurityJobTrinkets # WD
@@ -628,7 +628,7 @@
   - SecurityCadetJumpsuit
   - CommonBottom # WD
   - CommonSecurityBackpack
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
   - CommonSecurityShoes
   - SecurityCadetPDA
   - CommonSecurityJobTrinkets # WD