From bde048ac1f6030c62ac21c8a729464dcfbefe325 Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Mon, 24 Aug 2020 06:57:08 -0500
Subject: [PATCH] Pneumalin and Adipemcina fix organ damage (#9750)

---
 .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm    | 9 +++++++--
 html/changelogs/doxxmedearly - medfix.yml                | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/doxxmedearly - medfix.yml

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
index 7f86e4b3725..7e554453050 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
@@ -1193,7 +1193,9 @@
 	H.add_chemical_effect(CE_PULSE, -1)
 
 	var/obj/item/organ/internal/lungs/L = H.internal_organs_by_name[BP_LUNGS]
-	L.rescued = FALSE
+	if(istype(L) && !BP_IS_ROBOTIC(L))
+		L.rescued = FALSE
+		L.damage = max(L.damage - (removed * 1.5), 0)
 
 	. = ..()
 
@@ -1269,7 +1271,7 @@
 /datum/reagent/azoth/overdose(var/mob/living/carbon/M, var/alien)
 	M.adjustBruteLoss(5)
 
-/datum/reagent/adipemcina //Based on quinapril
+/datum/reagent/adipemcina
 	name = "Adipemcina"
 	description = "Adipemcina is a complex, organ-regenerative medication that increases the rate at which cells differentiate into myocardial cells. Adipemcina overdoses result in severe liver damage and vomiting."
 	reagent_state = LIQUID
@@ -1280,6 +1282,9 @@
 
 /datum/reagent/adipemcina/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed)
 	M.add_chemical_effect(CE_CARDIOTOXIC, -removed*2)
+	var/obj/item/organ/internal/heart/H = M.internal_organs_by_name[BP_HEART]
+	if(istype(H) && !BP_IS_ROBOTIC(H))
+		H.damage = max(H.damage - (removed * 2), 0)
 	..()
 
 /datum/reagent/adipemcina/overdose(var/mob/living/carbon/human/M, var/alien)
diff --git a/html/changelogs/doxxmedearly - medfix.yml b/html/changelogs/doxxmedearly - medfix.yml
new file mode 100644
index 00000000000..feee04e846b
--- /dev/null
+++ b/html/changelogs/doxxmedearly - medfix.yml	
@@ -0,0 +1,6 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes: 
+  - bugfix: "Pneumalin and adipemcina now properly heal organ damage."