Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 1509d9d183.
2019-11-24 03:33:02 +00:00
parent ba4fa1ef67
commit 614a462176
186 changed files with 764 additions and 405 deletions
@@ -546,3 +546,10 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and

 /datum/holiday/easter/getStationPrefix()
 	return pick("Fluffy","Bunny","Easter","Egg")
+
+//Random citadel thing for halloween species
+/proc/force_enable_halloween_species()
+	var/list/oldlist = SSevents.holidays
+	SSevents.holidays = list(HALLOWEEN = new /datum/holiday/halloween)
+	generate_selectable_species(FALSE)
+	SSevents.holidays = oldlist