cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 10:34:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5539 from Anewbe/error_runtime

Browse Source 
Might fix the server startup error_handler runtime
This commit is contained in:
Atermonera
2018-08-31 22:56:52 -07:00
committed by GitHub
parent f2ac530c24 3c8313650f
commit d5de4651be
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holomap/station_holomap.dm
+2 -2
View File
@@ -123,7 +123,7 @@
user.client.images |= holomap_datum.station_map
watching_mob = user
moved_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
GLOB.moved_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
GLOB.dir_set_event.register(watching_mob, src, /obj/machinery/station_map/proc/checkPosition)
destroyed_event.register(watching_mob, src, /obj/machinery/station_map/proc/stopWatching)
update_use_power(2)
@@ -152,7 +152,7 @@
var/mob/M = watching_mob
spawn(5) //we give it time to fade out
M.client.images -= holomap_datum.station_map
moved_event.unregister(watching_mob, src)
GLOB.moved_event.unregister(watching_mob, src)
GLOB.dir_set_event.unregister(watching_mob, src)
destroyed_event.unregister(watching_mob, src)
watching_mob = null
code/modules/mob/living/bot/secbot.dm
+3 -3
View File
@@ -159,17 +159,17 @@
say("Down on the floor, [suspect_name]! You have [SECBOT_WAIT_TIME] seconds to comply.")
playsound(src.loc, pick(preparing_arrest_sounds), 50)
// Register to be told when the target moves
moved_event.register(target, src, /mob/living/bot/secbot/proc/target_moved)
GLOB.moved_event.register(target, src, /mob/living/bot/secbot/proc/target_moved)
// Callback invoked if the registered target moves
/mob/living/bot/secbot/proc/target_moved(atom/movable/moving_instance, atom/old_loc, atom/new_loc)
if(get_dist(get_turf(src), get_turf(target)) >= 1)
awaiting_surrender = INFINITY // Done waiting!
moved_event.unregister(moving_instance, src)
GLOB.moved_event.unregister(moving_instance, src)
/mob/living/bot/secbot/resetTarget()
..()
moved_event.unregister(target, src)
GLOB.moved_event.unregister(target, src)
awaiting_surrender = -1
walk_to(src, 0)