From ee7b0f070bdc6f1d00bdfe85b192e36ad96e4c8f Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Mon, 1 May 2017 05:15:47 -0700
Subject: [PATCH] Integrates corazone properly

---
 .../miniantags/abduction/abduction_gear.dm          |  3 ++-
 code/game/machinery/OpTable.dm                      | 13 +++++++++++++
 code/game/machinery/cloning.dm                      |  2 +-
 code/modules/reagents/chemistry/recipes/medicine.dm |  9 ++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 2a72c4a9b9b..1408e0a87fc 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -588,6 +588,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "bed"
 	no_icon_updates = 1 //no icon updates for this; it's static.
+	injected_reagents = list("corazone")
 
 /obj/structure/closet/abductor
 	name = "alien locker"
@@ -595,4 +596,4 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	icon_state = "abductor"
 	icon_closed = "abductor"
 	icon_opened = "abductoropen"
-	material_drop = /obj/item/stack/sheet/mineral/abductor
\ No newline at end of file
+	material_drop = /obj/item/stack/sheet/mineral/abductor
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index 6a5253b599c..5da2a4b164d 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -14,6 +14,7 @@
 	var/obj/machinery/computer/operating/computer = null
 	buckle_lying = 90
 	var/no_icon_updates = 0 //set this to 1 if you don't want the icons ever changing
+	var/list/injected_reagents = list()
 
 /obj/machinery/optable/New()
 	..()
@@ -30,6 +31,8 @@
 		computer = null
 	if(victim)
 		victim = null
+	injected_reagents.Cut()
+	injected_reagents = null
 	return ..()
 
 /obj/machinery/optable/ex_act(severity)
@@ -97,8 +100,18 @@
 		icon_state = "table2-idle"
 	return 0
 
+/obj/machinery/optable/Crossed(atom/movable/AM)
+	. = ..()
+	if(iscarbon(AM) && LAZYLEN(injected_reagents))
+		to_chat(AM, "<span class='danger'>You feel a series of tiny pricks!</span>")
+
 /obj/machinery/optable/process()
 	check_victim()
+	if(LAZYLEN(injected_reagents))
+		for(var/mob/living/carbon/C in get_turf(src))
+			for(var/chemical in injected_reagents)
+				if(C.reagents.get_reagent_amount(chemical) < 1)
+					C.reagents.add_reagent(chemical, 1)
 
 /obj/machinery/optable/proc/take_victim(mob/living/carbon/C, mob/living/carbon/user as mob)
 	if(C == user)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index af66a54010d..e5c9d1a0804 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -89,7 +89,7 @@
 		connected.pods -= src
 	QDEL_NULL(Radio)
 	QDEL_NULL(countdown)
-	LAZYDESTROYLIST(missing_organs)
+	QDEL_LIST(missing_organs)
 	return ..()
 
 /obj/machinery/clonepod/RefreshParts()
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index 1c22693513f..31547e10c44 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/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."
\ No newline at end of file
+	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)