mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Signal Handler Preperation (#10917)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
b92212f9ee
commit
68e70a00ad
@@ -135,7 +135,7 @@
|
||||
if(QDELETED(thing) || thing.loc == newturf)
|
||||
continue
|
||||
thing.forceMove(newturf, movetime = MOVE_GLIDE_CALC(glide_size,0))
|
||||
if(CHECK_TICK && master.loc != curloc)
|
||||
if(TICK_CHECK && master.loc != curloc)
|
||||
// We moved again during the checktick, cancel current operation
|
||||
break
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
. = ..()
|
||||
|
||||
/datum/component/gargoyle/proc/unpause()
|
||||
SIGNAL_HANDLER
|
||||
if (!paused || transformed)
|
||||
paused = FALSE
|
||||
paused_loc = null
|
||||
|
||||
@@ -86,12 +86,10 @@
|
||||
/datum/proximity_monitor/mobspawner
|
||||
|
||||
/datum/proximity_monitor/mobspawner/on_uncrossed(atom/source, atom/movable/AM, atom/new_loc)
|
||||
SIGNAL_HANDLER
|
||||
var/obj/structure/mob_spawner/scanner/scanner = host
|
||||
scanner.CheckProximity(AM,new_loc)
|
||||
|
||||
/datum/proximity_monitor/mobspawner/on_entered(atom/source, atom/movable/arrived)
|
||||
SIGNAL_HANDLER
|
||||
var/obj/structure/mob_spawner/scanner/scanner = host
|
||||
if(source != host)
|
||||
scanner.NewProximity(arrived)
|
||||
|
||||
Reference in New Issue
Block a user