AGHHHHHHHHHHHHHHHHHHH WHATTT

code/modules/projectiles/projectile.dm

@@ -83,7 +83,7 @@
 				var/blood_color = "#C80000"
 				if(ishuman(target))
 					H = target
-					blood_color = H.species.blood_color
+					blood_color = H.dna.species.blood_color
 				new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, blood_color)
 			if(prob(33))
 				var/list/shift = list("x" = 0, "y" = 0)

code/modules/projectiles/projectile/magic.dm

@@ -225,20 +225,17 @@ proc/wabbajack(mob/living/M)
 							else			new_mob = new /mob/living/simple_animal/chick(M.loc)
 					new_mob.universal_speak = 1
 				if("human")
-					new_mob = new /mob/living/carbon/human/human(M.loc)
+					new_mob = new /mob/living/carbon/human(M.loc)
 					// Include standard, whitelisted, and monkey species...
-					var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona","Vulpkanin")
-					new_species |= whitelisted_species
-					for(var/SN in all_species)
-						var/datum/species/S = all_species[SN]
-						if(S.greater_form) // Monkeys
-							new_species |= SN
-					new_species -= "Vox Armalis" // ... but not Armalis. They're not really designed to be playable
-					new_species |= "Golem" // Also, golems, sure, why not
-					var/picked_species = pick(new_species)
+					var/list/new_species = list()
+					for(var/datum/species/S in subtypesof(/datum/species))
+						if(istype(S, /datum/species/vox/armalis))
+							continue
+						new_species.Add(S)
 					var/mob/living/carbon/human/H = new_mob
-					H.set_species(picked_species)
-					randomize = picked_species
+					var/datum/species/S = pick(new_species)
+					H.set_species(S)
+					randomize = initial(S.name)
 					var/datum/preferences/A = new()	//Randomize appearance for the human
 					A.copy_to(new_mob)
 				else

code/modules/projectiles/projectile/special.dm

@@ -133,7 +133,7 @@
 	var/mob/living/M = target
 	if(ishuman(target))
 		var/mob/living/carbon/human/H = M
-		if(IS_PLANT in H.species.species_traits)
+		if(IS_PLANT in H.dna.species.species_traits)
 			if(prob(15))
 				M.apply_effect((rand(30,80)),IRRADIATE)
 				M.Weaken(5)
@@ -166,7 +166,7 @@
 	var/mob/M = target
 	if(ishuman(target)) //These rays make plantmen fat.
 		var/mob/living/carbon/human/H = M
-		if(IS_PLANT in H.species.species_traits)
+		if(IS_PLANT in H.dna.species.species_traits)
 			H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
 	else if(iscarbon(target))
 		M.show_message("<span class='notice'>The radiation beam dissipates harmlessly through your body.</span>")