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

2017-04-24 18:07:12 -05:00
parent aea9714228
commit 4baa357739
39 changed files with 227 additions and 178 deletions
@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 10
-	init_order = 3
+	init_order = INIT_ORDER_SHUTTLE
 	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK

 	var/list/mobile = list()
@@ -514,4 +514,4 @@ SUBSYSTEM_DEF(shuttle)

 	centcom_message = SSshuttle.centcom_message
 	ordernum = SSshuttle.ordernum
-	points = SSshuttle.points
+	points = SSshuttle.points