Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker

This commit is contained in:
CitadelStationBot
2017-04-24 18:07:12 -05:00
parent aea9714228
commit 4baa357739
39 changed files with 227 additions and 178 deletions
+3 -2
View File
@@ -124,6 +124,7 @@
var/datum/proximity_monitor/proximity_monitor = src.proximity_monitor
if(proximity_monitor)
proximity_monitor.HandleMove()
return 1
/atom/movable/proc/clean_on_move()
@@ -174,7 +175,7 @@
if(stationloving && force)
STOP_PROCESSING(SSinbounds, src)
QDEL_NULL(proximity_monitor)
. = ..()
@@ -625,4 +626,4 @@
/atom/movable/proc/ConveyorMove(movedir)
set waitfor = FALSE
if(!anchored && has_gravity())
step(src, movedir)
step(src, movedir)