diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 0f267aa311..8b90339b02 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -387,3 +387,35 @@
 	materials = list(MAT_METAL = 500, MAT_GLASS = 500)
 	build_path = /obj/item/weapon/implantcase/track
 	category = list("Medical Designs")
+
+//Cybernetic organs
+
+/datum/design/cybernetic_liver
+	name = "Cybernetic Liver"
+	desc = "A cybernetic liver"
+	id = "cybernetic_liver"
+	req_tech = list("biotech" = 4, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+	build_path = /obj/item/organ/liver/cybernetic
+	category = list("Medical Designs")
+
+/datum/design/cybernetic_heart
+	name = "Cybernetic Heart"
+	desc = "A cybernetic heart"
+	id = "cybernetic_heart"
+	req_tech = list("biotech" = 4, "materials" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+	build_path = /obj/item/organ/heart/cybernetic
+	category = list("Medical Designs")
+
+/datum/design/cybernetic_liver_u
+	name = "Upgraded Cybernetic Liver"
+	desc = "An upgraded cybernetic liver"
+	id = "cybernetic_liver_u"
+	req_tech = list("biotech" = 5, "materials" = 5, "plasmatech" = 5)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+	build_path = /obj/item/organ/liver/cybernetic/upgraded
+	category = list("Medical Designs")
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 9c19826fc5..ee1454b20f 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -1,5 +1,6 @@
 /obj/item/organ/heart
 	name = "heart"
+	desc = "I feel bad for the heartless bastard who lost this."
 	icon_state = "heart-on"
 	zone = "chest"
 	slot = "heart"
@@ -142,3 +143,12 @@
 /datum/client_colour/cursed_heart_blood
 	priority = 100 //it's an indicator you're dieing, so it's very high priority
 	colour = "red"
+
+/obj/item/organ/heart/cybernetic
+	name = "cybernetic heart"
+	desc = "An electronic device designed to mimic the functions of an organic human heart. Offers no benefit over an organic heart other than being easy to make."
+	icon_state = "heart-c"
+	origin_tech = "biotech=5"
+
+/obj/item/organ/heart/cybernetic/emp_act()
+	Stop()
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index a1cdd40bfc..eae5e8aee8 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -64,3 +64,25 @@
 	icon_state = "pliver"
 	desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen."
 
+/obj/item/organ/liver/cybernetic
+	name = "cybernetic liver"
+	icon_state = "liver-c"
+	desc = "An electronic device designed to mimic the functions of a human liver. It has no benefits over an organic liver, but is easy to produce."
+	origin_tech = "biotech=4"
+
+/obj/item/organ/liver/cybernetic/upgraded
+	name = "upgraded cybernetic liver"
+	icon_state = "liver-c-u"
+	desc = "An upgraded version of the cybernetic liver, designed to improve upon organic livers. It is resistant to alcohol poisoning and is very robust at filtering toxins."
+	origin_tech = "biotech=6"
+	alcohol_tolerance = 0.001
+	maxHealth = 200 //double the health of a normal liver
+	toxTolerance = 15 //can shrug off up to 15u of toxins
+	toxLethality = 0.3 //20% less damage than a normal liver
+
+/obj/item/organ/liver/cybernetic/emp_act(severity)
+	switch(severity)
+		if(1)
+			damage+=100
+		if(2)
+			damage+=50
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
old mode 100644
new mode 100755
index 78657abe36..3753cc6e11
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ