Merge remote-tracking branch 'upstream/master' into HolidayDatums

Conflicts:
	code/__DEFINES/misc.dm
This commit is contained in:
Tigercat2000
2015-05-16 18:40:54 -07:00
177 changed files with 4385 additions and 2397 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ var/global/datum/controller/mob_system/mob_master
var/starttime
/datum/controller/mob_system/proc/Setup()
world << "\red Mob ticker starting up."
world << "\red \b Mob ticker starting up."
starttime = world.timeofday
/datum/controller/mob_system/proc/process()