Merge branch 'master' into upstream-merge-32096

code/modules/client/preferences.dm

@@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/allow_midround_antag = 1
 	var/preferred_map = null
 	var/pda_style = MONO
-	
+
 	var/uses_glasses_colour = 0
 
 	var/screenshake = 100
@@ -1188,7 +1188,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				if("species")
 
-					var/result = input(user, "Select a species", "Species Selection") as null|anything in CONFIG_GET(keyed_flag_list/roundstart_races)
+					var/result = input(user, "Select a species", "Species Selection") as null|anything in GLOB.roundstart_races
 
 					if(result)
 						var/newtype = GLOB.species_list[result]

code/modules/client/preferences_savefile.dm

@@ -294,12 +294,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Species
 	var/species_id
 	S["species"]			>> species_id
-	var/list/roundstart_races = CONFIG_GET(keyed_flag_list/roundstart_races)
-	if(species_id && (species_id in roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
+	if(species_id && (species_id in GLOB.roundstart_races) && CONFIG_GET(flag/join_with_mutant_race))
 		var/newtype = GLOB.species_list[species_id]
 		pref_species = new newtype()
-	else if (roundstart_races.len)
-		var/rando_race = pick(roundstart_races)
+	else if (GLOB.roundstart_races.len)
+		var/rando_race = pick(GLOB.roundstart_races)
 		if (rando_race)
 			pref_species = new rando_race()
 

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -14,7 +14,7 @@
 	facial_hair_color = hair_color
 	eye_color = random_eye_color()
 	if(!pref_species)
-		var/rando_race = pick(CONFIG_GET(keyed_flag_list/roundstart_races))
+		var/rando_race = pick(GLOB.roundstart_races)
 		pref_species = new rando_race()
 	features = random_features()
 	age = rand(AGE_MIN,AGE_MAX)

code/modules/mob/living/brain/brain.dm

@@ -19,7 +19,7 @@
 /mob/living/brain/proc/create_dna()
 	stored_dna = new /datum/dna/stored(src)
 	if(!stored_dna.species)
-		var/rando_race = pick(CONFIG_GET(keyed_flag_list/roundstart_races))
+		var/rando_race = pick(GLOB.roundstart_races)
 		stored_dna.species = new rando_race()
 
 /mob/living/brain/Destroy()

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -25,6 +25,10 @@
 		else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
 			H.heal_overall_damage(1,1)
 
+/datum/species/shadow/check_roundstart_eligible()
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		return TRUE
+	return ..()
 
 /datum/species/shadow/nightmare
 	name = "Nightmare"
@@ -61,7 +65,8 @@
 			return -1
 	return 0
 
-
+/datum/species/shadow/nightmare/check_roundstart_eligible()
+	return FALSE
 
 //Organs
 

code/modules/mob/living/carbon/human/species_types/skeletons.dm

@@ -11,3 +11,8 @@
 	damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
 	disliked_food = NONE
 	liked_food = NONE
+
+/datum/species/skeleton/check_roundstart_eligible()
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		return TRUE
+	return ..()

code/modules/mob/living/carbon/human/species_types/synths.dm

@@ -118,4 +118,4 @@
 		else
 			return ..()
 	else
-		return ..()
+		return ..()

code/modules/mob/living/carbon/human/species_types/zombies.dm

@@ -14,6 +14,11 @@
 	disliked_food = NONE
 	liked_food = NONE
 
+/datum/species/zombie/check_roundstart_eligible()
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		return TRUE
+	return ..()
+
 /datum/species/zombie/infectious
 	name = "Infectious Zombie"
 	id = "memezombies"
@@ -24,6 +29,10 @@
 	mutanteyes = /obj/item/organ/eyes/night_vision/zombie
 	var/regen_cooldown = 0
 
+/datum/species/zombie/infectious/check_roundstart_eligible()
+	return FALSE
+
+
 /datum/species/zombie/infectious/spec_stun(mob/living/carbon/human/H,amount)
 	. = min(2, amount)