diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 76eda425996..251623607fb 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -351,7 +351,6 @@
 										if ("phoron")
 											if(t.air_contents.gas["phoron"] && !t.air_contents.gas["nitrogen"])
 												contents.Add(t.air_contents.gas["phoron"])
-												world << "Phoron check."
 											else
 												contents.Add(0)
 
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 909e5f7211c..732b49a8f3e 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -82,7 +82,7 @@
 			flick("e_flash", M.flash)
 				//Vaurca damage 15/01/16
 			var/mob/living/carbon/human/H = M
-			if(H.species.name == "Vaurca")
+			if(H.species.get_bodytype() == "Vaurca")
 				var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
 				if(!E)
 					return
@@ -154,9 +154,9 @@
 
 /obj/item/device/flash/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0)
 	if(!user || !clown_check(user)) 	return
-	
+
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
-	
+
 	if(broken)
 		user.show_message("<span class='warning'>The [src.name] is broken</span>", 2)
 		return
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 4f7d0316fb4..d6c27db66ee 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -55,7 +55,7 @@
 			M.Weaken(10)
 				//Vaurca damage 15/01/16
 			var/mob/living/carbon/human/H = M
-			if(H.species.name == "Vaurca")
+			if(H.species.get_bodytype() == "Vaurca")
 				var/obj/item/organ/eyes/E = H.internal_organs_by_name["eyes"]
 				if(!E)
 					return
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 16650543c76..a779cfc5ad8 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -282,7 +282,7 @@
 		for(var/obj/item/organ/I in H.internal_organs)
 			I.robotize()
 
-	if(H.species && H.species.name == "Vaurca")
+	if(H.species && H.species.get_bodytype() == "Vaurca")
 		for (var/obj/item/organ/external/E in H.organs)
 			if ((E.status & ORGAN_CUT_AWAY) || (E.status & ORGAN_DESTROYED))
 				continue
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 37741398f2b..33d5410e0fd 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -936,8 +936,8 @@ Note that amputating the affected organ does in fact remove the infection from t
 	if(company)
 		model = company
 		var/datum/robolimb/R = all_robolimbs[company]
-		if(species && !(species.name in R.species_can_use))
-			R = basic_robolimb
+		/*if(species && !(species.name in R.species_can_use && species.get_bodytype() != "Machine"))
+			R = basic_robolimb*/
 		if(R)
 			force_icon = R.icon
 			name = "[R.company] [initial(name)]"
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 73daf815c69..e3a90e4e369 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -322,7 +322,7 @@
 	var/mob/living/carbon/human/H = null
 	if (ishuman(M))
 		H = M //20/1/16 Insulation (vaurca)
-		if(H.species.name == "Vaurca")	return 0
+		if(H.species.get_bodytype() == "Vaurca")	return 0
 	var/area/source_area
 	if(istype(power_source,/area))
 		source_area = power_source
diff --git a/icons/mob/human_races/robotic.dmi b/icons/mob/human_races/robotic.dmi
index 94c4e20aac1..c5b2dae8366 100644
Binary files a/icons/mob/human_races/robotic.dmi and b/icons/mob/human_races/robotic.dmi differ