From 9678de1f2f15a17189f72166b74419cca85bd41b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 17 Apr 2018 21:17:54 -0400 Subject: [PATCH 1/3] the fuck are these numbers --- .../code/modules/projectiles/guns/pumpenergy.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index 8fcf7a6463..96e505c989 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -143,7 +143,7 @@ /obj/item/ammo_casing/energy/laser/scatter/disabler/pump projectile_type = /obj/item/projectile/beam/disabler/weak e_cost = 150 - pellets = 5 + pellets = 4 variance = 30 fire_sound = 'modular_citadel/sound/weapons/ParticleBlaster.ogg' select_name = "disable" @@ -151,7 +151,7 @@ /obj/item/ammo_casing/energy/disabler/slug projectile_type = /obj/item/projectile/beam/disabler/slug select_name = "overdrive" - e_cost = 200 + e_cost = 250 fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg' /obj/item/ammo_casing/energy/laser/pump @@ -174,13 +174,13 @@ /obj/item/projectile/beam/disabler/weak name = "particle blast" - damage = 18 + damage = 13 icon_state = "disablerpellet" icon = 'modular_citadel/icons/obj/projectiles.dmi' /obj/item/projectile/beam/disabler/slug name = "positron blast" - damage = 60 + damage = 80 range = 14 speed = 0.6 icon_state = "disablerslug" @@ -196,4 +196,4 @@ stutter = 5 jitter = 20 hitsound = 'sound/weapons/taserhit.ogg' - range = 7 \ No newline at end of file + range = 7 From 521cc43664df51b086bbf2d62e410a132526f972 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 17 Apr 2018 21:26:00 -0400 Subject: [PATCH 2/3] makes pump-disabler slug slightly more cell-efficient than pump-disabler spread --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index 96e505c989..4592ea2c65 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -151,7 +151,7 @@ /obj/item/ammo_casing/energy/disabler/slug projectile_type = /obj/item/projectile/beam/disabler/slug select_name = "overdrive" - e_cost = 250 + e_cost = 210 fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg' /obj/item/ammo_casing/energy/laser/pump From 5f37b5910799ffbde89b4db8c50a880207520a1f Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 17 Apr 2018 22:32:25 -0400 Subject: [PATCH 3/3] on second thought, the cell usage change is a little dumb, the stamloss per watt isnt much different from its original value --- modular_citadel/code/modules/projectiles/guns/pumpenergy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm index 4592ea2c65..5b725c78de 100644 --- a/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm +++ b/modular_citadel/code/modules/projectiles/guns/pumpenergy.dm @@ -151,7 +151,7 @@ /obj/item/ammo_casing/energy/disabler/slug projectile_type = /obj/item/projectile/beam/disabler/slug select_name = "overdrive" - e_cost = 210 + e_cost = 200 fire_sound = 'modular_citadel/sound/weapons/LaserSlugv3.ogg' /obj/item/ammo_casing/energy/laser/pump