From 2b4deb228251de6e57e7b36441220b080de4b307 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Wed, 8 Mar 2023 19:37:31 -0800 Subject: [PATCH] Phoron Bore Adjustment Take 2 (#9015) * Phoron Bore Fire Delay Phoron bores have a windup of one second. * Phoron bore default range dropped to 3. --- code/modules/projectiles/guns/magnetic/bore.dm | 11 +++++++++++ code/modules/projectiles/projectile/magnetic.dm | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 9d70532599..bb187982f6 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -176,6 +176,8 @@ action_button_name = "Toggle internal generator" + var/winding = FALSE // Are we winding up to fire? + var/generator_state = GEN_OFF var/datum/looping_sound/small_motor/soundloop var/time_started //to keep the soundloop from being "stopped" too soon and playing indefinitely @@ -268,6 +270,15 @@ audible_message(SPAN_NOTICE("\The [src] goes quiet."),SPAN_NOTICE("A motor noise cuts out."), runemessage = "goes quiet") generator_state = GEN_OFF +/obj/item/gun/magnetic/matfed/phoronbore/special_check(mob/user) + if(!winding) + winding = TRUE + if(do_after(user, 1 SECOND, src) && ..()) // Super after do_after, due to clumsy check force-firing. + winding = FALSE + return TRUE + winding = FALSE + return FALSE + /obj/item/gun/magnetic/matfed/phoronbore/loaded cell = /obj/item/cell/apc capacitor = /obj/item/stock_parts/capacitor diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm index 3ec6fd81f5..5ed2d580ca 100644 --- a/code/modules/projectiles/projectile/magnetic.dm +++ b/code/modules/projectiles/projectile/magnetic.dm @@ -171,7 +171,7 @@ penetrating = 0 check_armour = "melee" irradiate = 20 - range = 6 + range = 3 hud_state = "plasma_rifle_blast" /obj/item/projectile/bullet/magnetic/bore/Initialize(loc, range_mod) // i'm gonna be real honest i dunno how this works but it does