Merge pull request #545 from Citadel-Station-13/upstream-merge-26397

[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-25 01:02:38 -05:00
parent 6dd45dee7f 4baa357739
commit e27c5c8db3
39 changed files with 227 additions and 178 deletions
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(job)
 	name = "Jobs"
-	init_order = 14
+	init_order = INIT_ORDER_JOBS
 	flags = SS_NO_FIRE

 	var/list/occupations = list()		//List of all jobs