cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Might fix the server startup error_handler runtime

Browse Source
This commit is contained in:
Anewbe
2018-08-30 22:59:15 -05:00
parent 47861ad759
commit 3c8313650f
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/observation/helpers.dm
+3 -3
View File
@@ -1,5 +1,5 @@
/atom/movable/proc/recursive_move(var/atom/movable/am, var/old_loc, var/new_loc)
moved_event.raise_event(src, old_loc, new_loc)
GLOB.moved_event.raise_event(src, old_loc, new_loc)
/atom/movable/proc/move_to_destination(var/atom/movable/am, var/old_loc, var/new_loc)
var/turf/T = get_turf(new_loc)
@@ -10,9 +10,9 @@
set_dir(new_dir)
/proc/register_all_movement(var/event_source, var/listener)
moved_event.register(event_source, listener, /atom/movable/proc/recursive_move)
GLOB.moved_event.register(event_source, listener, /atom/movable/proc/recursive_move)
GLOB.dir_set_event.register(event_source, listener, /atom/proc/recursive_dir_set)
/proc/unregister_all_movement(var/event_source, var/listener)
moved_event.unregister(event_source, listener, /atom/movable/proc/recursive_move)
GLOB.moved_event.unregister(event_source, listener, /atom/movable/proc/recursive_move)
GLOB.dir_set_event.unregister(event_source, listener, /atom/proc/recursive_dir_set)
code/datums/observation/logged_in.dm
+2 -2
View File
@@ -6,7 +6,7 @@
// Arguments that the called proc should expect:
// /mob/joiner: The mob that has logged in
var/decl/observ/logged_in/logged_in_event = new()
GLOBAL_DATUM_INIT(logged_in_event, /decl/observ/logged_in, new)
/decl/observ/logged_in
name = "Logged In"
@@ -18,4 +18,4 @@ var/decl/observ/logged_in/logged_in_event = new()
/mob/Login()
..()
logged_in_event.raise_event(src)
GLOB.logged_in_event.raise_event(src)
code/datums/observation/moved.dm
+8 -7
View File
@@ -8,7 +8,8 @@
// /atom/old_loc: The loc before the move.
// /atom/new_loc: The loc after the move.
var/decl/observ/moved/moved_event = new()
GLOBAL_DATUM_INIT(moved_event, /decl/observ/moved, new)
/decl/observ/moved
name = "Moved"
@@ -27,26 +28,26 @@ var/decl/observ/moved/moved_event = new()
/atom/Entered(var/atom/movable/am, var/atom/old_loc)
. = ..()
moved_event.raise_event(am, old_loc, am.loc)
GLOB.moved_event.raise_event(am, old_loc, am.loc)
/atom/movable/Entered(var/atom/movable/am, atom/old_loc)
. = ..()
if(moved_event.has_listeners(am))
moved_event.register(src, am, /atom/movable/proc/recursive_move)
if(GLOB.moved_event.has_listeners(am))
GLOB.moved_event.register(src, am, /atom/movable/proc/recursive_move)
/atom/movable/Exited(var/atom/movable/am, atom/old_loc)
. = ..()
moved_event.unregister(src, am, /atom/movable/proc/recursive_move)
GLOB.moved_event.unregister(src, am, /atom/movable/proc/recursive_move)
// Entered() typically lifts the moved event, but in the case of null-space we'll have to handle it.
/atom/movable/Move()
var/old_loc = loc
. = ..()
if(. && !loc)
moved_event.raise_event(src, old_loc, null)
GLOB.moved_event.raise_event(src, old_loc, null)
/atom/movable/forceMove(atom/destination)
var/old_loc = loc
. = ..()
if(. && !loc)
moved_event.raise_event(src, old_loc, null)
GLOB.moved_event.raise_event(src, old_loc, null)
code/datums/observation/unequipped.dm
+4 -4
View File
@@ -7,7 +7,7 @@
// /mob/equipped: The mob that unequipped/dropped the item.
// /obj/item/item: The unequipped item.
var/decl/observ/mob_unequipped/mob_unequipped_event = new()
GLOBAL_DATUM_INIT(mob_unequipped_event, /decl/observ/mob_unequipped, new)
/decl/observ/mob_unequipped
name = "Mob Unequipped"
@@ -22,7 +22,7 @@ var/decl/observ/mob_unequipped/mob_unequipped_event = new()
// /obj/item/item: The unequipped item.
// /mob/equipped: The mob that unequipped/dropped the item.
var/decl/observ/item_unequipped/item_unequipped_event = new()
GLOBAL_DATUM_INIT(item_unequipped_event, /decl/observ/item_unequipped, new)
/decl/observ/item_unequipped
name = "Item Unequipped"
@@ -34,5 +34,5 @@ var/decl/observ/item_unequipped/item_unequipped_event = new()
/obj/item/dropped(var/mob/user)
..()
mob_unequipped_event.raise_event(user, src)
item_unequipped_event.raise_event(src, user)
GLOB.mob_unequipped_event.raise_event(user, src)
GLOB.item_unequipped_event.raise_event(src, user)