From 33cd3df45ae1ca64defbbd39cb541e22a7cdbc4c Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Wed, 8 Oct 2025 04:40:44 +0200 Subject: [PATCH] Change Energy Shotgun to fit as a Warden weapon (#40757) * Initial commit * Fix toggle mode name and also miscalculated charge times oops --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 14 ++++++-------- .../Weapons/Guns/Projectiles/projectiles.yml | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) 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 008c177aa5..2f2ebfa5fd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -839,24 +839,22 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg - type: ProjectileBatteryAmmoProvider - proto: BulletLaserSpread - fireCost: 150 + proto: BulletLaserSpreadNarrow + fireCost: 80 - type: BatteryWeaponFireModes fireModes: - - proto: BulletLaserSpread - fireCost: 150 - proto: BulletLaserSpreadNarrow - fireCost: 200 + fireCost: 80 - proto: BulletDisablerSmgSpread - fireCost: 120 + fireCost: 48 - type: Item size: Large sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi heldPrefix: energy - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Battery - maxCharge: 1200 - startingCharge: 1200 + maxCharge: 480 + startingCharge: 480 - type: entity name: energy magnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 080f73bdb7..d3e07c2e1b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1305,7 +1305,7 @@ spread: 30 - type: entity - name: narrow laser barrage + name: lethal laser barrage id: BulletLaserSpreadNarrow categories: [ HideSpawnMenu ] parent: BulletLaser -- 2.51.2