ERT Loadout overhaul + Real deathsquad mobs + ERT fixes (#21230)

* "assist with medical efforts" * CentComm official description change * give cburn ert mask * Ert medic hardsuit uses blood-red medic values * description changes, they all used to use the blood-red description * ert engineer hardsuit uses cburn values, good for handling all possible engineering problems. * janitor hardsuit uses cburn values for extreme messes, otherwise we'd send the non eva variant. * spawn suffix changes * shorten suffix * drop armor from ert jumpsuits * drop armor from DS jumpsuit * add more armor to death squad to make up for removed armor in the uniform. * give sec gas masks armor, give syndicate gas masks armor. ERT gas mask uses syndicate mask values * add nanotrasen * removed duplicate * give centcom IDs their hud icon * replace all ert bulletproof armor with basic universal armor * replace all oxygen tanks with air tanks; species is random. * remove gun and meds from ert engineer kit * give ert engineer materials * remove weapons and meds from janitor ert * give ert janitor light replacer * remove ert sec pulse weapons, admins will assign loadout. Either the lecter or enforcer, probably. * Give ert sec the security pistol kit * typo * give eva ert sec pistol * give eva janitor ert gas mask * give jani purple gloves * medical gloves for medical ert * replicate security loadout to leader * quick ert lecter spawns for lazy admins * better suffixes to find them easier * add cburn to ertspawn * Replace "Spawn" with "role" * Add death squad. Give ert engineer gas analyzer. * death squad using wrong equipment * typo * missing ghost roles on lecter loadouts * add freedom implanter to deathsquad * deathsquad ghost role text * Operative sounds better * give Ds flashbang box (why isn't it entirely filled?) * fix typo. add energy shield to DS * fix typos * all centcomm roles are now mindshielded. These cannot be removed. * Rider didnt include some of the changes ? * give zipties instead of cuffs for mass arrests! * upgrade ERT survival boxes to extended capacity * give cburn extended oxygen too
2026-05-02 13:07:00 +03:00 · 2023-10-27 09:54:43 -04:00
parent 0b567b78a4
commit 638054c8e9
14 changed files with 253 additions and 95 deletions
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -163,13 +163,13 @@ ghost-role-information-ert-security-name = ERT Security
 ghost-role-information-ert-security-description = Assist with security efforts to resolve the stations issues.

 ghost-role-information-ert-medical-name = ERT Medical
-ghost-role-information-ert-medical-description = Assist with medicaling efforts to resolve the stations issues.
+ghost-role-information-ert-medical-description = Assist with medical efforts to resolve the stations issues.

 ghost-role-information-cburn-agent-name = CBURN Agent
 ghost-role-information-cburn-agent-description = A highly trained CentCom agent, capable of dealing with various threats.

-ghost-role-information-centcom-official-name = CentCom official
-ghost-role-information-centcom-official-description = Inspect the station, jot down performance reviews for heads of staff, bug the Captain.
+ghost-role-information-centcom-official-name = CentComm official
+ghost-role-information-centcom-official-description = Perform CentComm related duties such as inspect the station, jotting down performance reviews for heads of staff, and managing the fax machine.

 ghost-role-information-nukeop-rules = You are a syndicate operative tasked with the destruction of the station. As an antagonist, do whatever is required to complete this task.

@@ -179,3 +179,6 @@ ghost-role-information-loneop-rules = You are a syndicate operative tasked with

 ghost-role-information-behonker-name = Behonker
 ghost-role-information-behonker-description = You are an antagonist, bring death and honks to those who do not follow the honkmother.
+
+ghost-role-information-Death-Squad-name = Death Squad Operative
+ghost-role-information-Death-Squad-description = Prepare for an all-out offensive on the station. As a heavily armed operative, your mission is to obliterate all life in your path. No witnesses.
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -47,4 +47,4 @@ job-description-zookeeper = Put on a joyful display of cute animals and space ca
 job-description-senior-engineer = Teach new engineers the basics of the station's engine, repairing, atmospherics and power.
 job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects.
 job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead.
-job-description-senior-officer = Teach new officers the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
+job-description-senior-officer = Teach new officers the basics of searches, performing arrests, prison times and how to properly shoot a firearm.
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -236,14 +236,13 @@
  components:
    - type: StorageFill
      contents:
-        - id: BoxSurvival
-        - id: WeaponPulseCarbine
-        - id: WeaponPulsePistol
+        - id: BoxSurvivalEngineering
        - id: WeaponDisabler
        - id: MedicatedSuture
        - id: RegenerativeMesh
-        - id: Handcuffs
+        - id: BoxZiptie
        - id: CrowbarRed
+        - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -252,14 +251,13 @@
  components:
    - type: StorageFill
      contents:
-        - id: BoxSurvival
+        - id: BoxSurvivalEngineering
        - id: WeaponDisabler
-        - id: WeaponPulsePistol
-        - id: WeaponPulseCarbine
        - id: MedicatedSuture
        - id: RegenerativeMesh
-        - id: BoxHandcuff
+        - id: BoxZiptie
        - id: CrowbarRed
+        - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -284,17 +282,18 @@
  components:
    - type: StorageFill
      contents:
-        - id: BoxSurvival
+        - id: BoxSurvivalEngineering
        - id: trayScanner
-        - id: WeaponPulseCarbine
-        - id: MedicatedSuture
-        - id: RegenerativeMesh
        - id: RCD
        - id: RCDAmmo
        - id: RCDAmmo
        - id: RCDAmmo
        - id: CableMVStack
        - id: CableHVStack
+        - id: CableApcStack
+        - id: SheetPlasteel
+        - id: SheetSteel
+        - id: SheetGlass

 - type: entity
  noSpawn: true
@@ -303,15 +302,40 @@
  components:
    - type: StorageFill
      contents:
-        - id: BoxSurvival
-        - id: WeaponPulsePistol
-        - id: MedkitFilled
+        - id: BoxSurvivalEngineering
+        - id: LightReplacer
        - id: BoxLightMixed
        - id: BoxLightMixed
        - id: Soap
        - id: CrowbarRed
        - id: AdvMopItem

+# Death Squad
+
+- type: entity
+  noSpawn: false
+  parent: ClothingBackpackERTSecurity
+  id: ClothingBackpackDeathSquadFilled
+  name: death squad backpack
+  description: Holds the kit of CentComm's most feared agents.
+  components:
+    - type: StorageFill
+      contents:
+        - id: BoxSurvivalEngineering
+        - id: WeaponPulseRifle
+        - id: WeaponPulsePistol
+        - id: WeaponRevolverMateba
+        - id: SpeedLoaderMagnumAP
+        - id: SpeedLoaderMagnumAP
+        - id: BoxFlashbang
+        - id: ToolDebug # spanish army knife
+        - id: WelderExperimental
+        - id: Hypospray
+        - id: MicroBombImplanter # crew will try to steal their amazing hardsuits
+        - id: FreedomImplanter
+
+# Cargo
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackCargo
@@ -330,6 +354,8 @@
      contents:
        - id: BoxSurvival

+# Pirate
+
 - type: entity
  parent: ClothingBackpackSatchelLeather
  id: ClothingBackpackPirateFilled
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -21,6 +21,7 @@
  components:
  - type: StorageFill
    contents:
+      - id: BoxSurvivalEngineering
      - id: WeaponShotgunDoubleBarreled
      - id: BoxShotgunIncendiary
        amount: 2
@@ -313,6 +314,7 @@
      - id: HandheldHealthAnalyzer
      - id: CombatMedipen
      - id: MicroBombImplanter
+      - id: SyndiHypo

 - type: entity
  parent: ClothingBackpackDuffelSyndicateMedicalBundle
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -140,7 +140,6 @@
  components:
  - type: StorageFill
    contents:
-      - id: SyndiHypo
      - id: EpinephrineChemistryBottle
        amount: 2
      - id: EphedrineChemistryBottle
@@ -169,4 +168,4 @@
    contents:
        - id: WeaponRevolverInspector
        - id: SpeedLoaderMagnum
-        - id: SpeedLoaderMagnumRubber
+        - id: SpeedLoaderMagnumRubber
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -27,6 +27,13 @@
    sprite: Clothing/Mask/gassecurity.rsi
  - type: Clothing
    sprite: Clothing/Mask/gassecurity.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95

 - type: entity
  parent: ClothingMaskGas
@@ -40,6 +47,13 @@
    sprite: Clothing/Mask/gassyndicate.rsi
  - type: FlashImmunity
  - type: EyeProtection
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95

 - type: entity
  parent: ClothingMaskGas
@@ -132,6 +146,8 @@
      coefficients:
        Blunt: 0.95
        Slash: 0.95
+        Piercing: 0.95
+        Heat: 0.95

 - type: entity
  parent: ClothingMaskPullableBase
@@ -294,7 +310,7 @@
    sprite: Clothing/Mask/merc.rsi

 - type: entity
-  parent: ClothingMaskGasExplorer
+  parent: ClothingMaskGasSyndicate
  id: ClothingMaskGasERT
  name: ert gas mask
  description: The gas mask of the elite squad of the ERT.
@@ -303,9 +319,6 @@
    sprite: Clothing/Mask/ert.rsi
  - type: Clothing
    sprite: Clothing/Mask/ert.rsi
-  - type: FlashImmunity
-  - type: EyeProtection
-    protectionTime: 5

 - type: entity
  parent: ClothingMaskGasERT
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -697,7 +697,7 @@
  parent: ClothingOuterHardsuitSyndieCommander
  id: ClothingOuterHardsuitERTLeader
  name: ERT leader's hardsuit
-  description: A protective hardsuit worn by members of an emergency response team.
+  description: A protective hardsuit worn by the leader of an emergency response team.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi
@@ -708,9 +708,10 @@

 #ERT Engineer Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitSyndie
+  parent: ClothingOuterHardsuitCBURN
  id: ClothingOuterHardsuitERTEngineer
  name: ERT engineer's hardsuit
+  description: A protective hardsuit worn by the engineers of an emergency response team.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
@@ -721,9 +722,10 @@

 #ERT Medic Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitSyndieElite
+  parent: ClothingOuterHardsuitMedic
  id: ClothingOuterHardsuitERTMedical
  name: ERT medic's hardsuit
+  description: A protective hardsuit worn by the medics of an emergency response team.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi
@@ -737,6 +739,7 @@
  parent: ClothingOuterHardsuitSyndie
  id: ClothingOuterHardsuitERTSecurity
  name: ERT security's hardsuit
+  description: A protective hardsuit worn by the security officers of an emergency response team.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi
@@ -747,9 +750,10 @@

 #ERT Janitor Hardsuit
 - type: entity
-  parent: ClothingOuterHardsuitSyndie
+  parent: ClothingOuterHardsuitCBURN
  id: ClothingOuterHardsuitERTJanitor
  name: ERT janitor's hardsuit
+  description: A protective hardsuit worn by the janitors of an emergency response team.
  components:
  - type: Sprite
    sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi
@@ -762,7 +766,7 @@
 - type: entity
  parent: ClothingOuterHardsuitBase
  id: ClothingOuterHardsuitDeathsquad
-  name: deathsquad hardsuit
+  name: death squad hardsuit
  description: An advanced hardsuit favored by commandos for use in special operations.
  components:
  - type: Sprite
@@ -779,12 +783,12 @@
  - type: Armor
    modifiers:
      coefficients:
-        Blunt: 0.2 #best armor in the game
-        Slash: 0.2
-        Piercing: 0.2
+        Blunt: 0.1 #best armor in the game
+        Slash: 0.1
+        Piercing: 0.1
        Heat: 0.1
        Radiation: 0.1
-        Caustic: 0.2
+        Caustic: 0.1
  - type: ClothingSpeedModifier
    walkModifier: 1.0
    sprintModifier: 1.0
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1,20 +1,13 @@
 - type: entity
  parent: ClothingUniformBase
  id: ClothingUniformJumpsuitDeathSquad
-  name: Death squad uniform
+  name: death squad uniform
  description: Advanced armored jumpsuit used by special forces in special operations.
  components:
  - type: Sprite
    sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/deathsquad.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8
-        Heat: 0.8

 - type: entity
  parent: ClothingUniformBase
@@ -1067,10 +1060,6 @@
    sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Radiation: 0.8

 - type: entity
  parent: ClothingUniformBase
@@ -1093,12 +1082,6 @@
    sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8

 - type: entity
  parent: ClothingUniformBase
@@ -1121,12 +1104,6 @@
    sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.8
-        Slash: 0.8
-        Piercing: 0.8

 - type: entity
  parent: ClothingUniformJumpsuitClown
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -1,10 +1,45 @@
 # Random humanoids

+## Death Squad
+
+- type: entity
+  id: RandomHumanoidSpawnerDeathSquad
+  name: Death Squad Agent
+  suffix: ERTRole, Death Squad
+  components:
+    - type: Sprite
+      sprite: Clothing/OuterClothing/Hardsuits/deathsquad.rsi
+      state: icon
+    - type: RandomMetadata
+      nameSegments:
+        - NamesFirstMilitaryLeader
+        - names_last
+    - type: RandomHumanoidSpawner
+      settings: DeathSquad
+
+- type: randomHumanoidSettings
+  id: DeathSquad
+  randomizeName: false
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-Death-Squad-name
+      description: ghost-role-information-Death-Squad-description
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ DeathSquadGear ]
+    - type: RandomMetadata
+      nameSegments:
+        - NamesFirstMilitaryLeader
+        - names_last
+
+
 ## ERT Leader

 - type: entity
  id: RandomHumanoidSpawnerERTLeader
  name: ERT leader
+  suffix: ERTRole, Basic
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -20,6 +55,7 @@
  id: ERTLeader
  randomizeName: false
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
@@ -35,7 +71,7 @@
  id: RandomHumanoidSpawnerERTLeaderEVA
  parent: RandomHumanoidSpawnerERTLeader
  name: ERT leader
-  suffix: EVA
+  suffix: ERTRole, Armored EVA
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -47,6 +83,7 @@
  id: ERTLeaderEVA
  parent: ERTLeader
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-leader-name
      description: ghost-role-information-ert-leader-description
@@ -54,12 +91,33 @@
    - type: Loadout
      prototypes: [ ERTLeaderGearEVA ]

+- type: entity
+  id: RandomHumanoidSpawnerERTLeaderEVALecter
+  parent: RandomHumanoidSpawnerERTLeaderEVA
+  suffix: ERTRole, Lecter, EVA
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ERTLeaderEVALecter
+
+- type: randomHumanoidSettings
+  id: ERTLeaderEVALecter
+  parent: ERTLeaderEVA
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-leader-name
+      description: ghost-role-information-ert-leader-description
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ERTLeaderGearEVALecter ]
+
 ## ERT Janitor

 - type: entity
  id: RandomHumanoidSpawnerERTJanitor
  parent: RandomHumanoidSpawnerERTLeader
  name: ERT janitor
+  suffix: ERTRole, Basic
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -75,6 +133,7 @@
  id: ERTJanitor
  parent: ERTLeader
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
@@ -90,7 +149,7 @@
  id: RandomHumanoidSpawnerERTJanitorEVA
  parent: RandomHumanoidSpawnerERTJanitor
  name: ERT janitor
-  suffix: EVA
+  suffix: ERTRole, Enviro EVA
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -102,6 +161,7 @@
  id: ERTJanitorEVA
  parent: ERTJanitor
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-janitor-name
      description: ghost-role-information-ert-janitor-description
@@ -115,6 +175,7 @@
  id: RandomHumanoidSpawnerERTEngineer
  parent: RandomHumanoidSpawnerERTLeader
  name: ERT engineer
+  suffix: ERTRole, Basic
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -130,6 +191,7 @@
  id: ERTEngineer
  parent: ERTLeader
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
@@ -145,7 +207,7 @@
  id: RandomHumanoidSpawnerERTEngineerEVA
  parent: RandomHumanoidSpawnerERTEngineer
  name: ERT engineer
-  suffix: EVA
+  suffix: ERTRole, Enviro EVA
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -157,6 +219,7 @@
  id: ERTEngineerEVA
  parent: ERTEngineer
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-engineer-name
      description: ghost-role-information-ert-engineer-description
@@ -170,6 +233,7 @@
  id: RandomHumanoidSpawnerERTSecurity
  parent: RandomHumanoidSpawnerERTLeader
  name: ERT security
+  suffix: ERTRole, Basic
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -185,6 +249,7 @@
  id: ERTSecurity
  parent: ERTLeader
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
@@ -200,7 +265,7 @@
  id: RandomHumanoidSpawnerERTSecurityEVA
  parent: RandomHumanoidSpawnerERTSecurity
  name: ERT security
-  suffix: EVA
+  suffix: ERTRole, Armored EVA
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -212,6 +277,7 @@
  id: ERTSecurityEVA
  parent: ERTSecurity
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-security-name
      description: ghost-role-information-ert-security-description
@@ -219,12 +285,33 @@
    - type: Loadout
      prototypes: [ ERTSecurityGearEVA ]

+- type: entity
+  id: RandomHumanoidSpawnerERTSecurityEVALecter
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  suffix: ERTRole, Lecter, EVA
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ERTSecurityEVALecter
+
+- type: randomHumanoidSettings
+  id: ERTSecurityEVALecter
+  parent: ERTSecurityEVA
+  components:
+    - type: MindShield
+    - type: GhostRole
+      name: ghost-role-information-ert-security-name
+      description: ghost-role-information-ert-security-description
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ ERTSecurityGearEVALecter ]
+
 ## ERT Medic

 - type: entity
  id: RandomHumanoidSpawnerERTMedical
  parent: RandomHumanoidSpawnerERTLeader
  name: ERT medic
+  suffix: ERTRole, Basic
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -240,6 +327,7 @@
  id: ERTMedical
  parent: ERTLeader
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
@@ -255,7 +343,7 @@
  id: RandomHumanoidSpawnerERTMedicalEVA
  parent: RandomHumanoidSpawnerERTMedical
  name: ERT medic
-  suffix: EVA
+  suffix: ERTRole, Armored EVA
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -267,6 +355,7 @@
  id: ERTMedicalEVA
  parent: ERTMedical
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-ert-medical-name
      description: ghost-role-information-ert-medical-description
@@ -279,6 +368,7 @@
 - type: entity
  id: RandomHumanoidSpawnerCBURNUnit
  name: CBURN Agent
+  suffix: ERTRole
  components:
    - type: Sprite
      sprite: Markers/jobs.rsi
@@ -289,6 +379,7 @@
 - type: randomHumanoidSettings
  id: CBURNAgent
  components:
+    - type: MindShield
    - type: Loadout
      prototypes: [CBURNGear]
    - type: GhostRole
@@ -314,6 +405,7 @@
 - type: randomHumanoidSettings
  id: CentcomOfficial
  components:
+    - type: MindShield
    - type: GhostRole
      name: ghost-role-information-centcom-official-name
      description: ghost-role-information-centcom-official-description
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -686,7 +686,7 @@
 - type: entity
  parent: CentcomPDA
  id: DeathsquadPDA
-  suffix: Deathsquad
+  suffix: Death Squad
  components:
  - type: Pda
    id: CentcomIDCardDeathsquad
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -450,6 +450,7 @@
    heldPrefix: blue
  - type: IdCard
    jobTitle: Central Commander
+    jobIcon: JobIconNanotrasen
  - type: Access
    groups:
    - AllAccess
@@ -499,7 +500,7 @@
 - type: entity
  parent: CentcomIDCard
  id: CentcomIDCardDeathsquad
-  name: deathsquad ID card
+  name: death squad ID card
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -131,7 +131,7 @@
  name: pulse pistol
  parent: BaseWeaponBatterySmall
  id: WeaponPulsePistol
-  description: A state of the art energy pistol favoured as a sidearm by the NT-ERT operatives.
+  description: A state of the art energy pistol favoured as a sidearm by the NT operatives.
  components:
  - type: Sprite
    sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
@@ -464,7 +464,7 @@
      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
  - type: ProjectileBatteryAmmoProvider
    proto: AnomalousParticleDeltaStrong
-    fireCost: 100 
+    fireCost: 100
  - type: BatteryWeaponFireModes
    fireModes:
    - proto: AnomalousParticleDeltaStrong
@@ -476,13 +476,13 @@
  - type: Construction
    graph: UpgradeWeaponPistolCHIMP
    node: start
-      
+
 - type: entity
  name: experimental C.H.I.M.P. handcannon
  parent: WeaponPistolCHIMP
  id: WeaponPistolCHIMPUpgraded
  description: This C.H.I.M.P. seems to have a greater punch than is usual...
-  components: 
+  components:
  - type: BatteryWeaponFireModes
    fireModes:
    - proto: AnomalousParticleDeltaStrong
@@ -490,7 +490,7 @@
    - proto: AnomalousParticleEpsilonStrong
      fireCost: 100
    - proto: AnomalousParticleOmegaStrong
-      fireCost: 100     
+      fireCost: 100
    - proto: AnomalousParticleZetaStrong
      fireCost: 100

--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -21,11 +21,12 @@
    head: ClothingHeadHelmetERTLeader
    eyes: ClothingEyesGlassesSecurity
    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBulletproof
+    outerClothing: ClothingOuterArmorBasicSlim
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: Flare
+    pocket1: WeaponPistolMk58Nonlethal
+    pocket2: FlashlightSeclite

 - type: startingGear
  id: ERTLeaderGearEVA
@@ -37,11 +38,31 @@
    eyes: ClothingEyesGlassesSecurity
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitERTLeader
-    suitstorage: OxygenTankFilled
+    suitstorage: AirTankFilled
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: Flare
+    pocket1: WeaponPistolMk58Nonlethal
+    pocket2: FlashlightSeclite
+
+- type: startingGear
+  id: ERTLeaderGearEVALecter
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitERTLeader
+    back: ClothingBackpackERTLeaderFilled
+    shoes: ClothingShoesBootsMagAdv
+    mask: ClothingMaskGasERT
+    eyes: ClothingEyesGlassesSecurity
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitERTLeader
+    suitstorage: WeaponRifleLecter
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltSecurityFilled
+    pocket1: MagazineRifle
+    pocket2: MagazineRifle
+  inhand:
+    - AirTankFilled

 # Engineer
 - type: job
@@ -66,11 +87,12 @@
    head: ClothingHeadHelmetERTEngineer
    eyes: ClothingEyesGlassesMeson
    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBulletproof
+    outerClothing: ClothingOuterArmorBasicSlim
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltChiefEngineerFilled
    pocket1: Flare
+    pocket2: GasAnalyzer

 - type: startingGear
  id: ERTEngineerGearEVA
@@ -82,11 +104,12 @@
    eyes: ClothingEyesGlassesMeson
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitERTEngineer
-    suitstorage: OxygenTankFilled
+    suitstorage: AirTankFilled
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltChiefEngineerFilled
    pocket1: Flare
+    pocket2: GasAnalyzer

 # Security
 - type: job
@@ -111,11 +134,11 @@
    head: ClothingHeadHelmetERTSecurity
    eyes: ClothingEyesGlassesSecurity
    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBulletproof
+    outerClothing: ClothingOuterArmorBasicSlim
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: Flare
+    pocket1: WeaponPistolMk58Nonlethal
    pocket2: FlashlightSeclite

 - type: startingGear
@@ -128,13 +151,32 @@
    eyes: ClothingEyesGlassesSecurity
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitERTSecurity
-    suitstorage: OxygenTankFilled
+    suitstorage: AirTankFilled
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltSecurityFilled
-    pocket1: Flare
+    pocket1: WeaponPistolMk58Nonlethal
    pocket2: FlashlightSeclite

+- type: startingGear
+  id: ERTSecurityGearEVALecter
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitERTSecurity
+    back: ClothingBackpackERTSecurityFilled
+    shoes: ClothingShoesBootsMag
+    mask: ClothingMaskGasERT
+    eyes: ClothingEyesGlassesSecurity
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterHardsuitERTSecurity
+    suitstorage: WeaponRifleLecter
+    id: ERTLeaderPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltSecurityFilled
+    pocket1: MagazineRifle
+    pocket2: MagazineRifle
+  inhand:
+    - AirTankFilled
+
 # Medical
 - type: job
  id: ERTMedical
@@ -157,8 +199,8 @@
    shoes: ClothingShoesBootsCombatFilled
    head: ClothingHeadHelmetERTMedic
    eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorBulletproof
+    gloves: ClothingHandsGlovesNitrile
+    outerClothing: ClothingOuterArmorBasicSlim
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltMedicalFilled
@@ -173,9 +215,9 @@
    shoes: ClothingShoesBootsMag
    mask: ClothingMaskGasERT
    eyes: ClothingEyesHudMedical
-    gloves: ClothingHandsGlovesCombat
+    gloves: ClothingHandsGlovesNitrile
    outerClothing: ClothingOuterHardsuitERTMedical
-    suitstorage: OxygenTankFilled
+    suitstorage: AirTankFilled
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltMedicalFilled
@@ -203,8 +245,8 @@
    back: ClothingBackpackERTJanitorFilled
    shoes: ClothingShoesGaloshes
    head: ClothingHeadHelmetERTJanitor
-    gloves: ClothingHandsGlovesColorBlack
-    outerClothing: ClothingOuterArmorBulletproof
+    gloves: ClothingHandsGlovesColorPurple
+    outerClothing: ClothingOuterArmorBasicSlim
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltJanitorFilled
@@ -216,10 +258,10 @@
    jumpsuit: ClothingUniformJumpsuitERTJanitor
    back: ClothingBackpackERTJanitorFilled
    shoes: ClothingShoesBootsMag
-    mask: ClothingMaskBreath
-    gloves: ClothingHandsGlovesColorBlack
+    mask: ClothingMaskGasERT
+    gloves: ClothingHandsGlovesColorPurple
    outerClothing: ClothingOuterHardsuitERTJanitor
-    suitstorage: OxygenTankFilled
+    suitstorage: AirTankFilled
    id: ERTLeaderPDA
    ears: ClothingHeadsetAltCentCom
    belt: ClothingBeltJanitorFilled
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -46,20 +46,19 @@
  id: DeathSquadGear
  equipment:
    jumpsuit: ClothingUniformJumpsuitDeathSquad
-    back: ClothingBackpackDuffelSyndicateAmmo
+    back: ClothingBackpackDeathSquadFilled
    mask: ClothingMaskGasDeathSquad
    eyes: ClothingEyesGlassesSecurity
    ears: ClothingHeadsetAltCentCom
    gloves: ClothingHandsGlovesCombat
    outerClothing: ClothingOuterHardsuitDeathsquad
-    suitstorage: OxygenTankFilled
+    suitstorage: AirTankFilled
    shoes: ClothingShoesBootsMagAdv
    id: DeathsquadPDA
    pocket1: EnergySword
-    belt: ClothingBeltChiefEngineerFilled
+    pocket2: EnergyShield
+    belt: ClothingBeltMilitaryWebbingMedFilled
  innerClothingSkirt: ClothingUniformJumpskirtColorBlack
-  satchel: ClothingBackpackDuffelSyndicateAmmo
-  duffelbag: ClothingBackpackDuffelSyndicateAmmo

 # Syndicate Operative Outfit - Monkey
 - type: startingGear
@@ -256,7 +255,7 @@
  equipment:
    jumpsuit: ClothingUniformJumpsuitColorBrown
    back: ClothingBackpackDuffelCBURN
-    mask: ClothingMaskGasExplorer
+    mask: ClothingMaskGasERT
    eyes: ClothingEyesGlassesSecurity
    ears: ClothingHeadsetAltCentCom
    gloves: ClothingHandsGlovesCombat