diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 35f48740219..0582b92be67 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -402,7 +402,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 					if("kidneys")
 						organ_name = "kidneys"
 
-				if(status in list("cyborg", "amputated", "mechanical"))
+				if(status in list("cyborg", "amputated", "cybernetic"))
 					++ind
 					if(ind > 1) dat += ", "
 
@@ -416,8 +416,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						dat += "\t[R.company] [organ_name] prosthesis"
 					if("amputated")
 						dat += "\tAmputated [organ_name]"
-					if("mechanical")
-						dat += "\tMechanical [organ_name]"
+					if("cybernetic")
+						dat += "\tCybernetic [organ_name]"
 			if(!ind)	dat += "\[...\]<br>"
 			else		dat += "<br>"
 
@@ -1898,14 +1898,14 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						if("Kidneys")
 							organ = "kidneys"
 
-					var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal", "Mechanical")
+					var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal", "Cybernetic")
 					if(!new_state) return
 
 					switch(new_state)
 						if("Normal")
 							organ_data[organ] = null
-						if("Mechanical")
-							organ_data[organ] = "mechanical"
+						if("Cybernetic")
+							organ_data[organ] = "cybernetic"
 
 				if("clientfps")
 					var/version_message
@@ -2150,7 +2150,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		else
 			var/obj/item/organ/internal/I = character.get_int_organ_tag(name)
 			if(I)
-				if(status == "mechanical")
+				if(status == "cybernetic")
 					I.robotize()
 
 	character.dna.b_type = b_type
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 01032bc4806..bce0f0f8046 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -68,7 +68,6 @@
 
 /obj/item/organ/internal/eyes/robotize()
 	colourmatrix = null
-	dark_view = 2
 	..() //Make sure the organ's got the robotic status indicators before updating the client colour.
 	if(owner)
 		owner.update_client_colour(0) //Since mechanical eyes give dark_view of 2 and full colour vision atm, just having this here is fine.
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 98333a54836..6b5f84d09f0 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -347,7 +347,7 @@
 	if(emp_proof)
 		return
 	if(owner)
-		owner.losebreath = 20
+		owner.LoseBreath(20)
 
 
 /obj/item/organ/internal/lungs/cybernetic/upgraded
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index aaa2e0f7479..4858435cc5f 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -134,19 +134,19 @@
 
 // Brain is defined in brain_item.dm.
 
-/obj/item/organ/internal/robotize() //If icon bypass isn't null, skip the processing here and go straight to the parent call.
-	if(!is_robotic()) //Don't override the icons for the already-mechanical IPC organs.
+/obj/item/organ/internal/robotize()
+	if(!is_robotic())
 		var/list/states = icon_states('icons/obj/surgery.dmi') //Insensitive to specially-defined icon files for species like the Drask or whomever else. Everyone gets the same robotic heart.
-		if(slot == "heart" && ("[slot]-prosthetic-on" in states) && ("[slot]-prosthetic-off" in states)) //Give the robotic heart its robotic heart icons if they exist.
+		if(slot == "heart" && ("[slot]-c-on" in states) && ("[slot]-c-off" in states)) //Give the robotic heart its robotic heart icons if they exist.
 			var/obj/item/organ/internal/heart/H = src
 			H.icon = icon('icons/obj/surgery.dmi')
-			H.icon_base = "[slot]-prosthetic"
-			H.dead_icon = "[slot]-prosthetic-off"
+			H.icon_base = "[slot]-c"
+			H.dead_icon = "[slot]-c-off"
 			H.update_icon()
-		else if("[slot]-prosthetic" in states) //Give the robotic organ its robotic organ icons if they exist.
+		else if("[slot]-c" in states) //Give the robotic organ its robotic organ icons if they exist.
 			icon = icon('icons/obj/surgery.dmi')
-			icon_state = "[slot]-prosthetic"
-		name = "mechanical [slot]"
+			icon_state = "[slot]-c"
+		name = "cybernetic [slot]"
 	..() //Go apply all the organ flags/robotic statuses.
 
 /obj/item/organ/internal/appendix
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 38ce02767d7..b3723f9a53d 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ