mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
use SIGNAL_HANDLER REEEEEE (#59242)
makes as many procs as i can find use the SIGNAL_HANDLER define which i assumed they all already did
This commit is contained in:
@@ -652,6 +652,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
|
||||
. = TRUE
|
||||
|
||||
/obj/item/gun/ballistic/proc/instant_reload()
|
||||
SIGNAL_HANDLER
|
||||
if(magazine)
|
||||
magazine.top_off()
|
||||
else
|
||||
|
||||
@@ -276,6 +276,7 @@
|
||||
. = "<span class='danger'>[user] casually lights [A.loc == user ? "[user.p_their()] [A.name]" : A] with [src]. Damn.</span>"
|
||||
|
||||
/obj/item/gun/energy/proc/instant_recharge()
|
||||
SIGNAL_HANDLER
|
||||
if(!cell)
|
||||
return
|
||||
cell.charge = cell.maxcharge
|
||||
|
||||
@@ -243,6 +243,7 @@
|
||||
select_fire()
|
||||
|
||||
/obj/item/gun/energy/wormhole_projector/proc/on_portal_destroy(obj/effect/portal/P)
|
||||
SIGNAL_HANDLER
|
||||
if(P == p_blue)
|
||||
p_blue = null
|
||||
else if(P == p_orange)
|
||||
|
||||
@@ -94,6 +94,7 @@
|
||||
recharge_newshot()
|
||||
|
||||
/obj/item/gun/magic/proc/instant_recharge()
|
||||
SIGNAL_HANDLER
|
||||
charges = max_charges
|
||||
recharge_newshot()
|
||||
update_appearance()
|
||||
|
||||
@@ -232,11 +232,12 @@
|
||||
lastangle = angle
|
||||
|
||||
/obj/item/gun/energy/beam_rifle/proc/on_mob_move()
|
||||
SIGNAL_HANDLER
|
||||
check_user()
|
||||
if(aiming)
|
||||
delay_penalty(aiming_time_increase_user_movement)
|
||||
process_aim()
|
||||
aiming_beam(TRUE)
|
||||
INVOKE_ASYNC(src, .proc/aiming_beam, TRUE)
|
||||
|
||||
/obj/item/gun/energy/beam_rifle/proc/start_aiming()
|
||||
aiming_time_left = aiming_time
|
||||
|
||||
@@ -134,6 +134,7 @@
|
||||
* - [blastwave_data][/list]: A list containing all of the data for the blastwave.
|
||||
*/
|
||||
/obj/item/gun/blastcannon/proc/channel_blastwave(atom/source, list/arguments)
|
||||
SIGNAL_HANDLER
|
||||
. = COMSIG_CANCEL_EXPLOSION
|
||||
|
||||
var/heavy = arguments[EXARG_KEY_DEV_RANGE]
|
||||
@@ -145,15 +146,15 @@
|
||||
return
|
||||
|
||||
if(!ismob(loc))
|
||||
fire_dropped(heavy, medium, light)
|
||||
INVOKE_ASYNC(src, .proc/fire_dropped, heavy, medium, light)
|
||||
return
|
||||
|
||||
var/mob/holding = loc
|
||||
var/target = cached_target?.resolve()
|
||||
if(target && (holding.get_active_held_item() == src) && cached_firer && (holding == cached_firer.resolve()))
|
||||
fire_intentionally(target, holding, heavy, medium, light, cached_modifiers)
|
||||
INVOKE_ASYNC(src, .proc/fire_intentionally, target, holding, heavy, medium, light, cached_modifiers)
|
||||
else
|
||||
fire_accidentally(holding, heavy, medium, light)
|
||||
INVOKE_ASYNC(src, .proc/fire_accidentally, holding, heavy, medium, light)
|
||||
return
|
||||
|
||||
/**
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
* automatic disconnection = beam_died, so we can give a warning message first
|
||||
*/
|
||||
/obj/item/gun/medbeam/proc/beam_died()
|
||||
SIGNAL_HANDLER
|
||||
active = FALSE //skip qdelling the beam again if we're doing this proc, because
|
||||
if(isliving(loc))
|
||||
to_chat(loc, "<span class='warning'>You lose control of the beam!</span>")
|
||||
|
||||
Reference in New Issue
Block a user