Merge pull request #6612 from Crazylemon64/partial_cloning

Cloning now puts you together bit by bit

code/modules/reagents/chemistry/reagents/disease.dm

@@ -141,11 +141,11 @@
 	can_synth = 0
 
 /datum/reagent/concentrated_initro/on_mob_life(mob/living/M)
-	if(volume >=5)
+	if(volume >= 5)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.heart_attack)
-				H.heart_attack = 1 // rip in pepperoni
+			if(!H.undergoing_cardiac_arrest())
+				H.set_heartattack(TRUE) // rip in pepperoni
 
 //virus foods
 
@@ -183,4 +183,4 @@
 /datum/reagent/plasma_dust/plasmavirusfood/weak
 	name = "weakened virus plasma"
 	id = "weakplasmavirusfood"
-	color = "#CEC3C6" // rgb: 206,195,198
+	color = "#CEC3C6" // rgb: 206,195,198

code/modules/reagents/chemistry/reagents/food.dm

@@ -772,8 +772,8 @@
 		M.Weaken(1)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.heart_attack)
-				H.heart_attack = 1
+			if(!H.undergoing_cardiac_arrest())
+				H.set_heartattack(TRUE)
 	..()
 
 /datum/reagent/fungus
@@ -847,7 +847,7 @@
 	if(volume >= 5 && !istype(T, /turf/space))
 		new /obj/effect/decal/cleanable/vomit/green(T)
 		playsound(T, 'sound/effects/splat.ogg', 50, 1, -3)
-		
+
 ////Lavaland Flora Reagents////
 
 /datum/reagent/consumable/entpoly
@@ -878,7 +878,7 @@
 	if(!light_activated)
 		M.set_light(2)
 		light_activated = 1
-	..()	
+	..()
 
 /datum/reagent/consumable/tinlux/on_mob_delete(mob/living/M)
 	M.set_light(0)
@@ -894,4 +894,4 @@
 	if(prob(80))
 		M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
 		M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
-	..()
+	..()

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -1023,3 +1023,11 @@
 /datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
 	M.SetHallucinate(min(max(0, M.hallucination + 10), 50))
 	M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER)
+
+/datum/reagent/medicine/corazone
+	name = "Corazone"
+	id = "corazone"
+	description = "A medication used to treat pain, fever, and inflammation, along with heart attacks."
+	color = "#F5F5F5"
+
+// This reagent's effects are handled in heart attack handling code

code/modules/reagents/chemistry/reagents/toxins.dm

@@ -648,8 +648,8 @@
 		M.Weaken(2)
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
-			if(!H.heart_attack)
-				H.heart_attack = 1 // rip in pepperoni
+			if(!H.undergoing_cardiac_arrest())
+				H.set_heartattack(TRUE) // rip in pepperoni
 	..()
 
 /datum/reagent/pancuronium
@@ -1090,4 +1090,4 @@
 		shock_timer = 0
 		M.electrocute_act(rand(5,20), "Teslium in their body", 1, 1) //Override because it's caused from INSIDE of you
 		playsound(M, "sparks", 50, 1)
-	..()
+	..()

code/modules/reagents/chemistry/recipes/medicine.dm

@@ -271,4 +271,11 @@
 	required_reagents = list("ethanol" = 1, "copper" = 1, "silver" = 1)
 	result_amount = 3
 	min_temp = 370
-	mix_message = "The solution gently swirls with a metallic sheen."
+	mix_message = "The solution gently swirls with a metallic sheen."
+
+/datum/chemical_reaction/corazone
+	name = "Corazone"
+	id = "corazone"
+	result = "corazone"
+	result_amount = 3
+	required_reagents = list("phenol" = 2, "lithium" = 1)