From cb9722676f2b988986ae54456dc5bce3cce2d1d5 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sat, 30 Nov 2024 01:19:28 -0500 Subject: [PATCH] Shuts up a bunch of RegisterSignal runtimes --- code/datums/elements/climbable.dm | 9 +++++---- code/datums/elements/elevation.dm | 2 +- code/game/machinery/_machinery.dm | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm index 89843e08a22c..e4310ad8949f 100644 --- a/code/datums/elements/climbable.dm +++ b/code/datums/elements/climbable.dm @@ -18,10 +18,11 @@ if(climb_stun) src.climb_stun = climb_stun - RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attack_hand)) - RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) - RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive)) - RegisterSignal(target, COMSIG_ATOM_BUMPED, PROC_REF(try_speedrun)) + // remove the `override = TRUE` whenever we actually fix this shit + RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attack_hand), override = TRUE) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine), override = TRUE) + RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive), override = TRUE) + RegisterSignal(target, COMSIG_ATOM_BUMPED, PROC_REF(try_speedrun), override = TRUE) ADD_TRAIT(target, TRAIT_CLIMBABLE, ELEMENT_TRAIT(type)) /datum/element/climbable/Detach(datum/target) diff --git a/code/datums/elements/elevation.dm b/code/datums/elements/elevation.dm index 2f8bd87d6b3f..1fc5f1ad491b 100644 --- a/code/datums/elements/elevation.dm +++ b/code/datums/elements/elevation.dm @@ -16,7 +16,7 @@ src.pixel_shift = pixel_shift if(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), override = TRUE) // temporary workaround. probably. var/atom/atom_target = target if(isturf(atom_target.loc)) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 0d14697b7624..324109d12949 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -267,7 +267,7 @@ return update_current_power_usage() power_change() - RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) + RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change), override = TRUE) // we can re-enter the same area due to shuttles and shit /obj/machinery/proc/on_exit_area(datum/source, area/area_to_unregister) SIGNAL_HANDLER