From effbda8032b84e3755fc226373b80674d377369e Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Tue, 26 Sep 2023 18:56:47 +0200
Subject: [PATCH] Revert "ERT Overhaul (#170)" (#200)

This reverts commit 0f4ec57282bac7d78d506fd7cc40a38d93e9fb24.
---
 .../Fills/Backpacks/StarterGear/backpack.yml  | 274 ++----------------
 .../Prototypes/Catalog/Fills/Items/belt.yml   |  29 --
 .../Entities/Mobs/Player/humanoid.yml         | 271 +++++------------
 .../Weapons/Guns/Battery/battery_guns.yml     |   2 +-
 .../Roles/Jobs/Fun/emergencyresponseteam.yml  | 163 +++--------
 5 files changed, 138 insertions(+), 601 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index be2a96b468..1b649743cb 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -160,316 +160,90 @@
       - id: BoxForensicPad
 
 # ERT
-# Amber ERT:
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderAmber
+  id: ClothingBackpackERTLeaderFilled
   components:
     - type: StorageFill
       contents:
         - id: BoxSurvival
-        - id: WeaponLaserCarbine
+        - id: WeaponPulseCarbine
+        - id: WeaponPulsePistol
         - id: WeaponDisabler
-        - id: Stunbaton
-        - id: Handcuffs
         - id: MedicatedSuture
-        - id: PinpointerNuclear
+        - id: RegenerativeMesh
+        - id: Handcuffs
         - id: CrowbarRed
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackERTSecurityAmber
+  id: ClothingBackpackERTSecurityFilled
   components:
     - type: StorageFill
       contents:
         - id: BoxSurvival
         - id: WeaponDisabler
-        - id: WeaponLaserCarbine
-        - id: FlashlightSeclite
-        - id: BoxFlashbang
+        - id: WeaponPulsePistol
+        - id: WeaponPulseCarbine
         - id: MedicatedSuture
+        - id: RegenerativeMesh
         - id: BoxHandcuff
         - id: CrowbarRed
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTMedical
-  id: ClothingBackpackERTMedicalAmber
+  id: ClothingBackpackERTMedicalFilled
   components:
     - type: StorageFill
       contents:
         - id: BoxSurvivalMedical
-        - id: WeaponDisabler
+        - id: WeaponPulseCarbine
         - id: Hypospray
-        - id: MedkitFilled
         - id: MedkitAdvancedFilled
         - id: CrowbarRed
-        - id: Stunbaton
-        - id: Defibrillator
-        - id: CombatMedipen
+        - id: OmnizineChemistryBottle
+        - id: EpinephrineChemistryBottle
+        - id: EpinephrineChemistryBottle
 
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTEngineer
-  id: ClothingBackpackERTEngineerAmber
+  id: ClothingBackpackERTEngineerFilled
   components:
     - type: StorageFill
       contents:
         - id: BoxSurvival
         - id: trayScanner
-        - id: WeaponDisabler
+        - id: WeaponPulseCarbine
         - id: MedicatedSuture
-        - id: SheetSteel
-        - id: SheetGlass
-        - id: FlashlightLantern
-        - id: GasAnalyzer
-        - id: Stunbaton
-        - id: CableMVStack
-        - id: CableHVStack
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorAmber
-  components:
-    - type: StorageFill
-      contents:
-        - id: BoxSurvival
-        - id: WeaponDisabler
-
-        - id: BoxLightMixed
-        - id: LightReplacer
-        - id: Soap
-        - id: CrowbarRed
-        - id: AdvMopItem
-        - id: Stunbaton
-
-# End of Amber
-# Red ERT
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTLeader
-  id: ClothingBackpackERTLeaderRed
-  components:
-   - type: StorageFill
-     contents: 
-       - id: Stunbaton
-       - id: WeaponPulsePistol
-       - id: Handcuffs
-       - id: PinpointerNuclear
-       - id: DoorRemoteAll
-       - id: MedicatedSuture
-       - id: BoxSurvival
-       - id: CrowbarRed
-      
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTSecurity
-  id: ClothingBackpackERTSecurityRed
-  components:
-    - type: StorageFill
-      contents:
-        - id: WeaponDisabler
-        - id: WeaponLaserGun
-        - id: WeaponSubMachineGunVector
-        - id: MagazineMagnumSubMachineGun
-        - id: MagazineMagnumSubMachineGun
-        - id: Flash
-        - id: CombatKnife
-        - id: BoxHandcuff
-        - id: BoxSurvivalSecurity
-        - id: MedicatedSuture
-        - id: FlashlightSeclite
-        
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTMedical
-  id: ClothingBackpackERTMedicalRed
-  components:
-    - type: StorageFill
-      contents:
-        - id: Stunbaton
-        - id: WeaponLaserGun
-        - id: WeaponDisabler
-        - id: Hypospray
-        - id: Defibrillator
-        - id: PowerCellBluespace
-        - id: CombatMedipen
-        - id: CombatMedipen
-        - id: CombatMedipen
-        - id: CrowbarRed
-        - id: BoxSurvivalMedical
-        
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTEngineer
-  id: ClothingBackpackERTEngineerRed
-  components:
-    - type: StorageFill
-      contents:
-        - id: Stunbaton
-        - id: BoxSurvivalEngineering
-        - id: trayScanner
+        - id: RegenerativeMesh
         - id: RCD
         - id: RCDAmmo
         - id: RCDAmmo
         - id: RCDAmmo
-        - id: WeaponLaserGun
-        - id: WeaponDisabler
-        - id: CableHVStack
         - id: CableMVStack
-        - id: MedicatedSuture
-        - id: FlashlightLantern
- 
+        - id: CableHVStack
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorRed
+  id: ClothingBackpackERTJanitorFilled
   components:
     - type: StorageFill
       contents:
-        - id: Stunbaton
-        - id: WeaponLaserGun
-        - id: HydroponicsToolScythe
-        - id: AdvMopItem
-        - id: LightReplacer
-        - id: BoxLightMixed
         - id: BoxSurvival
-        - id: WeaponDisabler
-        - id: CrowbarRed
-        - id: SoapOmega
-        - id: CombatKnife
-        - id: MedicatedSuture
-        - id: FlashlightLantern
-        
-# End of Red
-# Gamma ERT
-
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHolding
-  id: ClothingBackpackERTLeaderGamma
-  components:
-    - type: StorageFill
-      contents:
-        - id: Stunbaton
         - id: WeaponPulsePistol
-        - id: WeaponPistolUniversal
-        - id: MagazineUniversalCaselessRifle
-        - id: MagazineUniversalCaselessRifle
-        - id: Flash
-        - id: Handcuffs
-        - id: PinpointerNuclear
-        - id: DoorRemoteAll
-        - id: BoxSurvival
-        - id: CrowbarRed
-        - id: MedicatedSuture
-        - id: WeaponDisabler
-        
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHolding
-  id: ClothingBackpackERTSecurityGamma
-  components:
-    - type: StorageFill
-      contents:
-        - id: WeaponAdvancedLaser
-        - id: WeaponSniperHristov
-        - id: MagazineBoxAntiMaterielBig
-        - id: WeaponXrayCannon
-        - id: Stunbaton
-        - id: MedicatedSuture
-        - id: Bola
-        - id: BoxHandcuff
-        - id: BoxFlashbang
-        - id: WeaponSubMachineGunVector
-        - id: MagazineMagnumSubMachineGun
-        - id: MagazineMagnumSubMachineGun
-        - id: C4
-        - id: C4
-        - id: C4
-        - id: BoxSurvivalSecurity
-        - id: SecBreachingHammer
-        - id: FlashlightSeclite
-        - id: PowerCellBluespace
-        - id: CrowbarRed
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-   
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHolding
-  id: ClothingBackpackERTMedicalGamma
-  components:
-    - type: StorageFill
-      contents: 
-        - id: Stunbaton
-        - id: WeaponPistolUniversal
-        - id: MagazineUniversalCaselessRifle
-        - id: MagazineUniversalCaselessRifle
-        - id: Stimpack
-        - id: Stimpack
-        - id: Stimpack
-        - id: Hypospray
-        - id: OmnizineChemistryBottle
-        - id: OmnizineChemistryBottle
-        - id: OmnizineChemistryBottle
-        - id: Defibrillator
-        - id: PowerCellBluespace
         - id: MedkitFilled
-        - id: MedkitAdvancedFilled
-        - id: CheapRollerBedSpawnFolded
-        - id: CrowbarRed
-        - id: BoxSurvivalMedical
-        - id: WeaponDisabler
-        
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackHolding
-  id: ClothingBackpackERTEngineerGamma
-  components: 
-    - type: StorageFill
-      contents:
-        - id: Stunbaton
-        - id: WeaponPistolUniversal
-        - id: MagazineUniversalCaselessRifle
-        - id: MagazineUniversalCaselessRifle
-        - id: trayScanner
-        - id: WeaponDisabler
-        - id: MedicatedSuture
-        - id: RCDExperimental
-        - id: BoxSurvivalEngineering
-        - id: CableHVStack
-        - id: CableMVStack
-        
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackERTJanitor
-  id: ClothingBackpackERTJanitorGamma
-  components:
-    - type: StorageFill
-      contents:
-        - id: Stunbaton
-        - id: WeaponPistolUniversal
-        - id: MagazineUniversalCaselessRifle
-        - id: MagazineUniversalCaselessRifle
-        - id: WeaponDisabler
-        - id: HydroponicsToolScythe
-        - id: LightReplacer
-        - id: AdvMopItem
         - id: BoxLightMixed
-        - id: BoxSurvival
+        - id: BoxLightMixed
+        - id: Soap
         - id: CrowbarRed
-        - id: PowerCellBluespace
-        - id: FlashlightLantern
-        
- #End of Gamma
- 
-  
+        - id: AdvMopItem
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSalvage
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index fdc5dc573a..456535af31 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -63,19 +63,6 @@
       #- name: GrenadeChem
       #- name: GrenadeChem
       - id: FlashlightLantern
-      
-- type: entity
-  id: ClothingBeltJanitorAdvanced
-  parent: ClothingBeltJanitor
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-      - id: Soap #Make a soap group and pick between when i'm not lazy
-      - id: SprayBottleSpaceCleaner
-      - id: WetFloorSign
-      - id: Holoprojector
-      - id: FlashlightLantern
 
 - type: entity
   id: ClothingBeltMedicalFilled
@@ -93,7 +80,6 @@
       - id: Gauze
       - id: EmergencyMedipen #You never know what people are going to latejoin into
       
-      
 - type: entity
   id: ClothingBeltParamedicFilled
   parent: ClothingBeltMedical
@@ -172,18 +158,3 @@
     - id: WeaponWandFireball
     - id: WeaponWandDeath
     - id: WeaponWandPolymorphDoor
-    
-- type: entity
-  id: ClothingBeltMilitaryWebbingMedAdvanced
-  parent: ClothingBeltMilitaryWebbingMed
-  suffix: Filled
-  components:
-  - type: StorageFill
-    contents:
-    - id: MedicatedSuture
-      amount: 3
-    - id: RegenerativeMesh
-      amount: 1
-    - id: Bloodpack
-      amount: 1
-    - id: CombatMedipen
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 14b721187b..922f7884c2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -3,9 +3,8 @@
 ## ERT Leader
 
 - type: entity
-  id: RandomHumanoidSpawnerERTLeaderAmber
-  name: Amber ERT leader
-  suffix: Amber
+  id: RandomHumanoidSpawnerERTLeader
+  name: ERT leader
   components:
     - type: Sprite
       netsync: false
@@ -16,10 +15,10 @@
       - NamesFirstMilitaryLeader
       - names_last
     - type: RandomHumanoidSpawner
-      settings: ERTLeaderAmber
+      settings: ERTLeader
 
 - type: randomHumanoidSettings
-  id: ERTLeaderAmber
+  id: ERTLeader
   randomizeName: false
   speciesBlacklist:
     - Arachne
@@ -29,67 +28,42 @@
       description: ghost-role-information-ert-leader-description
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ERTLeaderGearAmber]
+      prototypes: [ ERTLeaderGear ]
     - type: RandomMetadata
       nameSegments:
       - NamesFirstMilitaryLeader
       - names_last
 
 - type: entity
-  id: RandomHumanoidSpawnerERTLeaderRed
-  parent: RandomHumanoidSpawnerERTLeaderAmber
-  name: Red ERT leader
-  suffix: Red
+  id: RandomHumanoidSpawnerERTLeaderEVA
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT leader
+  suffix: EVA
   components:
     - type: Sprite
       netsync: false
       sprite: Markers/jobs.rsi
       state: ertleadereva
     - type: RandomHumanoidSpawner
-      settings: ERTLeaderRed
+      settings: ERTLeaderEVA
 
 - type: randomHumanoidSettings
-  id: ERTLeaderRed
-  parent: ERTLeaderAmber
+  id: ERTLeaderEVA
+  parent: ERTLeader
   components:
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ERTLeaderGearRed]
-      
-- type: entity
-  id: RandomHumanoidSpawnerERTLeaderGamma
-  parent: RandomHumanoidSpawnerERTLeaderAmber
-  name: Gamma ERT leader
-  suffix: Gamma
-  components:
-    - type: Sprite
-      netsync: false
-      sprite: Markers/jobs.rsi
-      state: ertleadereva
-    - type: RandomHumanoidSpawner
-      settings: ERTLeaderGamma
-     
-- type: randomHumanoidSettings
-  id: ERTLeaderGamma
-  parent: ERTLeaderAmber
-  components:
-    - type: GhostRole
-      name: ghost-role-information-ert-leader-name
-      description: ghost-role-information-ert-leader-description
-    - type: GhostTakeoverAvailable
-    - type: Loadout
-      prototypes: [ERTLeaderGearGamma]
+      prototypes: [ ERTLeaderGearEVA ]
 
 ## ERT Janitor
 
 - type: entity
-  id: RandomHumanoidSpawnerERTJanitorAmber
-  parent: RandomHumanoidSpawnerERTLeaderAmber
-  name: ERT janitor Amber
-  suffix: Amber
+  id: RandomHumanoidSpawnerERTJanitor
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT janitor
   components:
     - type: Sprite
       netsync: false
@@ -100,11 +74,11 @@
       - NamesFirstMilitary
       - names_last
     - type: RandomHumanoidSpawner
-      settings: ERTJanitorAmber
+      settings: ERTJanitor
 
 - type: randomHumanoidSettings
-  id: ERTJanitorAmber
-  parent: ERTLeaderAmber
+  id: ERTJanitor
+  parent: ERTLeader
   components:
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
@@ -115,63 +89,38 @@
       - NamesFirstMilitary
       - names_last
     - type: Loadout
-      prototypes: [ERTJanitorGearAmber]
-
-- type: entity
-  id: RandomHumanoidSpawnerERTJanitorRed
-  parent: RandomHumanoidSpawnerERTJanitorAmber
-  name: ERT janitor Red
-  suffix: Red
-  components:
-    - type: Sprite
-      netsync: false
-      sprite: Markers/jobs.rsi
-      state: ertjanitoreva
-    - type: RandomHumanoidSpawner
-      settings: ERTJanitorRed
-
-- type: randomHumanoidSettings
-  id: ERTJanitorRed
-  parent: ERTJanitorAmber
-  components:
-    - type: GhostRole
-      name: ghost-role-information-ert-janitor-name
-      description: ghost-role-information-ert-janitor-description
-    - type: GhostTakeoverAvailable
-    - type: Loadout
-      prototypes: [ERTJanitorGearRed]
+      prototypes: [ ERTJanitorGear ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTJanitorGamma
-  parent: RandomHumanoidSpawnerERTJanitorAmber
-  name: ERT janitor Gamma
-  suffix: Gamma
+  id: RandomHumanoidSpawnerERTJanitorEVA
+  parent: RandomHumanoidSpawnerERTJanitor
+  name: ERT janitor
+  suffix: EVA
   components:
     - type: Sprite
       netsync: false
       sprite: Markers/jobs.rsi
       state: ertjanitoreva
     - type: RandomHumanoidSpawner
-      settings: ERTJanitorGamma
+      settings: ERTJanitorEVA
 
 - type: randomHumanoidSettings
-  id: ERTJanitorGamma
-  parent: ERTJanitorAmber
+  id: ERTJanitorEVA
+  parent: ERTJanitor
   components:
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ERTJanitorGearGamma]
+      prototypes: [ ERTJanitorGearEVA ]
 
 ## ERT Engineer
 
 - type: entity
-  id: RandomHumanoidSpawnerERTEngineerAmber
-  parent: RandomHumanoidSpawnerERTLeaderAmber
-  name: ERT engineer Amber
-  suffix: Amber
+  id: RandomHumanoidSpawnerERTEngineer
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT engineer
   components:
     - type: Sprite
       netsync: false
@@ -182,11 +131,11 @@
       - NamesFirstMilitary
       - names_last
     - type: RandomHumanoidSpawner
-      settings: ERTEngineerAmber
+      settings: ERTEngineer
 
 - type: randomHumanoidSettings
-  id: ERTEngineerAmber
-  parent: ERTLeaderAmber
+  id: ERTEngineer
+  parent: ERTLeader
   components:
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
@@ -197,63 +146,38 @@
       - NamesFirstMilitary
       - names_last
     - type: Loadout
-      prototypes: [ERTEngineerGearAmber]
-
-- type: entity
-  id: RandomHumanoidSpawnerERTEngineerRed
-  parent: RandomHumanoidSpawnerERTEngineerAmber
-  name: ERT engineer Red
-  suffix: Red
-  components:
-    - type: Sprite
-      netsync: false
-      sprite: Markers/jobs.rsi
-      state: ertengineereva
-    - type: RandomHumanoidSpawner
-      settings: ERTEngineerRed
-
-- type: randomHumanoidSettings
-  id: ERTEngineerRed
-  parent: ERTEngineerAmber
-  components:
-    - type: GhostRole
-      name: ghost-role-information-ert-engineer-name
-      description: ghost-role-information-ert-engineer-description
-    - type: GhostTakeoverAvailable
-    - type: Loadout
-      prototypes: [ERTEngineerGearRed]
+      prototypes: [ ERTEngineerGear ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTEngineerGamma
-  parent: RandomHumanoidSpawnerERTEngineerAmber
-  name: ERT engineer Gamma
-  suffix: Gamma
+  id: RandomHumanoidSpawnerERTEngineerEVA
+  parent: RandomHumanoidSpawnerERTEngineer
+  name: ERT engineer
+  suffix: EVA
   components:
     - type: Sprite
       netsync: false
       sprite: Markers/jobs.rsi
       state: ertengineereva
     - type: RandomHumanoidSpawner
-      settings: ERTEngineerGamma
+      settings: ERTEngineerEVA
 
 - type: randomHumanoidSettings
-  id: ERTEngineerGamma
-  parent: ERTEngineerAmber
+  id: ERTEngineerEVA
+  parent: ERTEngineer
   components:
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ERTEngineerGearGamma]
+      prototypes: [ ERTEngineerGearEVA ]
 
 ## ERT Security
 
 - type: entity
-  id: RandomHumanoidSpawnerERTSecurityAmber
-  parent: RandomHumanoidSpawnerERTLeaderAmber
-  name: ERT security Amber
-  suffix: Amber
+  id: RandomHumanoidSpawnerERTSecurity
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT security
   components:
     - type: Sprite
       netsync: false
@@ -264,11 +188,11 @@
       - NamesFirstMilitary
       - names_last
     - type: RandomHumanoidSpawner
-      settings: ERTSecurityAmber
+      settings: ERTSecurity
 
 - type: randomHumanoidSettings
-  id: ERTSecurityAmber
-  parent: ERTLeaderAmber
+  id: ERTSecurity
+  parent: ERTLeader
   components:
     - type: GhostRole
       name: ghost-role-information-ert-security-name
@@ -279,63 +203,38 @@
       - NamesFirstMilitary
       - names_last
     - type: Loadout
-      prototypes: [ERTSecurityGearAmber]
+      prototypes: [ ERTSecurityGear ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTSecurityRed
-  parent: RandomHumanoidSpawnerERTSecurityAmber
-  name: ERT security Red
-  suffix: Red
-  components:
-    - type: Sprite
-      netsync: false
-      sprite: Markers/jobs.rsi
-      state: ertsecurityeva
-    - type: RandomHumanoidSpawner
-      settings: ERTSecurityRed
-
-- type: randomHumanoidSettings
-  id: ERTSecurityRed
-  parent: ERTSecurityAmber
-  components:
-    - type: GhostRole
-      name: ghost-role-information-ert-security-name
-      description: ghost-role-information-ert-security-description
-    - type: GhostTakeoverAvailable
-    - type: Loadout
-      prototypes: [ERTSecurityGearRed]
-      
-- type: entity
-  id: RandomHumanoidSpawnerERTSecurityGamma
-  parent: RandomHumanoidSpawnerERTSecurityAmber
-  name: ERT security Gamma
-  suffix: Gamma
+  id: RandomHumanoidSpawnerERTSecurityEVA
+  parent: RandomHumanoidSpawnerERTSecurity
+  name: ERT security
+  suffix: EVA
   components:
     - type: Sprite
       netsync: false
       sprite: Markers/jobs.rsi
       state: ertsecurityeva
     - type: RandomHumanoidSpawner
-      settings: ERTSecurityGamma
+      settings: ERTSecurityEVA
 
 - type: randomHumanoidSettings
-  id: ERTSecurityGamma
-  parent: ERTSecurityAmber
+  id: ERTSecurityEVA
+  parent: ERTSecurity
   components:
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ERTSecurityGearGamma]
+      prototypes: [ ERTSecurityGearEVA ]
 
 ## ERT Medic
 
 - type: entity
-  id: RandomHumanoidSpawnerERTMedicalAmber
-  parent: RandomHumanoidSpawnerERTLeaderAmber
-  name: ERT medic Amber
-  suffix: Amber
+  id: RandomHumanoidSpawnerERTMedical
+  parent: RandomHumanoidSpawnerERTLeader
+  name: ERT medic
   components:
     - type: Sprite
       netsync: false
@@ -346,11 +245,11 @@
       - NamesFirstMilitary
       - names_last
     - type: RandomHumanoidSpawner
-      settings: ERTMedicalAmber
+      settings: ERTMedical
 
 - type: randomHumanoidSettings
-  id: ERTMedicalAmber
-  parent: ERTLeaderAmber
+  id: ERTMedical
+  parent: ERTLeader
   components:
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
@@ -361,55 +260,31 @@
       - NamesFirstMilitary
       - names_last
     - type: Loadout
-      prototypes: [ERTMedicalGearAmber]
+      prototypes: [ ERTMedicalGear ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTMedicalRed
-  parent: RandomHumanoidSpawnerERTMedicalAmber
-  name: ERT medic Red
-  suffix: Red
-  components:
-    - type: Sprite
-      netsync: false
-      sprite: Markers/jobs.rsi
-      state: ertmedicaleva
-    - type: RandomHumanoidSpawner
-      settings: ERTMedicalRed
-
-- type: randomHumanoidSettings
-  id: ERTMedicalRed
-  parent: ERTMedicalAmber
-  components:
-    - type: GhostRole
-      name: ghost-role-information-ert-medical-name
-      description: ghost-role-information-ert-medical-description
-    - type: GhostTakeoverAvailable
-    - type: Loadout
-      prototypes: [ERTMedicalGearRed]
-      
-- type: entity
-  id: RandomHumanoidSpawnerERTMedicalGamma
-  parent: RandomHumanoidSpawnerERTMedicalAmber
-  name: ERT medic Gamma
-  suffix: Gamma
+  id: RandomHumanoidSpawnerERTMedicalEVA
+  parent: RandomHumanoidSpawnerERTMedical
+  name: ERT medic
+  suffix: EVA
   components:
     - type: Sprite
       netsync: false
       sprite: Markers/jobs.rsi
       state: ertmedicaleva
     - type: RandomHumanoidSpawner
-      settings: ERTMedicalGamma
+      settings: ERTMedicalEVA
 
 - type: randomHumanoidSettings
-  id: ERTMedicalGamma
-  parent: ERTMedicalAmber
+  id: ERTMedicalEVA
+  parent: ERTMedical
   components:
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
     - type: GhostTakeoverAvailable
     - type: Loadout
-      prototypes: [ERTMedicalGearGamma]
+      prototypes: [ ERTMedicalGearEVA ]
 
 ## CBURN
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 226e5f39d9..279a57b0eb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -60,7 +60,7 @@
       shader: unshaded
   - type: HitscanBatteryAmmoProvider
     proto: RedLaser
-    fireCost: 100
+    fireCost: 62.5
   - type: MagazineVisuals
     magState: mag
     steps: 5
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index e2816c35e8..6ddea0f108 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -5,7 +5,7 @@
   description: job-description-ertleader
   playTimeTracker: JobERTLeader
   setPreference: false
-  startingGear: ERTLeaderGearAmber
+  startingGear: ERTLeaderGearEVA
   icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
@@ -13,10 +13,10 @@
   - AllAccess
 
 - type: startingGear
-  id: ERTLeaderGearAmber
+  id: ERTLeaderGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderAmber
+    back: ClothingBackpackERTLeaderFilled
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTLeader
     eyes: ClothingEyesGlassesSecurity
@@ -24,30 +24,14 @@
     outerClothing: ClothingOuterArmorBulletproof
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSheathFilled
+    belt: ClothingBeltSecurityFilled
     pocket1: Flare
 
 - type: startingGear
-  id: ERTLeaderGearRed
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderRed
-    shoes: ClothingShoesBootsMag
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTLeader
-    suitstorage: OxygenTankFilled
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSheathFilled
-    pocket1: Flare
-    
-- type: startingGear
-  id: ERTLeaderGearGamma
+  id: ERTLeaderGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTLeader
-    back: ClothingBackpackERTLeaderGamma
+    back: ClothingBackpackERTLeaderFilled
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -56,7 +40,7 @@
     suitstorage: OxygenTankFilled
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSheathFilled
+    belt: ClothingBeltSecurityFilled
     pocket1: Flare
 
 # Engineer
@@ -66,7 +50,7 @@
   description: job-description-ertengineer
   playTimeTracker: JobERTEngineer
   setPreference: false
-  startingGear: ERTEngineerGearAmber
+  startingGear: ERTEngineerGearEVA
   icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
@@ -74,40 +58,25 @@
   - AllAccess
 
 - type: startingGear
-  id: ERTEngineerGearAmber
+  id: ERTEngineerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerAmber
-    shoes: ClothingShoesBootsMag
+    back: ClothingBackpackERTEngineerFilled
+    shoes: ClothingShoesBootsWork
+    head: ClothingHeadHelmetERTEngineer
     eyes: ClothingEyesGlassesMeson
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTEngineer
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltUtilityEngineering
-    pocket1: Flare
-
-- type: startingGear
-  id: ERTEngineerGearRed
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerRed
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesMeson
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTEngineer
-    suitstorage: OxygenTankFilled
+    outerClothing: ClothingOuterArmorBulletproof
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
-    
+
 - type: startingGear
-  id: ERTEngineerGearGamma
+  id: ERTEngineerGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTEngineer
-    back: ClothingBackpackERTEngineerGamma
+    back: ClothingBackpackERTEngineerFilled
     shoes: ClothingShoesBootsMagAdv
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesMeson
@@ -118,8 +87,6 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltChiefEngineerFilled
     pocket1: Flare
-   
-    
 
 # Security
 - type: job
@@ -128,7 +95,7 @@
   description: job-description-ertsecurity
   playTimeTracker: JobERTSecurity
   setPreference: false
-  startingGear: ERTSecurityGearAmber
+  startingGear: ERTEngineerGearEVA
   icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
@@ -136,10 +103,10 @@
   - AllAccess
 
 - type: startingGear
-  id: ERTSecurityGearAmber
+  id: ERTSecurityGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityAmber
+    back: ClothingBackpackERTSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTSecurity
     eyes: ClothingEyesGlassesSecurity
@@ -149,13 +116,13 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: Flare
-   
+    pocket2: FlashlightSeclite
 
 - type: startingGear
-  id: ERTSecurityGearRed
+  id: ERTSecurityGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityRed
+    back: ClothingBackpackERTSecurityFilled
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesGlassesSecurity
@@ -166,22 +133,7 @@
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
     pocket1: Flare
-
-- type: startingGear
-  id: ERTSecurityGearGamma
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTSecurity
-    back: ClothingBackpackERTSecurityGamma
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTSecurity
-    suitstorage: OxygenTankFilled
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltSecurityFilled
-    pocket1: Flare
+    pocket2: FlashlightSeclite
 
 # Medical
 - type: job
@@ -190,7 +142,7 @@
   description: job-description-ertmedic
   playTimeTracker: JobERTMedical
   setPreference: false
-  startingGear: ERTMedicalGearAmber
+  startingGear: ERTMedicalGearEVA
   icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
@@ -202,10 +154,10 @@
     - type: MedicalTraining
 
 - type: startingGear
-  id: ERTMedicalGearAmber
+  id: ERTMedicalGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalAmber
+    back: ClothingBackpackERTMedicalFilled
     shoes: ClothingShoesBootsCombatFilled
     head: ClothingHeadHelmetERTMedic
     eyes: ClothingEyesHudMedical
@@ -218,10 +170,10 @@
     pocket2: Flare
 
 - type: startingGear
-  id: ERTMedicalGearRed
+  id: ERTMedicalGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalRed
+    back: ClothingBackpackERTMedicalFilled
     shoes: ClothingShoesBootsMag
     mask: ClothingMaskGasERT
     eyes: ClothingEyesHudMedical
@@ -230,27 +182,10 @@
     suitstorage: OxygenTankFilled
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltMilitaryWebbingMedAdvanced
-    pocket1: HandheldHealthAnalyzer
-    pocket2: Flare
-    
-- type: startingGear
-  id: ERTMedicalGearGamma
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTMedic
-    back: ClothingBackpackERTMedicalGamma
-    shoes: ClothingShoesBootsMagAdv
-    mask: ClothingMaskGasERT
-    eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTMedical
-    suitstorage: OxygenTankFilled
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltMilitaryWebbingMedAdvanced
+    belt: ClothingBeltMedicalFilled
     pocket1: HandheldHealthAnalyzer
     pocket2: Flare
-   
+
 # Janitor
 - type: job
   id: ERTJanitor
@@ -258,7 +193,7 @@
   description: job-description-ertjanitor
   playTimeTracker: JobERTJanitor
   setPreference: false
-  startingGear: ERTJanitorGearAmber
+  startingGear: ERTJanitorGearEVA
   icon: "Nanotrasen"
   supervisors: job-supervisors-centcom
   canBeAntag: false
@@ -266,48 +201,30 @@
   - AllAccess
 
 - type: startingGear
-  id: ERTJanitorGearAmber
+  id: ERTJanitorGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorAmber
+    back: ClothingBackpackERTJanitorFilled
     shoes: ClothingShoesGaloshes
-    eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadHelmetERTJanitor
-    gloves: ClothingHandsGlovesCombat
+    gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterArmorBulletproof
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorAdvanced
+    belt: ClothingBeltJanitorFilled
     pocket1: Flare
 
 - type: startingGear
-  id: ERTJanitorGearRed
+  id: ERTJanitorGearEVA
   equipment:
     jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorRed
-    shoes: ClothingShoesGaloshes
-    mask: ClothingMaskBreath
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitERTJanitor
-    suitstorage: OxygenTankFilled
-    id: ERTLeaderPDA
-    ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorAdvanced
-    pocket1: Flare
-    
-- type: startingGear
-  id: ERTJanitorGearGamma
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitERTJanitor
-    back: ClothingBackpackERTJanitorGamma
-    shoes: ClothingShoesBootsMagAdv
+    back: ClothingBackpackERTJanitorFilled
+    shoes: ClothingShoesBootsMag
     mask: ClothingMaskBreath
-    eyes: ClothingEyesGlassesSecurity
-    gloves: ClothingHandsGlovesCombat
+    gloves: ClothingHandsGlovesColorBlack
     outerClothing: ClothingOuterHardsuitERTJanitor
     suitstorage: OxygenTankFilled
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
-    belt: ClothingBeltJanitorAdvanced
+    belt: ClothingBeltJanitorFilled
     pocket1: Flare