From d28b0fa5f9080200497086ac6711e9fa1503c235 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 13 Oct 2019 13:49:55 -0700 Subject: [PATCH 1/2] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 97f5a9f30b..c7cc064861 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -116,11 +116,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) ..() -/proc/generate_selectable_species() +/proc/generate_selectable_species(clear = FALSE) + if(clear) + GLOB.roundstart_races = list() + GLOB.roundstart_race_names = list() for(var/I in subtypesof(/datum/species)) var/datum/species/S = new I if(S.check_roundstart_eligible()) - GLOB.roundstart_races += S.id + GLOB.roundstart_races |= S.id GLOB.roundstart_race_names["[S.name]"] = S.id qdel(S) if(!GLOB.roundstart_races.len) From bf1d4ed7d447c5962fe0dec25589036a844b75bb Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 13 Oct 2019 13:52:17 -0700 Subject: [PATCH 2/2] Update holidays.dm --- code/modules/holiday/holidays.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 7d1e25235d..f71fa1749c 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -536,3 +536,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