ERT Loadout Improvements

Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

@@ -195,13 +195,18 @@
   parent: [ ClothingBackpack, BaseCentcommContraband ]
   id: ClothingBackpackERTLeader
   name: ERT leader backpack
-  description: A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.
+  description: A spacious backpack with lots of pockets, worn by the leader of an Emergency Response Team.
   components:
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertleader.rsi
   - type: Storage
     grid:
-    - 0,0,10,3
+    - 0,0,8,4
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 0.95
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
 
 - type: entity
   parent: ClothingBackpackERTLeader

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -94,7 +94,7 @@
   id: RandomHumanoidSpawnerERTLeaderEVA
   parent: RandomHumanoidSpawnerERTLeader
   name: ERT leader
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -118,15 +118,16 @@
       roleLoadout: [ RoleSurvivalEVA ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTLeaderEVALecter
+  id: RandomHumanoidSpawnerERTMarinesLeader
   parent: RandomHumanoidSpawnerERTLeaderEVA
-  suffix: ERTRole, Lecter, EVA
+  name: ERT marines leader
+  suffix: ERTRole, Marines, Rifle
   components:
     - type: RandomHumanoidSpawner
-      settings: ERTLeaderEVALecter
+      settings: ERTMarinesLeader
 
 - type: randomHumanoidSettings
-  id: ERTLeaderEVALecter
+  id: ERTMarinesLeader
   parent: ERTLeaderEVA
   components:
     - type: GhostRole
@@ -137,7 +138,7 @@
         settings: short
       job: ERTLeader
     - type: Loadout
-      prototypes: [ ERTLeaderGearEVALecter ]
+      prototypes: [ ERTMarinesGearLeader ]
       roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Chaplain
@@ -181,8 +182,7 @@
 - type: entity
   id: RandomHumanoidSpawnerERTChaplainEVA
   parent: RandomHumanoidSpawnerERTChaplain
-  name: ERT chaplain
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -246,8 +246,7 @@
 - type: entity
   id: RandomHumanoidSpawnerERTJanitorEVA
   parent: RandomHumanoidSpawnerERTJanitor
-  name: ERT janitor
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -310,8 +309,7 @@
 - type: entity
   id: RandomHumanoidSpawnerERTEngineerEVA
   parent: RandomHumanoidSpawnerERTEngineer
-  name: ERT engineer
-  suffix: ERTRole, Enviro EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -374,8 +372,7 @@
 - type: entity
   id: RandomHumanoidSpawnerERTSecurityEVA
   parent: RandomHumanoidSpawnerERTSecurity
-  name: ERT security
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -399,15 +396,16 @@
       roleLoadout: [ RoleSurvivalEVA ]
 
 - type: entity
-  id: RandomHumanoidSpawnerERTSecurityEVALecter
+  id: RandomHumanoidSpawnerERTMarinesRifleman
   parent: RandomHumanoidSpawnerERTSecurityEVA
-  suffix: ERTRole, Lecter, EVA
+  name: ERT marines rifleman
+  suffix: ERTRole, Marines, Rifle
   components:
     - type: RandomHumanoidSpawner
-      settings: ERTSecurityEVALecter
+      settings: ERTMarinesRifleman
 
 - type: randomHumanoidSettings
-  id: ERTSecurityEVALecter
+  id: ERTMarinesRifleman
   parent: ERTSecurityEVA
   components:
     - type: GhostRole
@@ -418,7 +416,55 @@
         settings: short
       job: ERTSecurity
     - type: Loadout
-      prototypes: [ ERTSecurityGearEVALecter ]
+      prototypes: [ ERTMarinesGearRifleman ]
+      roleLoadout: [ RoleSurvivalEVA ]
+
+- type: entity
+  id: RandomHumanoidSpawnerERTMarinesBreacher
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  name: ERT marines breacher
+  suffix: ERTRole, Marines, Shotgun
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ERTMarinesBreacher
+
+- type: randomHumanoidSettings
+  id: ERTMarinesBreacher
+  parent: ERTSecurityEVA
+  components:
+    - type: GhostRole
+      name: ghost-role-information-ert-security-name
+      description: ghost-role-information-ert-security-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+      job: ERTSecurity
+    - type: Loadout
+      prototypes: [ ERTMarinesGearBreacher ]
+      roleLoadout: [ RoleSurvivalEVA ]
+
+- type: entity
+  id: RandomHumanoidSpawnerERTMarinesGrenadier
+  parent: RandomHumanoidSpawnerERTSecurityEVA
+  name: ERT marines grenadier
+  suffix: ERTRole, Marines, SMG
+  components:
+    - type: RandomHumanoidSpawner
+      settings: ERTMarinesGrenadier
+
+- type: randomHumanoidSettings
+  id: ERTMarinesGrenadier
+  parent: ERTSecurityEVA
+  components:
+    - type: GhostRole
+      name: ghost-role-information-ert-security-name
+      description: ghost-role-information-ert-security-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+      job: ERTSecurity
+    - type: Loadout
+      prototypes: [ ERTMarinesGearGrenadier ]
       roleLoadout: [ RoleSurvivalEVA ]
 
 ## ERT Medic
@@ -462,7 +508,7 @@
   id: RandomHumanoidSpawnerERTMedicalEVA
   parent: RandomHumanoidSpawnerERTMedical
   name: ERT medic
-  suffix: ERTRole, Armored EVA
+  suffix: ERTRole, EVA
   components:
     - type: Sprite
       sprite: Markers/jobs.rsi
@@ -485,6 +531,33 @@
       prototypes: [ ERTMedicalGearEVA ]
       roleLoadout: [ RoleSurvivalEVA ]
 
+- type: entity
+  id: RandomHumanoidSpawnerERTMarinesMedic
+  parent: RandomHumanoidSpawnerERTMedical
+  name: ERT marines medic
+  suffix: ERTRole, Marines, SMG
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: ertmedicaleva
+    - type: RandomHumanoidSpawner
+      settings: ERTMarinesMedic
+
+- type: randomHumanoidSettings
+  id: ERTMarinesMedic
+  parent: ERTMedical
+  components:
+    - type: GhostRole
+      name: ghost-role-information-ert-medical-name
+      description: ghost-role-information-ert-medical-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: short
+      job: ERTMedical
+    - type: Loadout
+      prototypes: [ ERTMarinesGearMedic ]
+      roleLoadout: [ RoleSurvivalEVA ]
+
 ## CBURN
 
 - type: entity
@@ -608,4 +681,4 @@
       rules: ghost-role-information-nonantagonist-rules
       raffle:
         settings: default
-    - type: Cluwne
+    - type: Cluwne