Revert "Security resprite and loadout revision"

DeltaV-Station · Jul 21, 2024 · 4157495 · 4157495
1 parent 85dc96d
commit 4157495
Show file tree

Hide file tree

Showing 107 changed files with 251 additions and 1,015 deletions.
diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
@@ -62,15 +62,15 @@ loadout-group-station-engineer-neck = Station Engineer neck
 loadout-group-atmospheric-technician-neck = Atmospheric Technician neck
 
 # Security
-loadout-group-security-eyes = Security eyes
+loadout-group-head-of-security-shoes = Head of Security shoes
+
+loadout-group-security-cadet-head = Security Cadet head
 loadout-group-security-neck = Security neck
 
-loadout-group-brig-medic-head = Corpsman head
-loadout-group-brig-medic-eyes = Corpsman eyes
+loadout-group-brig-medic-head = Brigmedic head
+loadout-group-brig-medic-jumpsuit = Brigmedic jumpsuit
+loadout-group-brig-medic-back = Brigmedic backpack
 loadout-group-brig-medic-neck = Corpsman neck
-loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit
-loadout-group-brig-medic-back = Corpsman backpack
-loadout-group-brig-medic-outerclothing = Corpsman outer clothing
 
 loadout-group-prison-guard-head = Prison Guard head
 loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -332,7 +332,7 @@
   - type: StorageFill
     contents:
       - id: WeaponDisabler
-      - id: ClothingOuterStasecCoatHoS # DeltaV - ClothingOuterCoatHoSTrench replaced in favour of uniform equipment
+      - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
       - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
       - id: ClothingMaskGasSwat
@@ -352,6 +352,7 @@
       - id: BoxPDASecurity # Delta-V
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
       - id: HoSIDCard # Delta-V
+      - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 
@@ -363,7 +364,7 @@
   - type: StorageFill
     contents:
       - id: WeaponDisabler
-      - id: ClothingOuterStasecCoatHoS # DeltaV - ClothingOuterCoatHoSTrench replaced in favour of uniform equipment
+      - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
@@ -380,6 +381,7 @@
       - id: BoxPDASecurity # Delta-V
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
       - id: HoSIDCard # Delta-V
+      - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
       - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
         prob: 0.3
 

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -14,14 +14,14 @@
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
-##      - id: ClothingOuterCoatWarden # DeltaV - remove this coat from standard gameplay.
-##      - id: ClothingOuterWinterCoatWarden # DeltaV - remove this coat from standard gameplay.
-      - id: ClothingOuterStasecCoatWarden # DeltaV - replace erroneous coats with appropriate uniform.
+      - id: ClothingOuterCoatWarden
+      - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
       - id: HoloprojectorSecurity
       - id: BoxPDAPrisoner # Delta-V
+      - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
@@ -42,13 +42,13 @@
       - id: ClothingHeadsetAltSecurity
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
-##      - id: ClothingOuterCoatWarden # DeltaV - remove this coat from standard gameplay.
-##      - id: ClothingOuterWinterCoatWarden # DeltaV - remove this coat from standard gameplay.
-      - id: ClothingOuterStasecCoatWarden # DeltaV - replace erroneous coats with appropriate uniform.
+      - id: ClothingOuterCoatWarden
+      - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
       - id: BoxPDAPrisoner # Delta-V
+      - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
       - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
         prob: 0.3
@@ -78,13 +78,11 @@
       - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear
         prob: 0.4
       - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest
-      - id: ClothingOuterArmorDuraVest # 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.15
-      - id: ClothingUniformJumpskirtSecFormal # DeltaV - emergency parade time, Central's coming to visit
-        prob: 0.15
+        prob: 0.25
       - id: ClothingBeltSecurityFilled
       - id: Flash
         prob: 0.5
@@ -111,10 +109,9 @@
       - 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 # DeltaV - Sterile masks have next to no use and bloat this locker.
+      - id: BoxSterileMask
       - id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret.
-##      - id: ClothingOuterCoatAMG # DeltaV - Remove from standard gameplay.
-      - id: ClothingOuterCoatLabCorpsman # DeltaV - replace AMG coat with more uniform option.
+##      - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it.
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
 ##      - id: ClothingUniformJumpskirtOfLife # DeltaV - nah
@@ -147,12 +144,10 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesSecurity
+      - id: ClothingEyesHudSecurity
       - id: WeaponDisabler
       - id: TrackingImplanter
         amount: 2
-      - id: ClothingHeadHatBeretCorpsman
-      - id: ClothingOuterCoatLabCorpsman
       - id: ClothingOuterHardsuitCombatCorpsman
       - id: ClothingUniformJumpsuitBrigmedic
       - id: ClothingUniformJumpskirtBrigmedic
@@ -184,12 +179,10 @@
     contents:
       - id: ClothingEyesGlassesSecurity
         prob: 0.3
-##      - id: ClothingHeadHatFedoraBrown # DeltaV - Replace in favour of proper uniform.
-      - id: ClothingHeadHatBeretForensicSpecialist # DeltaV - Add forensic beret.
-##      - id: ClothingNeckTieDet # DeltaV - remove the outdated look. stop breaking uniform.
-##      - id: ClothingOuterVestDetective # DeltaV - see above
-##      - id: ClothingOuterCoatDetective # DeltaV - Replace in favour of proper uniform.
-      - id: ClothingOuterStasecCoatDet # DeltaV - Add forensic coat.
+      - id: ClothingHeadHatFedoraBrown
+      - id: ClothingNeckTieDet
+      - id: ClothingOuterVestDetective
+      - id: ClothingOuterCoatDetective
       - id: FlashlightSeclite
       - id: ForensicScanner
       - id: LogProbeCartridge

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -139,7 +139,6 @@
   - type: StorageFill
     contents:
         - id: OxygenTankFilled
-        - id: JetpackSecurityFilled # DeltaV - add jetpacks to security suit storage
         - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit.
         - id: ClothingMaskBreath
   - type: AccessReader
@@ -213,7 +212,6 @@
   - type: StorageFill
     contents:
         - id: OxygenTankFilled
-        - id: JetpackSecurityFilled # DeltaV - add jetpacks to security suit storage
         - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
         - id: ClothingMaskBreath
   - type: AccessReader
@@ -273,9 +271,8 @@
   components:
   - type: StorageFill
     contents:
-#      - id: NitrogenTankFilled # removed for consistency.
+      - id: NitrogenTankFilled
       - id: OxygenTankFilled
-      - id: JetpackSecurityFilled
       - id: ClothingOuterHardsuitCombatCorpsman
       - id: ClothingMaskBreath
   - type: AccessReader

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -1,22 +1,16 @@
 - type: vendingMachineInventory
   id: DetDrobeInventory
   startingInventory:
-##    ClothingUniformJumpsuitDetective: 2 # DeltaV - set detective uniform
-##    ClothingUniformJumpskirtDetective: 2 # DeltaV - set detective uniform
-    ClothingUniformJumpsuitForensicSpecialist: 2
-    ClothingUniformJumpskirtForensicSpecialist: 2
-##    ClothingShoesColorBrown: 2 # DeltaV -set detective uniform
-##    ClothingOuterCoatDetective: 2 # DeltaV - set detective uniform
-    ClothingOuterStasecCoatDet: 2
-##    ClothingHeadHatFedoraBrown: 2 # DeltaV - set detective uniform
-##    ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - set detective uniform
-##    ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - set detective uniform
-##    ClothingOuterVestDetective: 2 # DeltaV - set detective uniform
-    ClothingNeckTieDet: 2 # DeltaV - Fuck it, they can keep the tie if they want.
-##    ClothingHeadHatFedoraGrey: 2  # DeltaV - set detective uniform
+    ClothingUniformJumpsuitDetective: 2
+    ClothingUniformJumpskirtDetective: 2
+    ClothingShoesColorBrown: 2
+    ClothingOuterCoatDetective: 2
+    ClothingHeadHatFedoraBrown: 2
+    ClothingUniformJumpsuitDetectiveGrey: 2
+    ClothingUniformJumpskirtDetectiveGrey: 2
+    ClothingOuterVestDetective: 2
+    ClothingNeckTieDet: 2
+    ClothingHeadHatFedoraGrey: 2
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetSecurity: 2
-    BoxForensicPad: 1 # DeltaV - add some forensic equipment to the DetDrobe.
-    ForensicScanner: 1 # DeltaV - add some forensic equipment to the DetDrobe.
-    BoxEvidenceMarkers: 1 # DeltaV - add some forensic equipment to the DetDrobe.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -10,7 +10,7 @@
     Flash: 5
     Tourniquet: 5
     FlashlightSeclite: 5
-    ClothingEyesGlassesSunglasses: 5 # DeltaV - give em a few extra. They're not as good as sec glasses anyways.
+    ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
     ClothingEyesEyepatchHudSecurity: 2
     ClothingBeltSecurityWebbing: 5

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -4,28 +4,27 @@
     ClothingBackpackSecurity: 3
     ClothingBackpackSatchelSecurity: 3
     ClothingBackpackDuffelSecurity: 3
-    ClothingHeadHatBeretSecurity: 6 # DeltaV - they always run out... :(
+    ClothingUniformJumpsuitSec: 3
+    ClothingShoesBootsJack: 3
+    ClothingHeadHatBeretSecurity: 3
 ##    ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
     ClothingHeadBandRed: 3
     ClothingHandsGlovesColorBlack: 3
     ClothingHandsGlovesFingerless: 3
-    ClothingUniformJumpsuitSec: 3 # DeltaV - moved it down with the other jumpsuits/skirts
     ClothingUniformJumpskirtSec: 3
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
     ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe
     ClothingHeadsetSecurity: 3
     ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe
-##    ClothingOuterWinterSec: 2 # DeltaV - replaced with uniform coats.
-    ClothingOuterStasecCoat: 3 # DeltaV - these are more fitting.
+    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 # DeltaV - see above.
+##    ClothingOuterArmorBasicSlim: 2
     ClothingNeckScarfStripedRed: 3
     ClothingEyesBlindfold: 1
-    ClothingMaskNeckGaiter: 3 # DeltaV - what could go wrong?
-    ClothingShoesBootsJack: 3 # DeltaV - moved it down with the combat boots
     ClothingShoesBootsCombat: 1
-##    ClothingShoesBootsWinterSec: 2 # DeltaV - removed until they fit the uniform
-##    ClothingShoesBootsCowboyBlack: 1 # DeltaV - hearing these things give me a headache.
-##    ClothingHeadHatCowboyBlack: 1 # DeltaV - seeing these things don't give me a headache, but please wear actual uniform.
+    ClothingShoesBootsWinterSec: 2
+    ClothingShoesBootsCowboyBlack: 1
+    ClothingHeadHatCowboyBlack: 1
diff --git a/...eltaV/Catalog/Fills/Items/Shoes/shoes.yml → ...DeltaV/Catalog/Fills/Items/Belts/misc.yml b/...eltaV/Catalog/Fills/Items/Shoes/shoes.yml → ...DeltaV/Catalog/Fills/Items/Belts/misc.yml
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -6,7 +6,6 @@
   name: combat hardsuit helmet
   description: An armoured helmet with a yellow visor and dual head-mounted lights.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi
   - type: Clothing
@@ -42,7 +41,6 @@
   name: medical combat hardsuit helmet
   description: A lightweight armoured helmet with full-face blue visor and head-mounted light.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi
   - type: Clothing
@@ -78,7 +76,6 @@
   name: riot combat hardsuit helmet
   description: A heavy armoured helmet with a sealed visor with yellow slits and dual head-mounted lights.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi
   - type: Clothing
@@ -114,7 +111,6 @@
   name: advanced combat hardsuit helmet
   description: A light but durable helmet with full-face protection and four head-mounted lights.
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi
   - type: Clothing

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
@@ -193,17 +193,6 @@
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
 
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatBeretForensicSpecialist
-  name: forensic specialist beret
-  description: For investigative souls.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi
-
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCJToque
@@ -214,3 +203,4 @@
     sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml
@@ -127,26 +127,6 @@
   - type: TemperatureProtection
     coefficient: 0.1
 
-- type: entity
-  parent: ClothingOuterStorageBase
-  id: ClothingOuterCoatLabCorpsman
-  name: corpsman's lab coat
-  description: A labcoat that protects against minor chemical spills and rowdy patients.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/Coats/labcoat_corpsman.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Caustic: 0.75
-        Blunt: 0.90
-        Slash: 0.90
-        Piercing: 0.90
-        Heat: 0.90
-  - type: AllowSuitStorage
-
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterChiefJustice
@@ -159,3 +139,4 @@
     sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
   - type: TemperatureProtection
     coefficient: 0.1
+
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -57,47 +57,3 @@
         Piercing: 0.85
         Heat: 0.75
   - type: AllowSuitStorage
-
-- type: entity
-  parent: ClothingOuterStasecSweater
-  id: ClothingOuterStasecCoat
-  name: station security winter coat
-  description: A heavy jacket made from 'synthetic' animal furs, enough to warm even the harshest security officer's cold heart.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatsec.rsi
-
-- type: entity
-  parent: ClothingOuterStasecSweater
-  id: ClothingOuterStasecCoatWarden
-  name: warden's winter coat
-  description: A heavy jacket made from 'synthetic' animal furs, enough to warm even the harshest warden's cold heart.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatwarden.rsi
-
-- type: entity
-  parent: ClothingOuterStasecSweater
-  id: ClothingOuterStasecCoatHoS
-  name: head of security's winter coat
-  description: A heavy jacket made from 'synthetic' animal furs, enough to warm even the harshest head of security's cold heart.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coathos.rsi
-
-- type: entity
-  parent: ClothingOuterStasecSweater
-  id: ClothingOuterStasecCoatDet
-  name: detective's windbreaker
-  description: A light but warm jacket, worn tight and close to avoid contaminating evidence in cooler temperatures.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/OuterClothing/WinterCoats/coatdet.rsi