Fixes events. (#15665)

This commit is contained in:
Matt Atlas
2023-01-27 17:49:28 +01:00
committed by GitHub
parent 9155f54276
commit 06b2707463
30 changed files with 117 additions and 67 deletions
+1 -1
View File
@@ -88,7 +88,7 @@
return FALSE
known_targets.Insert(1, target) // Insert the newly hacked target first,
destroyed_event.register(target, src, /obj/item/device/multitool/hacktool/proc/on_target_destroy)
destroyed_event.register(target, src, PROC_REF(on_target_destroy))
return TRUE
/obj/item/device/multitool/hacktool/proc/sanity_check()
+1 -1
View File
@@ -65,7 +65,7 @@
unregister_buffer(buffer_object)
buffer_object = buffer
if(buffer_object)
destroyed_event.register(buffer_object, src, /obj/item/device/multitool/proc/unregister_buffer)
destroyed_event.register(buffer_object, src, PROC_REF(unregister_buffer))
update_icon()
/obj/item/device/multitool/proc/unregister_buffer(var/atom/buffer_to_unregister)
@@ -32,7 +32,7 @@
set_listening(TRUE)
recalculateChannels(TRUE)
possibly_deactivate_in_loc()
moved_event.register(src, src, /obj/item/device/radio/headset/proc/possibly_deactivate_in_loc)
moved_event.register(src, src, PROC_REF(possibly_deactivate_in_loc))
/obj/item/device/radio/headset/proc/possibly_deactivate_in_loc()
if(ismob(loc))
+2 -2
View File
@@ -9,12 +9,12 @@
/obj/structure/easel/Initialize(ml, _mat, _reinf_mat)
. = ..()
moved_event.register(src, src, /obj/structure/easel/proc/move_painting)
moved_event.register(src, src, PROC_REF(move_painting))
material = SSmaterials.get_material_by_name(MATERIAL_WOOD)
/obj/structure/easel/Destroy()
painting = null
moved_event.unregister(src, src, /obj/structure/easel/proc/move_painting)
moved_event.unregister(src, src, PROC_REF(move_painting))
return ..()
/*
@@ -84,7 +84,7 @@
unset_registered_user()
registered_user = user
user.set_id_info(src)
destroyed_event.register(user, src, /obj/item/card/id/syndicate/proc/unset_registered_user)
destroyed_event.register(user, src, PROC_REF(unset_registered_user))
return TRUE
/obj/item/card/id/syndicate/proc/unset_registered_user(var/mob/user)
@@ -245,7 +245,7 @@ Frequency:
var/old_pad = linked_pad
linked_pad = teleport_options[teleport_choice]
if(linked_pad)
destroyed_event.register(linked_pad, src, /obj/item/hand_tele/proc/pad_destroyed)
destroyed_event.register(linked_pad, src, PROC_REF(pad_destroyed))
if(old_pad && linked_pad != old_pad)
destroyed_event.unregister(old_pad, src)
return
+2 -2
View File
@@ -19,8 +19,8 @@
reflection.setup_visuals(src)
ref = WEAKREF(reflection)
entered_event.register(loc, reflection, /obj/effect/reflection/proc/check_vampire_enter)
exited_event.register(loc, reflection, /obj/effect/reflection/proc/check_vampire_exit)
entered_event.register(loc, reflection, TYPE_PROC_REF(/obj/effect/reflection, check_vampire_enter))
exited_event.register(loc, reflection, TYPE_PROC_REF(/obj/effect/reflection, check_vampire_exit))
/obj/structure/mirror/Destroy()
var/obj/effect/reflection/reflection = ref.resolve()
+2 -2
View File
@@ -43,8 +43,8 @@
T.pixel_x = 0
T.pixel_y = 0
T.layer = ABOVE_OBJ_LAYER
moved_event.register(T, src, /atom/movable/proc/move_to_turf)
moved_event.register(src, T, /atom/movable/proc/move_to_turf)
moved_event.register(T, src, TYPE_PROC_REF(/atom/movable, move_to_turf))
moved_event.register(src, T, TYPE_PROC_REF(/atom/movable, move_to_turf))
T.stake = src
pinned_target = T
else