[Tweak] Security Lockers Reshuffle

Resources/Prototypes/Catalog/Fills/Boxes/security.yml

@@ -40,7 +40,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesHudSecurity
+      - id: ClothingEyesGlassesSecurity
         amount: 4
   - type: Sprite
     layers:

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -65,40 +65,18 @@
   - type: StorageFill
     contents:
       - id: FlashlightSeclite
-        prob: 0.8
-      - id: ClothingUniformJumpsuitSecGrey
-        prob: 0.3
-      - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms
-        prob: 0.3
-      - id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms
-        prob: 0.3
-      - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms
-        prob: 0.3
-      - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms
-        prob: 0.3
-      - id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms
-        prob: 0.3
+      - id: ClothingUniformJumpsuitSec
       - id: ClothingHeadHelmetBasic
       - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
-        prob: 0.4
-      - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest
-      - id: ClothingOuterArmorDuraVest
-      - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3
-        prob: 0.75
-      - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit
-        prob: 0.25
+      - id: ClothingOuterArmorBasic # WWDP - plate carrier and stabproof vest replaced back to regular bodyarmor
       - id: ClothingBeltSecurityFilled
-      - id: Flash
-        prob: 0.5
-      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
+      - id: WeaponDisabler
       - id: WeaponMeleeNeedle
         prob: 0.1
-      - id: ClothingEyesHudSecurity
-      - id: HoloprojectorSecurity
-        prob: 0.6
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 

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

@@ -11,7 +11,9 @@
     Flash: 5
     Tourniquet: 5
     FlashlightSeclite: 5
+    HoloprojectorSecurity: 5
     ClothingEyesGlassesSunglasses: 2
+    ClothingEyesGlassesSecurity: 2
     ClothingEyesHudSecurity: 2
     ClothingEyesEyepatchHudSecurity: 2
     ClothingBeltSecurityWebbing: 5
@@ -22,11 +24,6 @@
     RiotLaserShield: 2
     RiotBulletShield: 2
     RadioHandheldSecurity: 5
-    ClothingHeadHelmetInsulated: 2
-    ClothingHeadCage: 2
-    ClothingOuterArmorPlateCarrier: 2
-    ClothingOuterArmorDuraVest: 2
-    ClothingHeadHelmetBasic: 2
     BreachingCharge: 8
   # security officers need to follow a diet regimen!
   contrabandInventory:

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

@@ -4,26 +4,32 @@
     ClothingBackpackSecurity: 3
     ClothingBackpackSatchelSecurity: 3
     ClothingBackpackDuffelSecurity: 3
-    ClothingUniformJumpsuitSec: 3
-    ClothingShoesBootsJack: 3
-    ClothingHeadHatBeretSecurity: 3
 ##    ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
+    ClothingHeadsetSecurity: 3
+    ClothingHeadHelmetBasic: 2
+    ClothingHeadHelmetInsulated: 2
+    ClothingHeadCage: 2
+    ClothingHeadHatBeretSecurity: 3
     ClothingHeadBandRed: 3
+    ClothingHeadHatCowboyBlack: 1
+    ClothingNeckScarfStripedRed: 3
+    ClothingEyesBlindfold: 1
+    ClothingOuterWinterSec: 2
+    ClothingOuterStasecSweater: 2 # WWDP - moved sweaters from security lockers to SecDrobe
+    ClothingOuterCoatGreatcoat: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times.
+    ClothingOuterArmorBasic: 2 # WWDP - moved body armour back to SecDrobe from SecTech
+    ClothingOuterArmorBasicSlim: 2
+    ClothingOuterArmorPlateCarrier: 2
+    ClothingOuterArmorDuraVest: 2
+    ClothingShoesBootsJack: 3
+    ClothingShoesBootsCombat: 1
+    ClothingShoesBootsWinterSec: 2
+    ClothingShoesBootsCowboyBlack: 1
     ClothingHandsGlovesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
+    ClothingUniformJumpsuitSec: 3
     ClothingUniformJumpskirtSec: 3
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
     ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe
-    ClothingHeadsetSecurity: 3
-    ClothingOuterWinterSec: 2
-    ClothingOuterCoatGreatcoat: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times.
-##    ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech
-##    ClothingOuterArmorBasicSlim: 2
-    ClothingNeckScarfStripedRed: 3
-    ClothingEyesBlindfold: 1
-    ClothingShoesBootsCombat: 1
-    ClothingShoesBootsWinterSec: 2
-    ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1