Merge pull request #800 from ZomgPonies/shadow

Mutantrace update
2026-08-23 12:07:27 +01:00 · 2015-04-21 18:36:24 -04:00
parent 180f61f5fb 8ce0212850
commit e8038738f6
32 changed files with 235 additions and 476 deletions
@@ -268,7 +268,7 @@ var/list/forbidden_varedit_object_types = list(
 /client/proc/modify_variables(var/atom/O, var/param_var_name = null, var/autodetect_class = 0)
 	if(!check_rights(R_VAREDIT))	return

-	var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state", "mutantrace")
+	var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "icon", "icon_state")

 	for(var/p in forbidden_varedit_object_types)
 		if( istype(O,p) )
@@ -516,7 +516,6 @@ client/proc/one_click_antag()
 	new_vox.real_name = capitalize(newname)
 	new_vox.name = new_vox.real_name
 	new_vox.age = rand(12,20)
-	new_vox.dna.mutantrace = "vox"
 	new_vox.set_species("Vox")
 	new_vox.languages = list() // Removing language from chargen.
 	new_vox.flavor_text = ""
@@ -23,7 +23,6 @@
 	var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
 	var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
 	var/corpseidicon = null //For setting it to be a gold, silver, centcomm etc ID
-	var/mutantrace = "human"
 	var/timeofdeath = null
 	var/coffin = 0

@@ -80,19 +80,40 @@
 				user.mutations.Add(LASER)
 				user.mutations.Add(RESIST_COLD)
 				user.mutations.Add(XRAY)
-				user.dna.mutantrace = "shadow"
+				if(ishuman(user))
+					var/mob/living/carbon/human/human = user
+					if(human.species.name != "Shadow")
+						user << "\red Your flesh rapidly mutates!"
+						user << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
+						user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
+						user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
+						human.set_species("Shadow")
 				user.regenerate_icons()
 			if("Wealth")
 				user << "<B>Your wish is granted, but at a terrible cost...</B>"
 				user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
 				new /obj/structure/closet/syndicate/resources/everything(loc)
-				user.dna.mutantrace = "shadow"
+				if(ishuman(user))
+					var/mob/living/carbon/human/human = user
+					if(human.species.name != "Shadow")
+						user << "\red Your flesh rapidly mutates!"
+						user << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
+						user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
+						user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
+						human.set_species("Shadow")
 				user.regenerate_icons()
 			if("Immortality")
 				user << "<B>Your wish is granted, but at a terrible cost...</B>"
 				user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart."
 				user.verbs += /mob/living/carbon/proc/immortality
-				user.dna.mutantrace = "shadow"
+				if(ishuman(user))
+					var/mob/living/carbon/human/human = user
+					if(human.species.name != "Shadow")
+						user << "\red Your flesh rapidly mutates!"
+						user << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
+						user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
+						user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
+						human.set_species("Shadow")
 				user.regenerate_icons()
 			if("To Kill")
 				user << "<B>Your wish is granted, but at a terrible cost...</B>"
@@ -107,7 +128,14 @@
 				for(var/datum/objective/OBJ in user.mind.objectives)
 					user << "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]"
 					obj_count++
-				user.dna.mutantrace = "shadow"
+				if(ishuman(user))
+					var/mob/living/carbon/human/human = user
+					if(human.species.name != "Shadow")
+						user << "\red Your flesh rapidly mutates!"
+						user << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
+						user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
+						user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
+						human.set_species("Shadow")
 				user.regenerate_icons()
 			if("Peace")
 				user << "<B>Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.</B>"
@@ -121,8 +121,6 @@ datum/preferences
 	var/species = "Human"
 	var/language = "None"				//Secondary language

-	var/slime_color = "blue" //need this for assigning to chars
-	var/HRslime_color = ""

 	var/speciesprefs = 0//I hate having to do this, I really do (Using this for oldvox code, making names universal I guess

@@ -352,15 +350,10 @@ datum/preferences
 				dat += "<br><b>Eyes</b><br>"
 				dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes)]'><tr><td>__</td></tr></table></font><br>"

-				if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
+				if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People")
 					dat += "<br><b>Body Color</b><br>"
 					dat += "<a href='?_src_=prefs;preference=skin;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin, 2)]'><table style='display:inline;' bgcolor='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin)]'><tr><td>__</td></tr></table></font>"

-				if(species == "Slime People")
-					HRslime_color = capitalize(slime_color)
-					dat += "<br><b>Slime Color</b><br>"
-					dat += "<a href='?_src_=prefs;preference=slime_color;task=input'>Change Slime Color</a> <b>[HRslime_color]</b>"
-
 				dat += "</td></tr></table><hr><center>"

 			if (1) // General Preferences
@@ -1214,15 +1207,6 @@ datum/preferences
 								g_skin = hex2num(copytext(new_skin, 4, 6))
 								b_skin = hex2num(copytext(new_skin, 6, 8))

-					if("slime_color")
-						var/list/slime_colors
-						slime_colors = slime_colorh
-						if(species == "Slime People")
-							var/new_slime = input(user, "Choose your slime color: ", "Character Preference") as null|anything in slime_colors
-							if(new_slime)
-								slime_color = slime_colors[slime_colors.Find(new_slime)]
-							ShowChoices(user)
-

 					if("ooccolor")
 						var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference") as color|null
@@ -1480,8 +1464,6 @@ datum/preferences
 		character.h_style = h_style
 		character.f_style = f_style

-		character.slime_color = slime_color
-

 		// Destroy/cyborgize organs

@@ -120,7 +120,6 @@
 		rlimb_data = params2list(query.item[51])
 		nanotrasen_relation = query.item[52]
 		speciesprefs = text2num(query.item[53])
-		slime_color = query.item[54]

 	//Sanitize
 	metadata		= sanitize_text(metadata, initial(metadata))
@@ -129,7 +128,6 @@
 	if(isnull(language)) language = "None"
 	if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation)
 	if(isnull(speciesprefs)) speciesprefs = initial(speciesprefs)
-	if(isnull(slime_color)) slime_color = initial(slime_color)
 	if(!real_name) real_name = random_name(gender,species)
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	gender			= sanitize_gender(gender)
@@ -192,14 +190,14 @@
 	firstquery.Execute()
 	while(firstquery.NextRow())
 		if(text2num(firstquery.item[1]) == default_slot)
-			var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sql_sanitize_text(metadata)]',real_name='[sql_sanitize_text(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sql_sanitize_text(species)]',language='[sql_sanitize_text(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sql_sanitize_text(h_style)]',facial_style_name='[sql_sanitize_text(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_support_high='[job_support_high]',job_support_med='[job_support_med]',job_support_low='[job_support_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sql_sanitize_text(flavor_text)]',med_record='[sql_sanitize_text(med_record)]',sec_record='[sql_sanitize_text(sec_record)]',gen_record='[sql_sanitize_text(gen_record)]',player_alt_titles='[playertitlelist]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',rlimb_data='[rlimblist]',nanotrasen_relation='[nanotrasen_relation]', speciesprefs='[speciesprefs]', slime_color='[slime_color]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
+			var/DBQuery/query = dbcon.NewQuery("UPDATE characters SET OOC_Notes='[sql_sanitize_text(metadata)]',real_name='[sql_sanitize_text(real_name)]',name_is_always_random='[be_random_name]',gender='[gender]',age='[age]',species='[sql_sanitize_text(species)]',language='[sql_sanitize_text(language)]',hair_red='[r_hair]',hair_green='[g_hair]',hair_blue='[b_hair]',facial_red='[r_facial]',facial_green='[g_facial]',facial_blue='[b_facial]',skin_tone='[s_tone]',skin_red='[r_skin]',skin_green='[g_skin]',skin_blue='[b_skin]',hair_style_name='[sql_sanitize_text(h_style)]',facial_style_name='[sql_sanitize_text(f_style)]',eyes_red='[r_eyes]',eyes_green='[g_eyes]',eyes_blue='[b_eyes]',underwear='[underwear]',undershirt='[undershirt]',backbag='[backbag]',b_type='[b_type]',alternate_option='[alternate_option]',job_support_high='[job_support_high]',job_support_med='[job_support_med]',job_support_low='[job_support_low]',job_medsci_high='[job_medsci_high]',job_medsci_med='[job_medsci_med]',job_medsci_low='[job_medsci_low]',job_engsec_high='[job_engsec_high]',job_engsec_med='[job_engsec_med]',job_engsec_low='[job_engsec_low]',job_karma_high='[job_karma_high]',job_karma_med='[job_karma_med]',job_karma_low='[job_karma_low]',flavor_text='[sql_sanitize_text(flavor_text)]',med_record='[sql_sanitize_text(med_record)]',sec_record='[sql_sanitize_text(sec_record)]',gen_record='[sql_sanitize_text(gen_record)]',player_alt_titles='[playertitlelist]',be_special='[be_special]',disabilities='[disabilities]',organ_data='[organlist]',rlimb_data='[rlimblist]',nanotrasen_relation='[nanotrasen_relation]', speciesprefs='[speciesprefs]' WHERE ckey='[C.ckey]' AND slot='[default_slot]'")
 			if(!query.Execute())
 				var/err = query.ErrorMsg()
 				log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
 				message_admins("SQL ERROR during character slot saving. Error : \[[err]\]\n")
 				return
 			return 1
-	var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_support_high,job_support_med,job_support_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,rlimb_data,nanotrasen_relation, speciesprefs, slime_color) VALUES ('[C.ckey]','[default_slot]','[sql_sanitize_text(metadata)]','[sql_sanitize_text(real_name)]','[be_random_name]','[gender]','[age]','[sql_sanitize_text(species)]','[sql_sanitize_text(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sql_sanitize_text(h_style)]','[sql_sanitize_text(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_support_high]','[job_support_med]','[job_support_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sql_sanitize_text(flavor_text)]','[sql_sanitize_text(med_record)]','[sql_sanitize_text(sec_record)]','[sql_sanitize_text(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[rlimblist]','[nanotrasen_relation]', '[speciesprefs]', '[slime_color]')")
+	var/DBQuery/query = dbcon.NewQuery("INSERT INTO characters (ckey,slot,OOC_Notes,real_name,name_is_always_random,gender,age,species,language,hair_red,hair_green,hair_blue,facial_red,facial_green,facial_blue,skin_tone,skin_red,skin_green,skin_blue,hair_style_name,facial_style_name,eyes_red,eyes_green,eyes_blue,underwear,undershirt,backbag,b_type,alternate_option,job_support_high,job_support_med,job_support_low,job_medsci_high,job_medsci_med,job_medsci_low,job_engsec_high,job_engsec_med,job_engsec_low,job_karma_high,job_karma_med,job_karma_low,flavor_text,med_record,sec_record,gen_record,player_alt_titles,be_special,disabilities,organ_data,rlimb_data,nanotrasen_relation, speciesprefs) VALUES ('[C.ckey]','[default_slot]','[sql_sanitize_text(metadata)]','[sql_sanitize_text(real_name)]','[be_random_name]','[gender]','[age]','[sql_sanitize_text(species)]','[sql_sanitize_text(language)]','[r_hair]','[g_hair]','[b_hair]','[r_facial]','[g_facial]','[b_facial]','[s_tone]','[r_skin]','[g_skin]','[b_skin]','[sql_sanitize_text(h_style)]','[sql_sanitize_text(f_style)]','[r_eyes]','[g_eyes]','[b_eyes]','[underwear]','[undershirt]','[backbag]','[b_type]','[alternate_option]','[job_support_high]','[job_support_med]','[job_support_low]','[job_medsci_high]','[job_medsci_med]','[job_medsci_low]','[job_engsec_high]','[job_engsec_med]','[job_engsec_low]','[job_karma_high]','[job_karma_med]','[job_karma_low]','[sql_sanitize_text(flavor_text)]','[sql_sanitize_text(med_record)]','[sql_sanitize_text(sec_record)]','[sql_sanitize_text(gen_record)]','[playertitlelist]','[be_special]','[disabilities]','[organlist]','[rlimblist]','[nanotrasen_relation]', '[speciesprefs]')")
 	if(!query.Execute())
 		var/err = query.ErrorMsg()
 		log_game("SQL ERROR during character slot saving. Error : \[[err]\]\n")
@@ -140,7 +140,6 @@

 /datum/file/data/genome/SE
 	name = "Structural Enzymes"
-	var/mutantrace = null

 /datum/file/data/genome/UE
 	name = "Unique Enzymes"
@@ -101,6 +101,14 @@
 	h_style = "blue IPC screen"
 	..(new_loc, "Machine")

+/mob/living/carbon/human/shadow/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Shadow")
+
+/mob/living/carbon/human/golem/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Golem")
+
 /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
 	if ((!( yes ) || now_pushing))
 		return
@@ -1080,9 +1088,6 @@
 	if(!species)
 		set_species()

-	if(dna && dna.mutantrace == "golem")
-		return "Animated Construct"
-
 	return species.name

 /mob/living/carbon/human/proc/play_xylophone()
@@ -1385,7 +1390,6 @@
 		dna = new /datum/dna(null)
 		dna.species = species.name
 		dna.real_name = real_name
-	dna.mutantrace = null

 	species.handle_post_spawn(src)

@@ -1643,9 +1647,6 @@
 	if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/rig/wizard))
 		threatcount += 2

-	//Check for nonhuman scum
-	if(dna && dna.mutantrace && dna.mutantrace != "none")
-		threatcount += 1

 	//Loyalty implants imply trustworthyness
 	if(isloyal(src))
@@ -701,63 +701,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc

 		return min(1,thermal_protection)

-	/*
-	proc/add_fire_protection(var/temp)
-		var/fire_prot = 0
-		if(head)
-			if(head.protective_temperature > temp)
-				fire_prot += (head.protective_temperature/10)
-		if(wear_mask)
-			if(wear_mask.protective_temperature > temp)
-				fire_prot += (wear_mask.protective_temperature/10)
-		if(glasses)
-			if(glasses.protective_temperature > temp)
-				fire_prot += (glasses.protective_temperature/10)
-		if(ears)
-			if(ears.protective_temperature > temp)
-				fire_prot += (ears.protective_temperature/10)
-		if(wear_suit)
-			if(wear_suit.protective_temperature > temp)
-				fire_prot += (wear_suit.protective_temperature/10)
-		if(w_uniform)
-			if(w_uniform.protective_temperature > temp)
-				fire_prot += (w_uniform.protective_temperature/10)
-		if(gloves)
-			if(gloves.protective_temperature > temp)
-				fire_prot += (gloves.protective_temperature/10)
-		if(shoes)
-			if(shoes.protective_temperature > temp)
-				fire_prot += (shoes.protective_temperature/10)
-
-		return fire_prot
-
-	proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
-		if(nodamage)
-			return
-		//world <<"body_part = [body_part], exposed_temperature = [exposed_temperature], exposed_intensity = [exposed_intensity]"
-		var/discomfort = min(abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
-
-		if(exposed_temperature > bodytemperature)
-			discomfort *= 4
-
-		if(mutantrace == "plant")
-			discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT * 2 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist
-		else
-			discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT //Dangercon 2011 - now with less magic numbers!
-		//world <<"[discomfort]"
-
-		switch(body_part)
-			if(HEAD)
-				apply_damage(2.5*discomfort, BURN, "head")
-			if(UPPER_TORSO)
-				apply_damage(2.5*discomfort, BURN, "chest")
-			if(LEGS)
-				apply_damage(0.6*discomfort, BURN, "l_leg")
-				apply_damage(0.6*discomfort, BURN, "r_leg")
-			if(ARMS)
-				apply_damage(0.4*discomfort, BURN, "l_arm")
-				apply_damage(0.4*discomfort, BURN, "r_arm")
-	*/

 	proc/get_covered_bodyparts()
 		var/covered = 0
@@ -814,7 +757,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					adjustOxyLoss(-(light_amount))
 					//TODO: heal wounds, heal broken limbs.

-		if(dna && dna.mutantrace == "shadow")
+		if(species.light_dam)
 			var/light_amount = 0
 			if(isturf(loc))
 				var/turf/T = loc
@@ -822,11 +765,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				if(A)
 					if(A.lighting_use_dynamic)	light_amount = T.lighting_lumcount
 					else						light_amount =  10
-			if(light_amount > 2) //if there's enough light, start dying
+			if(light_amount > species.light_dam) //if there's enough light, start dying
 				take_overall_damage(1,1)
-			else if (light_amount < 2) //heal in the dark
+			else //heal in the dark
 				heal_overall_damage(1,1)

+
 		//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
 		if(species.flags & CAN_BE_FAT)
 			if(FAT in mutations)
@@ -1174,14 +1118,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			if(healths)		healths.icon_state = "health7"	//DEAD healthmeter
 		else
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
-			if(dna)
-				switch(dna.mutantrace)
-					if("slime")
-						see_in_dark = 3
-						see_invisible = SEE_INVISIBLE_LEVEL_ONE
-					if("shadow")
-						see_in_dark = 8
-						see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING

 			if(mind && mind.vampire)
 				if((VAMP_VISION in mind.vampire.powers) && !(VAMP_FULL in mind.vampire.powers))
@@ -0,0 +1,100 @@
+/datum/species/golem
+	name = "Golem"
+
+	icobase = 'icons/mob/human_races/r_golem.dmi'
+	deform = 'icons/mob/human_races/r_golem.dmi'
+
+	default_language = "Galactic Common"
+	flags = NO_BREATHE | NO_PAIN | NO_BLOOD | NO_SCAN
+
+	blood_color = "#515573"
+	flesh_color = "#137E8F"
+
+
+	has_organ = list(
+		"brain" = /obj/item/organ/brain/golem
+		)
+
+/datum/species/golem/handle_post_spawn(var/mob/living/carbon/human/H)
+	if(H.mind)
+		H.mind.assigned_role = "Golem"
+		H.mind.special_role = "Golem"
+	H.real_name = "adamantine golem ([rand(1, 1000)])"
+	H.name = H.real_name
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/golem(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/golem(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/golem(H), slot_wear_mask)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(H), slot_gloves)
+	..()
+
+
+////////Adamantine Golem stuff I dunno where else to put it
+
+/obj/item/clothing/under/golem
+	name = "adamantine skin"
+	desc = "a golem's skin"
+	icon_state = "golem"
+	item_state = "golem"
+	_color = "golem"
+	has_sensor = 0
+	flags = ABSTRACT | NODROP
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/golem
+	name = "adamantine shell"
+	desc = "a golem's thick outter shell"
+	icon_state = "golem"
+	item_state = "golem"
+	w_class = 4//bulky item
+	gas_transfer_coefficient = 0.90
+	permeability_coefficient = 0.50
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD
+	slowdown = 1.0
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE | ABSTRACT | NODROP
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD
+	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/shoes/golem
+	name = "golem's feet"
+	desc = "sturdy adamantine feet"
+	icon_state = "golem"
+	item_state = "golem"
+	flags = NOSLIP | ABSTRACT | MASKINTERNALS | MASKCOVERSMOUTH | NODROP
+	slowdown = SHOES_SLOWDOWN+1
+
+
+/obj/item/clothing/mask/gas/golem
+	name = "golem's face"
+	desc = "the imposing face of an adamantine golem"
+	icon_state = "golem"
+	item_state = "golem"
+	siemens_coefficient = 0
+	unacidable = 1
+	flags = ABSTRACT | NODROP
+
+
+/obj/item/clothing/gloves/golem
+	name = "golem's hands"
+	desc = "strong adamantine hands"
+	icon_state = "golem"
+	item_state = null
+	siemens_coefficient = 0
+	flags = ABSTRACT | NODROP
+
+
+/obj/item/clothing/head/space/golem
+	icon_state = "golem"
+	item_state = "dermal"
+	_color = "dermal"
+	name = "golem's head"
+	desc = "a golem's head"
+	unacidable = 1
+	flags = STOPSPRESSUREDMAGE | ABSTRACT | NODROP
+	heat_protection = HEAD
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
+	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
@@ -187,37 +187,30 @@
 				src << "\red You feel your face freezing and an icicle forming in your lungs!"
 		else if(breath.temperature > heat_level_1)
 			if(prob(20))
-				if(H.dna.mutantrace == "slime")
-					src << "\red You feel supercharged by the extreme heat!"
-				else
-					src << "\red You feel your face burning and a searing heat in your lungs!"
-		if(H.dna.mutantrace == "slime")
-			if(breath.temperature < cold_level_1)
-				H.adjustToxLoss(round(cold_level_1 - breath.temperature))
+				src << "\red You feel your face burning and a searing heat in your lungs!"
+
+		switch(breath.temperature)
+			if(-INFINITY to cold_level_3)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 				H.fire_alert = max(H.fire_alert, 1)
-		else
-			switch(breath.temperature)
-				if(-INFINITY to cold_level_3)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)

-				if(cold_level_3 to cold_level_2)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_3 to cold_level_2)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)

-				if(cold_level_2 to cold_level_1)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_2 to cold_level_1)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)

-				if(heat_level_1 to heat_level_2)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_1 to heat_level_2)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)

-				if(heat_level_2 to heat_level_3)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_2 to heat_level_3)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)

-				if(heat_level_3 to INFINITY)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_3 to INFINITY)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 	return 1
@@ -0,0 +1,23 @@
+/datum/species/shadow
+	name = "Shadow"
+
+	icobase = 'icons/mob/human_races/r_shadow.dmi'
+	deform = 'icons/mob/human_races/r_shadow.dmi'
+
+	default_language = "Galactic Common"
+	unarmed_type = /datum/unarmed_attack/claws
+	light_dam = 2
+	darksight = 8
+
+	blood_color = "#CCCCCC"
+	flesh_color = "#AAAAAA"
+
+	has_organ = list(
+		"brain" = /obj/item/organ/brain
+		)
+
+	flags = NO_BLOOD | NO_BREATHE | NO_SCAN
+	bodyflags = FEET_NOSLIP
+
+/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
+	H.dust()
@@ -439,11 +439,6 @@ proc/get_damage_icon_part(damage_state, body_part)


 /mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1)
-	var/fat
-	if( FAT in mutations )
-		fat = "fat"
-//	var/g = "m"
-//	if (gender == FEMALE)	g = "f"
 //BS12 EDIT
 	var/skel = (SKELETON in src.mutations)
 	if(skel)
@@ -451,18 +446,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 	else
 		skeleton = null

-	if(dna)
-		switch(dna.mutantrace)
-			if("golem","shadow","adamantine")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
-			if("slime")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/slimemutant.dmi', "icon_state" = "[slime_color]_[dna.mutantrace][fat]_[gender]_s")
-			else
-				overlays_standing[MUTANTRACE_LAYER]	= null
-
-	if(!dna || !(dna.mutantrace in list("golem","metroid")))
-		update_body(0)
-
 	update_hair(0)
 	if(update_icons)   update_icons()

@@ -345,11 +345,10 @@
 					if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
 						targets += L // Possible target found!

-					if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men
+					if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men
 						var/mob/living/carbon/human/H = L
-						if(H.dna)
-							if(H.dna.mutantrace == "slime")
-								continue
+						if(H.species.name == "Slime People")
+							continue

 					if(!L.canmove) // Only one slime can latch on at a time.
 						var/notarget = 0
@@ -686,15 +686,6 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		..()
 		create_reagents(100)

-/obj/item/slime_extract/attack(mob/living/carbon/human/M as mob, mob/user as mob) //changing slime people colors
-		if(M.dna.mutantrace != "slime" || M != user) return
-
-		M.slime_color = _color
-		user <<"You absorb the core and your color shifts!"
-		M.update_mutantrace()
-		del(src) //Finally a tidy way to remove all the used cores lying about
-
-

 /obj/item/slime_extract/grey
 	name = "grey slime extract"
@@ -899,90 +890,6 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle17"

-	/*afterattack(obj/target, mob/user , flag)
-		if(istype(target, /obj/item/slime_extract))
-			if(target.enhanced == 1)
-				user << "<span class='warning'> This extract has already been enhanced!</span>"
-				return ..()
-			if(target.Uses == 0)
-				user << "<span class='warning'> You can't enhance a used extract!</span>"
-				return ..()
-			user <<"You apply the enhancer. It now has triple the amount of uses."
-			target.Uses = 3
-			target.enahnced = 1
-			del(src)*/
-
-////////Adamantine Golem stuff I dunno where else to put it
-
-// This will eventually be removed.
-
-/obj/item/clothing/under/golem
-	name = "adamantine skin"
-	desc = "a golem's skin"
-	icon_state = "golem"
-	item_state = "golem"
-	_color = "golem"
-	has_sensor = 0
-	flags = ABSTRACT | NODROP
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-
-/obj/item/clothing/suit/golem
-	name = "adamantine shell"
-	desc = "a golem's thick outter shell"
-	icon_state = "golem"
-	item_state = "golem"
-	w_class = 4//bulky item
-	gas_transfer_coefficient = 0.90
-	permeability_coefficient = 0.50
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD
-	slowdown = 1.0
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE | ABSTRACT | NODROP
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD
-	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD
-	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
-	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
-
-/obj/item/clothing/shoes/golem
-	name = "golem's feet"
-	desc = "sturdy adamantine feet"
-	icon_state = "golem"
-	item_state = "golem"
-	flags = NOSLIP | ABSTRACT | MASKINTERNALS | MASKCOVERSMOUTH | NODROP
-	slowdown = SHOES_SLOWDOWN+1
-
-
-/obj/item/clothing/mask/gas/golem
-	name = "golem's face"
-	desc = "the imposing face of an adamantine golem"
-	icon_state = "golem"
-	item_state = "golem"
-	siemens_coefficient = 0
-	unacidable = 1
-	flags = ABSTRACT | NODROP
-
-
-/obj/item/clothing/gloves/golem
-	name = "golem's hands"
-	desc = "strong adamantine hands"
-	icon_state = "golem"
-	item_state = null
-	siemens_coefficient = 0
-	flags = ABSTRACT | NODROP
-
-
-/obj/item/clothing/head/space/golem
-	icon_state = "golem"
-	item_state = "dermal"
-	_color = "dermal"
-	name = "golem's head"
-	desc = "a golem's head"
-	unacidable = 1
-	flags = STOPSPRESSUREDMAGE | ABSTRACT | NODROP
-	heat_protection = HEAD
-	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
-	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)

 /obj/effect/goleRUNe
 	anchored = 1
@@ -1014,16 +921,8 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		if(!ghost)
 			user << "The rune fizzles uselessly. There is no spirit nearby."
 			return
-		var/mob/living/carbon/human/G = new /mob/living/carbon/human
-		G.dna.mutantrace = "adamantine"
+		var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem
 		if(prob(50))	G.gender = "female"
-		G.real_name = text("Adamantine Golem ([rand(1, 1000)])")
-		G.equip_to_slot_or_del(new /obj/item/clothing/under/golem(G), slot_w_uniform)
-		G.equip_to_slot_or_del(new /obj/item/clothing/suit/golem(G), slot_wear_suit)
-		G.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(G), slot_shoes)
-		G.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/golem(G), slot_wear_mask)
-		G.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(G), slot_gloves)
-		//G.equip_to_slot_or_del(new /obj/item/clothing/head/space/golem(G), slot_head)
 		G.loc = src.loc
 		G.key = ghost.key
 		G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
@@ -1064,115 +963,4 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 				O << "\red You are not eligable."
 				return
 			ghosts.Add(O)
-			O << "\blue You are signed up to be a golem."
-
-//////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them////////////////////////
-
-/*
-// Basically this slime Core catalyzes reactions that normally wouldn't happen anywhere
-/obj/item/slime_core
-	name = "slime extract"
-	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
-	icon = 'icons/mob/slimes.dmi'
-	icon_state = "slime extract"
-	force = 1.0
-	w_class = 1.0
-	throwforce = 1.0
-	throw_speed = 2
-	throw_range = 6
-	origin_tech = "biotech=4"
-	var/POWERFLAG = 0 // sshhhhhhh
-	var/Flush = 30
-	var/Uses = 5 // uses before it goes inert
-
-/obj/item/slime_core/New()
-		..()
-		create_reagents(100)
-		POWERFLAG = rand(1,10)
-		Uses = rand(7, 25)
-		//flags |= NOREACT
-/*
-		spawn()
-			Life()
-
-	proc/Life()
-		while(src)
-			sleep(25)
-			Flush--
-			if(Flush <= 0)
-				reagents.clear_reagents()
-				Flush = 30
-*/
-
-
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime
-	name = "slime egg"
-	desc = "A small, gelatinous egg."
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "slime egg-growing"
-	bitesize = 12
-	origin_tech = "biotech=4"
-	var/grown = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/New()
-	..()
-	reagents.add_reagent("nutriment", 4)
-	reagents.add_reagent("slimejelly", 1)
-	spawn(rand(1200,1500))//the egg takes a while to "ripen"
-		Grow()
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Grow()
-	grown = 1
-	icon_state = "slime egg-grown"
-	processing_objects.Add(src)
-	return
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Hatch()
-	processing_objects.Remove(src)
-	var/turf/T = get_turf(src)
-	src.visible_message("<span class='warning'> The [name] pulsates and quivers!</span>")
-	spawn(rand(50,100))
-		src.visible_message("<span class='warning'> The [name] bursts open!</span>")
-		new/mob/living/carbon/slime(T)
-		del(src)
-
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/process()
-	var/turf/location = get_turf(src)
-	var/datum/gas_mixture/environment = location.return_air()
-	if (environment.toxins > MOLES_PLASMA_VISIBLE)//plasma exposure causes the egg to hatch
-		src.Hatch()
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype( W, /obj/item/toy/crayon ))
-		return
-	else
-		..()
-*/
-
-/obj/item/slime_color
-	name = "slimeperson color selector"
-	desc = "Allows you to change your slimeperson color, once."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "t-ray0"
-	force = 1.0
-	w_class = 1.0
-	throwforce = 1.0
-	throw_speed = 3
-	throw_range = 6
-	origin_tech = "biotech=4"
-	_color = "grey"
-	var/Uses = 1 // uses before it goes inert
-	var/list/slimecolor = list("grey","gold","silver","metal","purple","darkpurple","orange","yellow","red","blue","darkblue","pink","green","lightpink","black","oil","adamantine")
-
-
-/obj/item/slime_color/attack(mob/living/carbon/human/M as mob, mob/user as mob) //changing slime people colors
-	if(M.dna.mutantrace != "slime" || M != user) return
-
-
-	var/pickedcolor = input("Please select a slime color", "Slimeperson color chooser")  as null|anything in slimecolor
-	M.slime_color = pickedcolor
-	user << "You absorb the pigment and your color shifts!"
-	M.update_mutantrace()
-	del(src) //Finally a tidy way to remove all the used cores lying about
+			O << "\blue You are signed up to be a golem."
@@ -15,7 +15,6 @@

 	..()
 	gender = NEUTER
-	dna.mutantrace = "plant"
 	greaterform = "Diona"
 	add_language("Rootspeak")
 	verbs -= /mob/living/carbon/monkey/verb/ventcrawl
@@ -46,7 +45,6 @@

 	..()
 	gender = NEUTER
-	dna.mutantrace = "plant"
 	greaterform = "Diona"
 	add_language("Rootspeak")
 	src.verbs += /mob/living/carbon/monkey/diona/proc/merge
@@ -80,7 +80,6 @@
 /mob/living/carbon/monkey/unathi/New()

 	..()
-	dna.mutantrace = "lizard"
 	greaterform = "Unathi"
 	dna.species = "Unathi"
 	add_language("Sinta'unathi")
@@ -88,7 +87,6 @@
 /mob/living/carbon/monkey/skrell/New()

 	..()
-	dna.mutantrace = "skrell"
 	greaterform = "Skrell"
 	dna.species = "Skrell"
 	add_language("Skrellian")
@@ -96,7 +94,6 @@
 /mob/living/carbon/monkey/tajara/New()

 	..()
-	dna.mutantrace = "tajaran"
 	greaterform = "Tajaran"
 	dna.species = "Tajaran"
 	add_language("Siik'tajr")
@@ -106,7 +103,6 @@
 	..()
 	alien = 1
 	gender = NEUTER
-	dna.mutantrace = "plant"
 	greaterform = "Diona"
 	dna.species = "Diona"
 	add_language("Rootspeak")
@@ -14,7 +14,6 @@
 	var/tail                     // Name of tail image in species effects icon file.
 	var/unarmed                  //For empty hand harm-intent attack
 	var/unarmed_type = /datum/unarmed_attack
-	var/mutantrace               // Safeguard due to old code.

 	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
 	var/poison_type = "plasma"   // Poisonous air.
@@ -42,6 +41,8 @@
 	var/brute_mod = null    // Physical damage reduction/malus.
 	var/burn_mod = null     // Burn damage reduction/malus.

+	var/light_dam
+
 	var/max_hurt_damage = 9 // Max melee damage dealt + 5 if hulk
 	var/list/default_genes = list()

@@ -250,41 +251,34 @@
 				H << "\red You feel your face freezing and an icicle forming in your lungs!"
 		else if(breath.temperature > heat_level_1)
 			if(prob(20))
-				if(H.dna.mutantrace == "slime")
-					H << "\red You feel supercharged by the extreme heat!"
-				else
-					H << "\red You feel your face burning and a searing heat in your lungs!"
+				H << "\red You feel your face burning and a searing heat in your lungs!"

-		if(H.dna.mutantrace == "slime")
-			if(breath.temperature < cold_level_1)
-				H.adjustToxLoss(round(cold_level_1 - breath.temperature))
+
+
+		switch(breath.temperature)
+			if(-INFINITY to cold_level_3)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 				H.fire_alert = max(H.fire_alert, 1)

-		if(H.dna.mutantrace != "slime")
-			switch(breath.temperature)
-				if(-INFINITY to cold_level_3)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_3 to cold_level_2)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)

-				if(cold_level_3 to cold_level_2)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_2 to cold_level_1)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)

-				if(cold_level_2 to cold_level_1)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(heat_level_1 to heat_level_2)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)

-				if(heat_level_1 to heat_level_2)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_2 to heat_level_3_breathe)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)

-				if(heat_level_2 to heat_level_3_breathe)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
-
-				if(heat_level_3_breathe to INFINITY)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_3_breathe to INFINITY)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 	return

 /datum/species/proc/handle_post_spawn(var/mob/living/carbon/C) //Handles anything not already covered by basic species assignment.
@@ -554,6 +548,7 @@
 	unarmed_type = /datum/unarmed_attack/punch

 	flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS | NO_SCAN
+	bodyflags = HAS_SKIN_COLOR
 	bloodflags = BLOOD_SLIME

 	has_organ = list(
@@ -561,14 +556,6 @@
 		)


-/datum/species/slime/handle_post_spawn(var/mob/living/carbon/human/H)
-	H.dna = new /datum/dna(null)
-	H.dna.real_name = H.real_name
-	H.dna.species = H.species.name
-	H.dna.mutantrace = "slime"
-
-	..()
-
 /datum/species/grey
 	name = "Grey"
 	icobase = 'icons/mob/human_races/r_grey.dmi'
@@ -254,10 +254,6 @@ datum/preferences
 			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
 			eyes_s.Blend(facial_s, ICON_OVERLAY)

-		//Slime People Overlays
-		if(current_species && (current_species.bloodflags & BLOOD_SLIME))
-			var/icon/temp = new/icon("icon" = 'icons/effects/slimemutant.dmi', "icon_state" = "[slime_color]_slime[fat]_[gender]_s")
-			preview_icon.Blend(temp, ICON_OVERLAY)

 		var/icon/underwear_s = null
 		if(underwear > 0 && underwear < 7 && current_species.flags & HAS_UNDERWEAR)
@@ -104,7 +104,8 @@
 			M << "\red Your meaty finger is much too large for the trigger guard!"
 			return
 	if(ishuman(user))
-		if(user.dna && user.dna.mutantrace == "adamantine")
+		var/mob/living/carbon/human/H = user
+		if(H.species.name == "Golem")
 			user << "\red Your metal fingers don't fit in the trigger guard!"
 			return

@@ -128,7 +129,7 @@

 	if(!in_chamber)
 		return
-		
+
 	if(heavy_weapon)
 		if(user.get_inactive_hand())
 			recoil = 4 //one-handed kick
@@ -154,7 +155,7 @@
 		user.visible_message("<span class='warning'>[user] fires [src][reflex ? " by reflex":""]!</span>", \
 		"<span class='warning'>You fire [src][reflex ? "by reflex":""]!</span>", \
 		"You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")
-		
+
 	if(heavy_weapon)
 		if(user.get_inactive_hand())
 			if(prob(15))
@@ -210,15 +210,11 @@ proc/wabbajack(mob/living/M)
 					new_mob.universal_speak = 1
 				if("human")
 					new_mob = new /mob/living/carbon/human/human(M.loc)
-
+					var/mob/living/carbon/human/H = new_mob
+					H.set_species(pick(all_species))
 					var/datum/preferences/A = new()	//Randomize appearance for the human
 					A.copy_to(new_mob)

-					var/mob/living/carbon/human/human/H = new_mob
-//					ready_dna(H)
-					if(H.dna)
-						H.dna.mutantrace = pick("lizard","golem","slime","plant","fly","shadow","adamantine","skeleton",8;"")
-						H.update_body()
 				else
 					return

@@ -96,7 +96,6 @@

 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/living/M = target
-//		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
 		if(ishuman(target))
 			var/mob/living/carbon/human/H = M
 			if((H.species.flags & IS_PLANT) && (M.nutrition < 500))
@@ -136,7 +135,6 @@

 	on_hit(var/atom/target, var/blocked = 0)
 		var/mob/M = target
-//		if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //These rays make plantmen fat.
 		if(ishuman(target)) //These rays make plantmen fat.
 			var/mob/living/carbon/human/H = M
 			if((H.species.flags & IS_PLANT) && (M.nutrition < 500))
@@ -359,16 +359,17 @@ datum
 				if(!M) M = holder.my_atom
 				if(ishuman(M))
 					var/mob/living/carbon/human/human = M
-					if(human.dna.mutantrace == null)
+					if(human.species.name != "Shadow")
 						M << "\red Your flesh rapidly mutates!"
 						M << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
 						M << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
 						M << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
-						human.dna.mutantrace = "shadow"
-						human.update_mutantrace()
+						human.set_species("Shadow")
 				..()
 				return

+
+
 		aslimetoxin
 			name = "Advanced Mutation Toxin"
 			id = "amutationtoxin"
@@ -604,7 +604,7 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu
 		if(ismonkey(M))
 			var/mob/living/carbon/monkey/MO = M
 			if(MO.dna)
-				if(MO.dna.mutantrace == "plant") //plantmen monkeys (diona) take EVEN MORE damage
+				if(istype(MO,/mob/living/carbon/monkey/diona)) //plantmen monkeys (diona) take EVEN MORE damage
 					MO.adjustToxLoss(100)
 					..()
 					return