diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 097a762bbb0..5befc866498 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -727,7 +727,7 @@ client
 			usr << "This can only be done to instances of type /mob/living/carbon/human"
 			return
 
-		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","metroid","plant")
+		var/new_mutantrace = input("Please choose a new mutantrace","Mutantrace",null) as null|anything in list("NONE","golem","lizard","metroid","plant","shadow")
 		switch(new_mutantrace)
 			if(null)		return
 			if("NONE")		new_mutantrace = ""
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 8b1b0030ae0..3fbcdf44e21 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -773,6 +773,18 @@
 				heal_overall_damage(1,1)
 				adjustToxLoss(-1)
 				adjustOxyLoss(-1)
+		if(dna && dna.mutantrace == "shadow")
+			var/light_amount = 0
+			if(isturf(loc))
+				var/turf/T = loc
+				var/area/A = T.loc
+				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
+				take_overall_damage(2,1)
+			else if (light_amount < 2) //heal in the dark
+				heal_overall_damage(1,1)
 
 		//The fucking FAT mutation is the dumbest shit ever. It makes the code so difficult to work with
 		if(FAT in mutations)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index db754f0c8b8..8937f688183 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -323,7 +323,7 @@ Please contact me on #coderbus IRC. ~Carn x
 
 	if(dna)
 		switch(dna.mutantrace)
-			if("lizard","golem","metroid")
+			if("lizard","golem","metroid","shadow")
 				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_l")
 				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_s")
 			if("plant")
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
index 9e4986b20f0..2be47a5fab0 100644
Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ