Merge pull request #8190 from xxalpha/cyberimplants

Cybernetic Implants

code/datums/hud.dm

@@ -20,6 +20,8 @@ var/datum/atom_hud/huds = list( \
 	var/list/hud_icons = list() //these will be the indexes for the atom's hud_list
 
 /datum/atom_hud/proc/remove_hud_from(var/mob/M)
+	if(src in M.permanent_huds)
+		return
 	for(var/atom/A in hudatoms)
 		remove_from_single_hud(M, A)
 	hudusers -= M

code/datums/mutations.dm

@@ -182,6 +182,8 @@
 
 /datum/mutation/human/x_ray/on_losing(mob/living/carbon/human/owner)
 	if(..())	return
+	if((SEE_MOBS in owner.permanent_sight_flags) && (SEE_OBJS in owner.permanent_sight_flags) && (SEE_TURFS in owner.permanent_sight_flags)) //Xray flag combo
+		return
 	owner.see_in_dark = initial(owner.see_in_dark)
 	owner.sight = initial(owner.sight)