From bdd8e8a20deeb34dac84663fc83c74f69a104802 Mon Sep 17 00:00:00 2001 From: matttheficus <57759731+matttheficus@users.noreply.github.com> Date: Wed, 2 Aug 2023 06:43:42 -0400 Subject: [PATCH] Disabler Nerf: Slowdown Tweaks + Shot Reduction (#21499) * Update _species.dm * reduce shots * dont nerf the u-ion * sirryan review Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- code/modules/mob/living/carbon/human/species/_species.dm | 2 +- code/modules/projectiles/ammunition/energy_lens.dm | 2 +- code/modules/projectiles/guns/energy/stun.dm | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 6a0e0b6c137..7ff8785e9cd 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -332,7 +332,7 @@ . += (health_deficiency / 75) else if(health_deficiency >= 40) - . += (health_deficiency / 25) //Once damage is over 40, you get the harsh formula + . += ((health_deficiency / 25) - 1.1) //Once damage is over 40, you get the harsh formula else . += 0.5 //Otherwise, slowdown (from pain) is capped to 0.5 until you hit 40 damage. This only effects people with fractional slowdowns, and prevents some harshness from the lowered threshold diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm index 7348611df60..7063993eb9d 100644 --- a/code/modules/projectiles/ammunition/energy_lens.dm +++ b/code/modules/projectiles/ammunition/energy_lens.dm @@ -355,5 +355,5 @@ projectile_type = /obj/item/projectile/beam/silencer muzzle_flash_effect = null select_name = "silencing dissidents" - e_cost = 62.5 // 16 shots + e_cost = 50 // 16 shots fire_sound = 'sound/weapons/silencer_laser.ogg' diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index fdbd3f43469..5dbb10fd51b 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -54,6 +54,11 @@ flight_y_offset = 10 can_holster = TRUE +/obj/item/gun/energy/disabler/Initialize(mapload) + . = ..() + cell.maxcharge = 800 + cell.charge = 800 + /obj/item/gun/energy/disabler/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread) var/obj/item/gun/energy/disabler/offhand_disabler = user.get_inactive_hand() if(istype(offhand_disabler) && offhand_disabler.semicd && (user.a_intent != INTENT_HARM))