Standardized Robotic Organ Checking--Removes Mechassited Organs

code/game/objects/items.dm

@@ -465,7 +465,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 		eyes.receive_damage(rand(3,4), 1)
 		if(eyes.damage >= eyes.min_bruised_damage)
 			if(M.stat != 2)
-				if(!(eyes.status & ORGAN_ROBOT) || !(eyes.status & ORGAN_ASSISTED))  //robot eyes bleeding might be a bit silly
+				if(!eyes.is_robotic())  //robot eyes bleeding might be a bit silly
 					to_chat(M, "<span class='danger'>Your eyes start to bleed profusely!</span>")
 			if(prob(50))
 				if(M.stat != DEAD)

code/game/objects/items/devices/scanners.dm

@@ -245,7 +245,7 @@ REAGENT SCANNER
 		user.show_message("<span class='notice'>Subject's pulse: <font color='[H.pulse == PULSE_THREADY || H.pulse == PULSE_NONE ? "red" : "blue"]'>[H.get_pulse(GETPULSE_TOOL)] bpm.</font></span>")
 		var/implant_detect
 		for(var/obj/item/organ/internal/cyberimp/CI in H.internal_organs)
-			if(CI.status == ORGAN_ROBOT)
+			if(CI.is_robotic())
 				implant_detect += "[H.name] is modified with a [CI.name].<br>"
 		if(implant_detect)
 			user.show_message("<span class='notice'>Detected cybernetic modifications:</span>")

code/game/objects/items/stacks/medical.dm

@@ -34,7 +34,7 @@
 			to_chat(user, "<span class='danger'>That limb is missing!</span>")
 			return 1
 
-		if(affecting.status & ORGAN_ROBOT)
+		if(affecting.is_robotic())
 			to_chat(user, "<span class='danger'>This can't be used on a robotic limb.</span>")
 			return 1
 

code/game/objects/items/stacks/nanopaste.dm

@@ -28,7 +28,7 @@
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting)
 
-		if(S && (S.status & ORGAN_ROBOT))
+		if(S && S.is_robotic())
 			if(S.get_damage())
 				S.heal_damage(15, 15, robo_repair = 1)
 				H.updatehealth()

code/game/objects/items/weapons/shards.dm

@@ -45,7 +45,7 @@
 		var/mob/living/carbon/human/H = user
 		if(!H.gloves)
 			var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
-			if(affecting.status & ORGAN_ROBOT)
+			if(affecting.is_robotic())
 				return
 			to_chat(H, "<span class='warning'>[src] cuts into your hand!</span>")
 			if(affecting.receive_damage(force*0.5))
@@ -82,7 +82,7 @@
 				var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
 				if(!affecting)
 					return
-				if(affecting.status & ORGAN_ROBOT)
+				if(affecting.is_robotic())
 					return
 				H.Weaken(3)
 				if(affecting.receive_damage(5, 0))

code/game/objects/items/weapons/tools.dm

@@ -400,7 +400,7 @@
 		if(!S)
 			return
 
-		if(!(S.status & ORGAN_ROBOT) || user.a_intent != INTENT_HELP || S.open == 2)
+		if(!S.is_robotic() || user.a_intent != INTENT_HELP || S.open == 2)
 			return ..()
 
 		if(!isOn())		//why wasn't this being checked already?