From a09352d333d2f41ebb99c73b4401c0eae2960af8 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:17:01 +0100 Subject: [PATCH 01/15] Added Cordrazine and Pyroxadone Cordrazine rapidly wakes up patients and stimulates their brain, while Pyroxadone is basically a stronger version of Cryoxadone which only works in very high temperatures --- .../Chemistry-Reagents-Medicine.dm | 49 +++++++++++++++++-- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index b7b29c4235f93..0cf5228ad325f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1,8 +1,31 @@ +//TODO: Stenophyl + +/datum/reagent/cordrazine + name = "Cordrazine" + id = "cordrazine" + description = "Cordrazine is a fast-acting cardiac and synaptic stimulant, useful for waking up comatose patients, and combating minor cardiac conditions." + reagent_state = LIQUID + color = "#8A0808" + overdose = REAGENTS_OVERDOSE + metabolism = REM * 3 + scannable = 1 + +/datum/reagent/cordrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(alien != IS_DIONA) + M.AdjustParalysis(-2) + M.AdjustWeakened(-2) + M.AdjustStunned(-2) + M.drowsyness = max(M.drowsyness - 10, 0) + if(prob(50)) + M.heart_attack = 0 + if (prob(50)) + M.cardiac_arrest = 0 + /datum/reagent/chloromydride name = "Chloromydride" id = "chloromydride" - description = "Chloromydride is a strong cardiac stimulant, usually used for cardiac arrest. Be warned, however - It has dangerous side effects." + description = "Chloromydride is an incredibly strong cardiac stimulant, usually used for cardiac arrest. Be warned, however - It has dangerous side effects." reagent_state = LIQUID color = "#F600FA" overdose = 15 @@ -12,12 +35,13 @@ /datum/reagent/chloromydride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien != IS_DIONA) M.add_chemical_effect(CE_STABLE) - M.add_chemical_effect(CE_PAINKILLER, 40) + M.add_chemical_effect(CE_PAINKILLER, 50) M.AdjustParalysis(-1) M.AdjustWeakened(-1) - M.AdjustStunned(-1) M.adjustToxLoss(removed * 5) - M.adjustOxyLoss(-30 * removed) + M.adjustOxyLoss(-40 * removed) + M.heart_attack = 0 + M.cardiac_arrest = 0 /datum/reagent/inaprovaline @@ -35,7 +59,6 @@ M.add_chemical_effect(CE_STABLE) M.add_chemical_effect(CE_PAINKILLER, 25) - /datum/reagent/bicaridine name = "Bicaridine" id = "bicaridine" @@ -179,6 +202,22 @@ M.adjustOxyLoss(-10 * removed) M.heal_organ_damage(10 * removed, 10 * removed) M.adjustToxLoss(-10 * removed) + +/datum/reagent/pyroxadone + name = "Pyroxadone" + id = "pyroxadone" + description = "A powerful chemical substance that rapidly heals and the body, while at very high temperatures. Don't mix this up with Cryoxadone!" + reagent_state = LIQUID + color = "#8080FF" + metabolism = REM * 0.5 + scannable = 1 + +/datum/reagent/pyroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(M.bodytemperature > 420) + M.adjustCloneLoss(-10 * removed) + M.adjustOxyLoss(-20 * removed) + M.heal_organ_damage(20 * removed, 20 * removed) + M.adjustToxLoss(-10 * removed) /datum/reagent/clonexadone name = "Clonexadone" From 7ab7a332ca145dc2f9c62e7eb258590b67bd724d Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:24:27 +0100 Subject: [PATCH 02/15] Added Cordrazine and Pyroxadone --- code/modules/reagents/Chemistry-Recipes.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index df024794b7d49..355f76738707b 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -32,7 +32,7 @@ name = "Cordrazine" id = "cordrazine" result = "cordrazine" - required_reagents = list("lithium" = 1, "inaprovaline" = 1, "nitrogen" = 1) + required_reagents = list("lithium" = 1, "synaptizine" = 1, "nitrogen" = 1) result_amount = 3 /datum/chemical_reaction/dylovene @@ -259,6 +259,13 @@ result = "cryoxadone" required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1) result_amount = 3 + +/datum/chemical_reaction/pyroxadone + name = "Pyroxadone" + id = "pyroxadone" + result = "pyroxadone" + required_reagents = list("cryoxadone" = 1, "phosphorus" = 1, "sulfur" = 1) + result_amount = 3 /datum/chemical_reaction/clonexadone name = "Clonexadone" From 3de9e1947a9d57ae05a86aae01660d7fb13e2125 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:25:50 +0100 Subject: [PATCH 03/15] REM adjustment --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 0cf5228ad325f..9abb3b7fbc5c6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -7,7 +7,7 @@ reagent_state = LIQUID color = "#8A0808" overdose = REAGENTS_OVERDOSE - metabolism = REM * 3 + metabolism = REM * 5 scannable = 1 /datum/reagent/cordrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) From 896af1aee029a7161416e881b9ca20d82fa0b89d Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:31:05 +0100 Subject: [PATCH 04/15] Bodytemp adjustment and grammar --- .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 9abb3b7fbc5c6..5a98ba5e54613 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -206,14 +206,14 @@ /datum/reagent/pyroxadone name = "Pyroxadone" id = "pyroxadone" - description = "A powerful chemical substance that rapidly heals and the body, while at very high temperatures. Don't mix this up with Cryoxadone!" + description = "A powerful chemical substance that rapidly heals the body, while at very high temperatures. Perfect for fire-related patients." reagent_state = LIQUID color = "#8080FF" metabolism = REM * 0.5 scannable = 1 /datum/reagent/pyroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.bodytemperature > 420) + if(M.bodytemperature > 400) M.adjustCloneLoss(-10 * removed) M.adjustOxyLoss(-20 * removed) M.heal_organ_damage(20 * removed, 20 * removed) From a53e38aab884c1ee4fc47ea54209fd5087df50e6 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:31:48 +0100 Subject: [PATCH 05/15] Revert --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 5a98ba5e54613..cacf523f80f80 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -213,7 +213,7 @@ scannable = 1 /datum/reagent/pyroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.bodytemperature > 400) + if(M.bodytemperature > 420) M.adjustCloneLoss(-10 * removed) M.adjustOxyLoss(-20 * removed) M.heal_organ_damage(20 * removed, 20 * removed) From e6c053e907f6c41dd7729f9a7c1a353e48162b92 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:37:51 +0100 Subject: [PATCH 06/15] Cordrazine pill. --- code/modules/reagents/reagent_containers/pill.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 9b068098ad927..63cfa587a15c1 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -105,14 +105,13 @@ ..() reagents.add_reagent("anti_toxin", 25) -/obj/item/weapon/reagent_containers/pill/synaptezine - name = "Synaptezine pill" - desc = "Treats paralysis and weakness, along with other conditions associated with the mind." +/obj/item/weapon/reagent_containers/pill/cordrazine + name = "Cordrazine pill" + desc = "Rapidly treats paralysis and weakness, while stimulating the mind and heart. Useful for waking people up." icon_state = "pill8" New() ..() - reagents.add_reagent("synaptezine", 2) - reagents.add_reagent("dylovene", 5) + reagents.add_reagent("cordrazine", 15) /obj/item/weapon/reagent_containers/pill/tox name = "Toxins pill" From 88f6292df5dffa83b5496152d4e9baeadcda5721 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:52:17 +0100 Subject: [PATCH 07/15] WIP Cordrazine autoinjector Just needs a sprite --- .../reagents/reagent_containers/hypospray.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index a2ae1ebaad858..fd67d9fde75c2 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -73,3 +73,17 @@ user << "It is currently loaded." else user << "It is spent." + +/obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine + name = "Cordrazine autoinjector" + desc = "This autoinjector contains a small amount of cordrazine, a chemical which rapidly combats paralysis and weakness in the patient. Use this to wake patients up after surgery." + icon_state = "autoinjectorc" //Sprite coming later today + item_state = "autoinjectorc" //s + amount_per_transfer_from_this = 5 + volume = 5 + +/obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine/New() + ..() + reagents.add_reagent("cordrazine", 5) + update_icon() + return From 7f32e91a70e9903866813ff65ab736b38249260e Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 12:53:48 +0100 Subject: [PATCH 08/15] Anaesthetic tank phaseout prt 2 --- .../structures/crates_lockers/closets/secure/medical.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 1beefbf8534d7..18e841e174cb2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -44,9 +44,8 @@ new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) - new /obj/item/weapon/tank/anesthetic(src) - new /obj/item/weapon/tank/anesthetic(src) - new /obj/item/clothing/mask/breath/medical(src) + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine(src) //only two since it's so easy to get more + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine(src) return From 7e5b4d545127f8ab748a6e6d329b9061447d77d9 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:03:55 +0100 Subject: [PATCH 09/15] Quantity adjustment --- .../structures/crates_lockers/closets/secure/medical.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 18e841e174cb2..e8379053def24 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -40,13 +40,16 @@ New() ..() + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine(src) //only two since it's so easy to get more - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine(src) return + From 08b2a3318d743f3c09540dbb337649ec9ff3b3c8 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:08:45 +0100 Subject: [PATCH 10/15] Gave the closets one tank each Gave the closets an oxygen tank, both to replace the oxygen that used to be in anesthetic tanks, and for the upcoming ventilator system --- .../structures/crates_lockers/closets/secure/medical.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index e8379053def24..348546ab1ab52 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -40,11 +40,11 @@ New() ..() + new /obj/item/weapon/tank/oxygen(src) + new /obj/item/clothing/mask/breath/medical(src) new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine - new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) new /obj/item/weapon/reagent_containers/syringe/melorazine(src) From 0a6b45b5ab18b25694a3fccbb3d61749360b0387 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:14:25 +0100 Subject: [PATCH 11/15] Modified some values, added a comment --- .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index cacf523f80f80..7b858213ab4c1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -206,18 +206,18 @@ /datum/reagent/pyroxadone name = "Pyroxadone" id = "pyroxadone" - description = "A powerful chemical substance that rapidly heals the body, while at very high temperatures. Perfect for fire-related patients." + description = "A powerful chemical substance that rapidly heals the body, while at very high temperatures. Rise from the flames, stronger than before.." reagent_state = LIQUID color = "#8080FF" metabolism = REM * 0.5 scannable = 1 /datum/reagent/pyroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.bodytemperature > 420) + if(M.bodytemperature > 420) //The body starts taking damage from fever and such at 360. This should ensure that they only get the healing if they're actually on fire or were in a very hot environment. M.adjustCloneLoss(-10 * removed) M.adjustOxyLoss(-20 * removed) - M.heal_organ_damage(20 * removed, 20 * removed) - M.adjustToxLoss(-10 * removed) + M.heal_organ_damage(30 * removed, 30 * removed) + M.adjustToxLoss(-20 * removed) /datum/reagent/clonexadone name = "Clonexadone" From 0cf350c2732587fce8c8790dcc2ee31d27a92cca Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:20:59 +0100 Subject: [PATCH 12/15] Added some remove_reagents --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 7b858213ab4c1..2659962d78a90 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -21,6 +21,8 @@ if (prob(50)) M.cardiac_arrest = 0 + holder.remove_reagent("melorazine", 2 * removed) //to make it better at countering Melorazine + holder.remove_reagent("stoxin", 2 * removed) /datum/reagent/chloromydride name = "Chloromydride" From cff9c7b154e06cd6c313f7ff09b3ec42760e7f77 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:27:06 +0100 Subject: [PATCH 13/15] Cordrazine comments and adjustments --- .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 2659962d78a90..8ae496edea19c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -7,7 +7,7 @@ reagent_state = LIQUID color = "#8A0808" overdose = REAGENTS_OVERDOSE - metabolism = REM * 5 + metabolism = REM * 3 scannable = 1 /datum/reagent/cordrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) @@ -16,7 +16,7 @@ M.AdjustWeakened(-2) M.AdjustStunned(-2) M.drowsyness = max(M.drowsyness - 10, 0) - if(prob(50)) + if(prob(50)) //Has a 50% chance of healing a minor heart attack, then another 50% chance of healing cardiac arrest M.heart_attack = 0 if (prob(50)) M.cardiac_arrest = 0 @@ -40,7 +40,7 @@ M.add_chemical_effect(CE_PAINKILLER, 50) M.AdjustParalysis(-1) M.AdjustWeakened(-1) - M.adjustToxLoss(removed * 5) + M.adjustToxLoss(removed * 5) //all of this wonder needs a tradeoff, right? M.adjustOxyLoss(-40 * removed) M.heart_attack = 0 M.cardiac_arrest = 0 From 2218cd519a5a60ac4d6a43080c6281d9582b547b Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:40:31 +0100 Subject: [PATCH 14/15] Small adjustments --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 8ae496edea19c..e29c08db43b98 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -40,7 +40,7 @@ M.add_chemical_effect(CE_PAINKILLER, 50) M.AdjustParalysis(-1) M.AdjustWeakened(-1) - M.adjustToxLoss(removed * 5) //all of this wonder needs a tradeoff, right? + M.adjustToxLoss(removed * 6) //all of this wonder needs a tradeoff, right? M.adjustOxyLoss(-40 * removed) M.heart_attack = 0 M.cardiac_arrest = 0 From 257554b90316a728e2f5b80e23c7061cde7126f9 Mon Sep 17 00:00:00 2001 From: BlueNexus Date: Mon, 31 Aug 2015 13:49:23 +0100 Subject: [PATCH 15/15] The "I hope you like cordrazine" update --- code/game/machinery/vending.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 5d290a6aa4871..24825ff83ac75 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -793,7 +793,8 @@ /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12, /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, - /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2) + /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine = 3) contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. @@ -814,7 +815,7 @@ icon_deny = "wallmed-deny" req_access = list(access_medical) density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude - products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 4,/obj/item/device/healthanalyzer = 1) + products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 4,/obj/item/weapon/reagent_containers/hypospray/autoinjector/cordrazine = 2,/obj/item/device/healthanalyzer = 1) contraband = list(/obj/item/weapon/reagent_containers/syringe/antitoxin = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1) /obj/machinery/vending/wallmed2