CBURN/ERT Touchups

Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs

@@ -70,4 +70,10 @@ public sealed partial class BallisticAmmoProviderComponent : Component
     /// </summary>
     [DataField]
     public TimeSpan FillDelay = TimeSpan.FromSeconds(0.5);
+
+    /// <summary>
+    /// Goobstation - is ammo automatically ejected after each shot
+    /// </summary>
+    [DataField]
+    public bool AutoCycle = true;
 }

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs

@@ -267,6 +267,11 @@ private void OnBallisticTakeAmmo(EntityUid uid, BallisticAmmoProviderComponent c
                 entity = component.Entities[^1];
 
                 args.Ammo.Add((entity, EnsureShootable(entity)));
+
+                if (!component.AutoCycle) //  Goobstation - do not remove spent ammo from the gun it doesn't autocycle
+                    break;
+
+
                 component.Entities.RemoveAt(component.Entities.Count - 1);
                 Containers.Remove(entity, component.Container);
             }
@@ -275,6 +280,15 @@ private void OnBallisticTakeAmmo(EntityUid uid, BallisticAmmoProviderComponent c
                 component.UnspawnedCount--;
                 entity = Spawn(component.Proto, args.Coordinates);
                 args.Ammo.Add((entity, EnsureShootable(entity)));
+
+                // Goobstation - put spent ammo back in the gun if it doesn't autocycle
+                if (!component.AutoCycle)
+                {
+                    component.Entities.Add(entity);
+                    Containers.Insert(entity, component.Container);
+
+                }
+                // Goobstation - end
             }
         }
 

Resources/Locale/en-US/_DEN/set-selector/selectable-set.ftl

@@ -19,7 +19,7 @@ ert-security-loadout-2-name = Combat Evolved
 ert-security-loadout-2-desc = A Pulse carbine, smoke, EMP and stinger grenades
 
 ert-security-loadout-3-name = Breach & Clear
-ert-security-loadout-3-desc = An Enforcer shotgun, extra drums of ammo and stinger grenades
+ert-security-loadout-3-desc = An MA-A49 shotgun, extra boxes of ammo and stinger grenades
 
 ert-engineer-loadout-2-name = Live Wire
 ert-engineer-loadout-2-desc = A Pulse carbine, tear gas & stinger grenades, with breaching charges
@@ -44,3 +44,6 @@ ert-medic-loadout-3-desc = A Lecter assault rifle, magazines and stinger grenade
 
 ert-janitor-loadout-1-name = Hazard Response
 ert-janitor-loadout-1-desc = Trashbags, a hydra grenade launcher and plenty of cleanades
+
+ert-cburn-loadout-1-name = Standard Issue
+ert-cburn-loadout-1-desc = The standard CBURN unit loadout, featuring the MA-A49 shotgun.

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

@@ -301,6 +301,8 @@
   components:
   - type: Storage
     maxItemSize: Huge
+    grid:
+    - 0,0,21,10
   - type: ClothingSpeedModifier
     walkModifier: 1
     sprintModifier: 1

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

@@ -163,6 +163,7 @@
   name: ERT leader spawner
   id: ERTLeaderSpawner
   parent: MarkerBase
+  suffix: Job spawn
   components:
   - type: Sprite
     layers:
@@ -227,6 +228,7 @@
   name: ERT chaplain spawner
   id: ERTChaplainSpawner
   parent: MarkerBase
+  suffix: Job spawn
   components:
   - type: Sprite
     layers:
@@ -291,6 +293,7 @@
   name: ERT janitor spawner
   id: ERTJanitorSpawner
   parent: MarkerBase
+  suffix: Job spawn
   components:
   - type: Sprite
     layers:
@@ -354,6 +357,7 @@
   name: ERT engineer spawner
   id: ERTEngineerSpawner
   parent: MarkerBase
+  suffix: Job spawn
   components:
   - type: Sprite
     layers:
@@ -417,6 +421,7 @@
   name: ERT security spawner
   id: ERTSecuritySpawner
   parent: MarkerBase
+  suffix: Job spawn
   components:
   - type: Sprite
     layers:
@@ -480,6 +485,7 @@
   name: ERT medic spawner
   id: ERTMedicalSpawner
   parent: MarkerBase
+  suffix: Job spawn
   components:
   - type: Sprite
     layers:
@@ -491,25 +497,10 @@
     prototypes:
     - RandomHumanoidSpawnerERTMedical
 
-## CBURN
-
-- type: entity
-  id: RandomHumanoidSpawnerCBURNUnit
-  name: CBURN Agent
-  suffix: ERTRole
-  components:
-    - type: Sprite
-      sprite: Markers/jobs.rsi
-      state: cburn
-    - type: RandomHumanoidSpawner
-      settings: CBURNAgent
-
+# CBURN
 - type: randomHumanoidSettings
   id: CBURNAgent
-  speciesBlacklist:
-    - Shadowkin
-    - Monkey # Shitmed Change
-    - Kobold # Shitmed Change
+  parent: ERTLeader
   components:
     # Den begin additions
     - type: RandomHumanoidAppearance
@@ -524,7 +515,7 @@
       implants:
       - BluespaceLifelineImplant
     - type: Loadout
-      prototypes: [CBURNGear]
+      prototypes: [ERTCBURNGear]
     - type: GhostRole
       name: ghost-role-information-cburn-agent-name
       description: ghost-role-information-cburn-agent-description
@@ -537,6 +528,34 @@
       - NamesMilitaryLast
       nameFormat: name-format-ert
 
+- type: entity
+  id: RandomHumanoidSpawnerCBURNUnit
+  parent: RandomHumanoidSpawnerERTLeader
+  name: CBURN Agent
+  suffix: ERTRole
+  components:
+    - type: Sprite
+      sprite: Markers/jobs.rsi
+      state: cburn
+    - type: RandomHumanoidSpawner
+      settings: CBURNAgent
+
+- type: entity
+  name: CBURN agent spawner
+  id: ERTCBURNpawner
+  parent: MarkerBase
+  suffix: Job spawn
+  components:
+  - type: Sprite
+    layers:
+      - sprite: Markers/jobs.rsi
+        state: green
+      - sprite: Markers/jobs.rsi
+        state: cburn
+  - type: RandomSpawner
+    prototypes:
+    - RandomHumanoidSpawnerCBURNUnit
+
 ## Central Command
 
 - type: entity

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -1104,7 +1104,7 @@
   - type: Item
     heldPrefix: blue
   - type: PresetIdCard
-    job: CBURN
+    job: ERTCBURN # DEN
   - type: NanoChatCard # DeltaV
     listNumber: false
 

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -928,4 +928,4 @@
     - id: StrangePill
       prob: 0.075
       maxAmount: 7
-      orGroup: RandomPill
+      orGroup: RandomPill

Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml

@@ -7,7 +7,7 @@
   id: CBURN
   name: job-name-cburn
   description: job-description-cburn
-  playTimeTracker: JobCBURN
+  playTimeTracker: JobERTCBURN
   setPreference: false
   startingGear: CBURNGear
   icon: "JobIconCBURN"

Resources/Prototypes/Roles/play_time_trackers.yml

@@ -194,4 +194,7 @@
   id: JobDeathSquad
 
 - type: playTimeTracker
-  id: JobCBURN
+  id: JobCBURN
+
+- type: playTimeTracker #Den
+  id: JobERTCBURN

Resources/Prototypes/_DEN/Catalog/selectable_sets.yml

@@ -77,13 +77,12 @@
   name: ert-security-loadout-3-name
   description: ert-security-loadout-3-desc
   sprite:
-    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+    sprite: _DEN/Objects/Weapons/Guns/Shotguns/salamander.rsi
     state: icon
   content:
-    - WeaponShotgunEnforcer
-    - MagazineShotgun
-    - MagazineShotgun
-    - MagazineShotgunSlug
+    - WeaponShotgunSalamander
+    - MagazineBoxShotgunHighCaliber
+    - MagazineBoxShotgunSlugHighCaliber
     - GrenadeStinger
     - GrenadeStinger
 
@@ -232,3 +231,33 @@
     - CleanerGrenade
     - CleanerGrenade
     - CleanerGrenade
+
+# ERT CBURN
+- type: selectableSet
+  id: ERTCBURNLoadout1
+  name: ert-cburn-loadout-1-name
+  description: ert-cburn-loadout-1-desc
+  sprite:
+    sprite: _DEN/Objects/Weapons/Guns/Shotguns/salamander.rsi
+    state: icon
+  content:
+    - BoxSurvivalEngineering
+    - WeaponShotgunSalamanderIncendiary
+    - MagazineBoxShotgunIncendiaryHighCaliber
+    - MagazineBoxShotgunIncendiaryHighCaliber
+    - MagazineBoxShotgunHighCaliber
+    - GrenadeIncendiary
+    - GrenadeIncendiary
+    - TearGasGrenade
+    - TearGasGrenade
+    - PillAmbuzolPlus
+    - PillCanisterAmbuzol
+    - Zipties
+    - Zipties
+    - Zipties
+    - Zipties
+    - Flare
+    - Flare
+    - Flare
+    - Flare
+

Resources/Prototypes/_DEN/Entities/Objects/Misc/ert_loadout.yml

@@ -104,3 +104,21 @@
       path: /Audio/Effects/kaching.ogg
     possibleSets:
     - ERTJanitorLoadout1
+
+# ERT CBURN
+- type: entity
+  id: ERTCBURNLoadoutSelector
+  name: ERT CBURN loadout selector
+  description: selectable-item-engineer-example-desc
+  parent: [ BaseItem, BaseSetSelector ]
+  components:
+  - type: Sprite
+    sprite: _Goobstation/Objects/Devices/unique_teleporters.rsi
+    state: standard
+  - type: SetSelector
+    spawnedStoragePrototype: ClothingBackpackDuffelCBURN
+    spawnedStorageContainer: storagebase
+    approveSound:
+      path: /Audio/Effects/kaching.ogg
+    possibleSets:
+    - ERTCBURNLoadout1

Resources/Prototypes/_DEN/Entities/Objects/Specific/Medical/pills.yml

@@ -844,3 +844,15 @@
     contents:
     - id: PillEthyloxyephedrine
       amount: 5
+
+- type: entity
+  parent: PillCanister
+  id: PillCanisterAmbuzol
+  suffix: Ambuzol, 10u x5
+  components:
+  - type: Label
+    currentLabel: ambuzol 10u
+  - type: StorageFill
+    contents:
+    - id: PillAmbuzol
+      amount: 5