Adjust security loadouts

DeltaV-Station · Sep 18, 2024 · 8819c0e · 8819c0e
1 parent 75b8bc1
commit 8819c0e
Show file tree

Hide file tree

Showing 13 changed files with 219 additions and 104 deletions.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -70,11 +70,11 @@
       - id: ClothingHeadHatBeretHoS
       - id: ClothingHeadHatHoshat
       - id: ClothingNeckCloakHos
-      - id: ClothingUniformJumpskirtHoSAlt
-      - id: ClothingUniformJumpsuitHoSAlt
+#      - id: ClothingUniformJumpskirtHoSAlt # DeltaV - removed for incongruence
+#      - id: ClothingUniformJumpsuitHoSAlt # DeltaV - removed for incongruence
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
-      - id: ClothingOuterWinterHoS
+#      - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence
 
 - type: entity
   id: DresserQuarterMasterFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -325,15 +325,15 @@
       tableId: LockerFillHeadOfSecurityDeltaV
     - id: BookSecretDocuments
     #- id: WeaponEnergyShotgun # DeltaV - replaced by X-01
-    - id: BookSpaceLaw
+#    - id: BookSpaceLaw # DeltaV - will uncomment when book is fixed
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase
       prob: 0.50
     - id: ClothingBeltSecurityFilled
     - id: ClothingEyesGlassesSecurity
     - id: ClothingHeadsetAltSecurity
     - id: ClothingMaskNeckGaiter
-    - id: ClothingOuterCoatHoSTrench
+#    - id: ClothingOuterCoatHoSTrench # DeltaV - removed for incongruence
     - id: ClothingShoesBootsJack
     - id: DoorRemoteSecurity
     - id: HoloprojectorSecurity

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -7,26 +7,26 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
+#        prob: 0.3 # DeltaV - just give them the damn disabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
+#      - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence
+#      - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
       - id: HoloprojectorSecurity
-      - id: BookSpaceLaw
+#      - id: BookSpaceLaw # DeltaV - will uncomment when book is fixed
       # Begin DeltaV additions
       - id: BoxPDAPrisoner
-      - id: ClothingShoesBootsWinterWarden
       - id: BoxEncryptionKeyPrisoner
       - id: LunchboxSecurityFilledRandom
         prob: 0.3
+      - id: ClothingOuterVestPlateCarrierAdv
       # End DeltaV additions
       - id: ClothingNeckShockCollar
         amount: 2
@@ -42,25 +42,25 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
+#        prob: 0.3 # DeltaV - just give them the damn disabler
       - id: ClothingBeltSecurityFilled
       - id: Flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
+#      - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence
+#      - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
-      - id: BookSpaceLaw
+#      - id: BookSpaceLaw # DeltaV - will uncomment when book is fixed
       # Begin DeltaV additions
       - id: BoxPDAPrisoner
-      - id: ClothingShoesBootsWinterWarden
       - id: BoxEncryptionKeyPrisoner
       - id: LunchboxSecurityFilledRandom
         prob: 0.3
+      - id: ClothingOuterVestPlateCarrierAdv
       # End DeltaV additions
       - id: ClothingNeckShockCollar
         amount: 2
@@ -76,30 +76,16 @@
     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: ClothingUniformJumpsuitSecGrey # DeltaV - remove uniforms from sec lockers
+#        prob: 0.3
       - 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: ClothingBeltSecurityFilled
       - id: Flash
-        prob: 0.5
+#        prob: 0.5 # DeltaV - standardise spare flash
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
@@ -108,8 +94,8 @@
         prob: 0.1
       - id: HoloprojectorSecurity
         prob: 0.6
-      - id: BookSpaceLaw
-        prob: 0.5
+#      - id: BookSpaceLaw # DeltaV - will uncomment when book is fixed
+#        prob: 0.5
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 
@@ -120,18 +106,20 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses
+#      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked.
       - id: WeaponDisabler
       - id: TrackingImplanter
         amount: 2
-##      - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker.
-      - id: BoxSterileMask
+#      - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker.
+#      - id: BoxSterileMask # DeltaV - removed until virology becomes a thing again.
       - id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret.
-##      - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it.
+      - id: ClothingHeadsetBrigmedic # DeltaV - add spare headset.
+#      - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it.
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
-##      - id: ClothingUniformJumpskirtOfLife # DeltaV - nah
-##        prob: 0.1
+#      - id: ClothingUniformJumpskirtOfLife # DeltaV - removed for incongruence
+#        prob: 0.1
+      - id: ClothingBeltCorpsmanWebbing # DeltaV - added spare webbing
       - id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up.
       - id: MedkitFilled
       - id: MedkitCombatFilled
@@ -146,8 +134,8 @@
         prob: 0.3
       - id: MedkitBurnFilled
         prob: 0.7
-##      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why
-##        prob: 0.15
+#      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - removed for incongruence
+#        prob: 0.15
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
 
@@ -160,13 +148,16 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses
+#      - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked.
       - id: WeaponDisabler
       - id: TrackingImplanter
         amount: 2
       - id: ClothingOuterHardsuitCombatCorpsman
+      - id: ClothingHeadHatBeretCorpsman # Add corpsman beret.
+      - id: ClothingHeadsetBrigmedic # Add spare headset.
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
+      - id: ClothingBeltCorpsmanWebbing # Added spare webbing
       - id: HandheldGPSBasic # Added GPS because I just think it should be there tbh.
       - id: MedkitFilled
       - id: MedkitCombatFilled
@@ -194,11 +185,12 @@
   - type: StorageFill
     contents:
       - id: ClothingEyesGlassesSecurity
-        prob: 0.3
-      - id: ClothingHeadHatFedoraBrown
-      - id: ClothingNeckTieDet
-      - id: ClothingOuterVestDetective
-      - id: ClothingOuterCoatDetective
+#        prob: 0.3 # DeltaV - standardise until HUD balance worked out
+#      - id: ClothingHeadHatFedoraBrown # DeltaV - removed for incongruence
+#      - id: ClothingNeckTieDet # DeltaV - removed for incongruence
+#      - id: ClothingOuterVestDetective # DeltaV - removed for incongruence
+#      - id: ClothingOuterCoatDetective # DeltaV - removed for incongruence
+      - id: ClothingHeadsetSecurity # DeltaV - add spare headset.
       - id: FlashlightSeclite
       - id: ForensicScanner
       - id: LogProbeCartridge

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -1,16 +1,22 @@
 - type: vendingMachineInventory
   id: DetDrobeInventory
   startingInventory:
-    ClothingUniformJumpsuitDetective: 2
-    ClothingUniformJumpskirtDetective: 2
-    ClothingShoesColorBrown: 2
-    ClothingOuterCoatDetectiveLoadout: 2
-    ClothingHeadHatFedoraBrown: 2
-    ClothingUniformJumpsuitDetectiveGrey: 2
-    ClothingUniformJumpskirtDetectiveGrey: 2
-    ClothingOuterVestDetective: 2
-    ClothingNeckTieDet: 2
-    ClothingHeadHatFedoraGrey: 2
+#    ClothingUniformJumpsuitDetective: 2 # DeltaV - removed for incongruence
+#    ClothingUniformJumpskirtDetective: 2 # DeltaV - removed for incongruence
+#    ClothingShoesColorBrown: 2 # DeltaV - removed for incongruence
+#    ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - removed for incongruence
+#    ClothingHeadHatFedoraBrown: 2 # DeltaV - removed for incongruence
+#    ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - removed for incongruence
+#    ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - removed for incongruence
+#    ClothingOuterVestDetective: 2 # DeltaV - removed for incongruence
+#    ClothingNeckTieDet: 2 # DeltaV - removed for incongruence
+#    ClothingHeadHatFedoraGrey: 2 # DeltaV - removed for incongruence
+    ClothingUniformJumpsuitForensicSpec: 2 # DeltaV
+    ClothingUniformJumpskirtForensicSpec: 2 # DeltaV
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetSecurity: 2
+    ForensicPad: 10 # DeltaV
+    BoxFolderBlack: 2 # DeltaV
+    BoxEvidenceMarkers: 1 # DeltaV
+    HandLabeler: 1 # DeltaV
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -4,33 +4,35 @@
     ClothingBackpackSecurity: 3
     ClothingBackpackSatchelSecurity: 3
     ClothingBackpackDuffelSecurity: 3
-    ClothingUniformJumpsuitSec: 3
+#    ClothingUniformJumpsuitSec: 3 # DeltaV - moved*
     ClothingShoesBootsJack: 3
     ClothingHeadHatBeretSecurity: 3
-##    ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
-    ClothingHeadBandRed: 3
+    ClothingMaskNeckGaiter: 3 # DeltaV - add neck gaiters to secdrobe
+    ClothingMaskGasSecurity: 3 # DeltaV - add security gas masks to secdrobe
+#    ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
+#    ClothingHeadBandRed: 3 # DeltaV - removed for incongruency
 #   ClothingMaskNeckGaiterRed: 3 # DeltaV - removed
     ClothingHandsGlovesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
+    ClothingUniformJumpsuitSec: 3 # DeltaV - *moved
     ClothingUniformJumpskirtSec: 3
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
     ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe
+    ClothingUniformJumpsuitSecFormal: 1 # DeltaV - add formal uniform to secdrobe
+    ClothingUniformJumpskirtSecFormal: 1 # DeltaV - add formal uniform to secdrobe
     ClothingHeadsetSecurity: 3
     ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe
+    ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe
     ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec
     ClothingOuterGreatcoatStasec: 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
+#    ClothingShoesBootsWinterSec: 2 # DeltaV - removed for incongruency
 #   ClothingHeadHelmetJustice: 1 # DeltaV - lrp
-    # Begin DeltaV additions
-    ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1
-    # End DeltaV additions
   contrabandInventory:
-    ClothingMaskClownSecurity: 1
+#    ClothingMaskClownSecurity: 1 # DeltaV - removed for incongruency
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml
@@ -82,6 +82,6 @@
     - id: BoxPDASecurity
     - id: WeaponEnergyGunMultiphase
     - id: HoSIDCard
-    - id: ClothingShoesBootsWinterHeadOfSecurity
+    - id: ClothingOuterVestPlateCarrierAdv
     - id: LunchboxCommandFilledRandom
       prob: 0.3
diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
@@ -25,7 +25,7 @@
   - SecurityShoes
   - SecurityOuterClothing
   - MedicalGloves
-  - SurvivalCorpsman
+  - SurvivalSecurity # DeltaV - replace SurvivalCorpsman for incongruence
   - Trinkets
   - GroupSpeciesBreathToolCorpsman
 

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
@@ -36,6 +36,16 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtDetectiveGrey
 
+- type: loadout # DeltaV
+  id: ForensicSpecJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitForensicSpec
+
+- type: loadout # DeltaV
+  id: ForensicSpecJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtForensicSpec
+
 # OuterClothing
 - type: loadout
   id: DetectiveArmorVest

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -9,6 +9,26 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtHoS
 
+- type: loadout # DeltaV
+  id: HeadofSecurityJumpsuitGrey
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitHoSGrey
+
+- type: loadout # DeltaV
+  id: HeadofSecurityJumpskirtGrey
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtHoSGrey
+
+- type: loadout # DeltaV
+  id: HeadofSecurityJumpsuitBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitHoSBlue
+
+- type: loadout # DeltaV
+  id: HeadofSecurityJumpskirtBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtHoSBlue
+
 - type: loadout
   id: HeadofSecurityTurtleneck
   equipment:
@@ -72,6 +92,16 @@
   equipment:
     outerClothing: ClothingOuterWinterHoS
 
+- type: loadout # DeltaV - security winter coat
+  id: StasecWinterCoatHoS
+  equipment:
+    outerClothing: ClothingOuterCoatStasecHoS
+
+- type: loadout # DeltaV - security greatcoat
+  id: StasecGreatcoatHoS
+  equipment:
+    outerClothing: ClothingOuterGreatcoatStasecHoS
+
 # Shoes - DeltaV
 - type: loadout # DeltaV
   id: HeadOfSecurityWinterBoots