Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm

code/modules/projectiles/projectile/magic.dm

@@ -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
 

code/modules/projectiles/projectile/special.dm

@@ -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))