diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index 5087d609dc..8a2af78031 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -639,7 +639,7 @@ Auto Patrol: []"},
 			if(istype(perp:wear_suit, /obj/item/clothing/suit/wizrobe))
 				threatcount += 2
 
-			if(perp.mutantrace != "none")
+			if(perp.mutantrace && perp.mutantrace != "none")
 				threatcount += 2
 
 	//Agent cards lower threatlevel when normal idchecking is off.
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 5f01a67e12..e307b82e8e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -703,7 +703,7 @@
 				src.sight &= ~SEE_TURFS
 				src.sight &= ~SEE_MOBS
 				src.sight &= ~SEE_OBJS
-				if (src.mutantrace == "lizard")
+				if (src.mutantrace == "lizard" || src.mutantrace == "metroid")
 					src.see_in_dark = 3
 					src.see_invisible = 1
 				else if (src.druggy) // If drugged~
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 05d8ba3dd9..fc4760996b 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -2,6 +2,12 @@
 	if(src.mutantrace == "lizard")
 		if(copytext(message, 1, 2) != "*")
 			message = dd_replaceText(message, "s", stutter("ss"))
+	if(src.mutantrace == "metroid" && prob(5))
+		if(copytext(message, 1, 2) != "*")
+			message = "SKR"
+			var/imax = rand(5,20)
+			for(var/i = 0,i<imax,i++)
+				message += "E"
 	if(istype(src.virus, /datum/disease/pierrot_throat))
 		var/list/temp_message = dd_text2list(message, " ")
 		var/list/pick_list = list()
diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi
index 3580254ea8..35352b1446 100644
Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index d0b336a9f0..2bc7aa06ff 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ