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

This reverts commit 135608551f, reversing changes made to ce7e9ac452.
2019-11-24 03:04:13 +00:00
parent c8b206a4cf
commit 1509d9d183
186 changed files with 405 additions and 764 deletions
@@ -546,10 +546,3 @@ 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