Merge c70572b007 into fd5b16abb3

Resources/Locale/en-US/_DV/tools/ERT_selector.ftl

@@ -7,6 +7,9 @@ ert-amber-gun-desc-aegun = One advanced energy gun, for both lethal and non-leth
 ert-amber-gun-name-mixlaser = Mixed Laser bundle
 ert-amber-gun-desc-mixlaser = A disabler SMG together with a Laser Carbine, bundled with a portable recharger.
 
+ert-amber-gun-name-kammerer = Kammerer
+ert-amber-gun-desc-kammerer = Do not be afraid Captain.
+
 ert-medkit-name = First aid kit
 ert-medkit-desc = A simple first aid kit, dont get shoot too hard.
 
@@ -76,6 +79,9 @@ ert-Immolatorkit-desc = The original firestarter bundled together with a portabl
 ert-IK60kit-name = IK-60 bundle
 ert-IK60kit-desc = IK-60-M bundled together with 4 Laser magazines. Watch your ammo consumption.
 
+ert-jackdawkit-name = Jackdaw bundle
+ert-jackdawkit-desc = A caseless rifle, paired with 20 round magazines. Property of Internal Affairs.
+
 ert-GammaC4-name = C4 box
 ert-GammaC4-desc = 4 timed charges of plastic breaching explosives.
 

Resources/Prototypes/_DV/Catalog/ERT_Loadout_catalog.yml

@@ -34,6 +34,17 @@
   - WeaponDisablerSMG
   - PortableRecharger
 
+- type: thiefBackpackSet
+  id: ERTkammerer
+  name: ert-amber-gun-name-kammerer
+  description: ert-amber-gun-desc-kammerer
+  sprite:
+    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    state: icon
+  content:
+  - WeaponShotgunKammerer
+  - BoxLethalshot
+
 - type: thiefBackpackSet
   id: ERTMedkit
   name: ert-medkit-name
@@ -347,6 +358,24 @@
   - MagazineLaser
   - MagazineLaser
 
+- type: thiefBackpackSet
+  id: ERTGammaSecJackdaw
+  name: ert-jackdawkit-name
+  description: ert-jackdawkit-desc
+  sprite:
+   sprite: _DV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
+   state: icon
+  content:
+  - WeaponRifleJackdaw
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+  - MagazineCaselessRifleShort
+
 - type: thiefBackpackSet
   id: ERTGammaC4
   name: ert-GammaC4-name

Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -397,8 +397,9 @@
       coefficients:
         Blunt: 0.5
         Slash: 0.5
-        Piercing: 0.50
+        Piercing: 0.6
         Heat: 0.6
+        Cold: 0.7
         Radiation: 0
         Caustic: 0.35
         Holy: 0.50

Resources/Prototypes/_DV/Entities/Objects/Specific/ERT_loadout_selector.yml

@@ -14,6 +14,7 @@
     - ERTPatosBundle
     - ERTaegunBundle
     - ERTmixlaserBundle
+    - ERTkammerer
 
 - type: entity
   parent: ToolboxThief
@@ -100,6 +101,7 @@
     - ERTGammaSecWT
     - ERTGammaSecImmolator
     - ERTGammaSecIK60
+    - ERTGammaSecJackdaw
 
 - type: entity
   parent: ToolboxThief

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -45,7 +45,7 @@
   parent: [BaseWeaponRifle, BaseGunWieldable]
   id: WeaponRifleJackdaw
   description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo.
-  suffix: Deathsquad
+  suffix: ERT # was Deathsquad
   components:
   - type: Item
     size: Large
@@ -56,12 +56,15 @@
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: GunWieldBonus
+    minAngle: -15
+    maxAngle: -11
   - type: Gun
-    minAngle: 2
-    maxAngle: 6
+    minAngle: 17
+    maxAngle: 17
     angleIncrease: 2
     angleDecay: 8
-    fireRate: 6 # DeltaV - was 8
+    fireRate: 6 # was 8
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -73,7 +76,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineCaselessRifle
+        startingItem: MagazineCaselessRifleShort # was a normal magazine
         insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
         priority: 2