diff --git a/code/datums/medical_effects.dm b/code/datums/medical_effects.dm
index 73900a56262..afbb820dd5e 100644
--- a/code/datums/medical_effects.dm
+++ b/code/datums/medical_effects.dm
@@ -80,8 +80,8 @@
// ========
/datum/medical_effect/headache
name = "Headache"
- triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
- cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
+ triggers = list("cryoxadone" = 10)
+ cures = list("mannitol", "morphine", "acetaminophen", "hydrocodone")
cure_message = "Your head stops throbbing..."
/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
@@ -97,8 +97,8 @@
// ===========
/datum/medical_effect/bad_stomach
name = "Bad Stomach"
- triggers = list("kelotane" = 30, "dermaline" = 15)
- cures = list("anti_toxin")
+ triggers = list()
+ cures = list()
cure_message = "Your stomach feels a little better now..."
/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
@@ -114,8 +114,8 @@
// ======
/datum/medical_effect/cramps
name = "Cramps"
- triggers = list("anti_toxin" = 30, "tramadol" = 15)
- cures = list("inaprovaline")
+ triggers = list("morphine" = 15)
+ cures = list("epinephrine")
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -133,7 +133,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list("space_drugs" = 10)
- cures = list("inaprovaline")
+ cures = list("epinephrine")
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index ea40af24232..025ef1610f2 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -535,12 +535,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/datum/supply_packs/medical/supplies
name = "Medical Supplies Crate"
- contains = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
- /obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
- /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
- /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
- /obj/item/weapon/reagent_containers/glass/bottle/stoxin,
- /obj/item/weapon/reagent_containers/glass/bottle/stoxin,
+ contains = list(/obj/item/weapon/reagent_containers/glass/bottle/charcoal,
+ /obj/item/weapon/reagent_containers/glass/bottle/charcoal,
+ /obj/item/weapon/reagent_containers/glass/bottle/epinephrine,
+ /obj/item/weapon/reagent_containers/glass/bottle/epinephrine,
+ /obj/item/weapon/reagent_containers/glass/bottle/morphine,
+ /obj/item/weapon/reagent_containers/glass/bottle/morphine,
/obj/item/weapon/reagent_containers/glass/bottle/toxin,
/obj/item/weapon/reagent_containers/glass/bottle/toxin,
/obj/item/weapon/reagent_containers/glass/beaker/large,
diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm
index 7f015327444..8a6d9b11013 100644
--- a/code/game/gamemodes/blob/blobs/factory.dm
+++ b/code/game/gamemodes/blob/blobs/factory.dm
@@ -109,8 +109,8 @@
// Create the reagents to put into the air, s-acid is yellow and stings a little
create_reagents(50)
reagents.add_reagent("condensedcapsaicin", 10)
- reagents.add_reagent("zombiepowder", 25)
- reagents.add_reagent("impedrezene", 15)
+ reagents.add_reagent("neurotoxin2", 25)
+ reagents.add_reagent("haloperidol", 15)
// Attach the smoke spreader and setup/start it.
S.attach(location)
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 21bf8b6c129..3f8984ce1f0 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -274,7 +274,7 @@
/obj/item/clothing/suit/space/changeling/process()
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
- H.reagents.add_reagent("dexalinp", REAGENTS_METABOLISM)
+ H.reagents.add_reagent("perfluorodecalin", REAGENTS_METABOLISM)
/obj/item/clothing/head/helmet/space/changeling
name = "flesh mass"
diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm
index f6721af7f47..469283d1436 100644
--- a/code/game/gamemodes/changeling/powers/panacea.dm
+++ b/code/game/gamemodes/changeling/powers/panacea.dm
@@ -10,9 +10,9 @@
/obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user)
user << "We cleanse impurities from our form."
- user.reagents.add_reagent("ryetalyn", 10)
- user.reagents.add_reagent("hyronalin", 10)
- user.reagents.add_reagent("anti_toxin", 20)
+ user.reagents.add_reagent("mutadone", 10)
+ user.reagents.add_reagent("potass_iodide", 10)
+ user.reagents.add_reagent("charcoal", 20)
if(istype(user, /mob/living/carbon))
var/mob/living/carbon/C = user
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 841916a9a74..fa2b030aeb2 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -68,7 +68,7 @@
src.connected = sleepernew
return
return
-
+
/obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise
if(M.environment_smash)
M.do_attack_animation(src)
@@ -177,7 +177,7 @@
if (src.connected.occupant)
if (src.connected.occupant.stat == DEAD)
usr << "\red \b This person has no life for to preserve anymore. Take them to a department capable of reanimating them."
- else if(src.connected.occupant.health > src.connected.min_health || href_list["chemical"] == "inaprovaline")
+ else if(src.connected.occupant.health > src.connected.min_health || href_list["chemical"] == "epinephrine")
src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"]))
else
usr << "\red \b This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!"
@@ -209,9 +209,9 @@
dir = 8
var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r"
var/mob/living/carbon/human/occupant = null
- var/possible_chems = list(list("inaprovaline", "stoxin", "dexalin", "bicaridine", "kelotane"),
- list("inaprovaline", "stoxin", "dexalinp", "bicaridine", "dermaline", "kelotane", "imidazoline"),
- list("inaprovaline", "stoxin", "dexalinp", "bicaridine", "dermaline", "kelotane", "imidazoline", "anti_toxin", "ryetalyn", "alkysine", "arithrazine"))
+ var/possible_chems = list(list("epinephrine", "morphine", "salbutamol", "styptic_powder"),
+ list("epinephrine", "morphine", "salbutamol", "styptic_powder", "oculine"),
+ list("epinephrine", "smorphine", "salbutamol", "styptic_powder", "oculine", "charcoal", "mutadone", "mannitol"))
var/amounts = list(5, 10)
var/obj/item/weapon/reagent_containers/glass/beaker = null
var/filtering = 0
@@ -246,7 +246,7 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
-
+
/obj/machinery/sleeper/upgraded/New()
..()
component_parts = list()
@@ -415,8 +415,8 @@
M.AdjustParalysis(-4)
M.AdjustWeakened(-4)
M.AdjustStunned(-4)
- if (M:reagents.get_reagent_amount("inaprovaline") < 5)
- M:reagents.add_reagent("inaprovaline", 5)
+ if (M:reagents.get_reagent_amount("salglu_solution") < 5)
+ M:reagents.add_reagent("salglu_solution", 5)
return
/obj/machinery/sleeper/proc/toggle_filter()
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index c4994ebe746..4356983d8de 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -11,7 +11,7 @@
active_power_usage = 2500
l_color = "#00FF00"
-
+
power_change()
..()
if(!(stat & (BROKEN|NOPOWER)))
@@ -28,24 +28,24 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/cable_coil(src, 2)
RefreshParts()
-
-/obj/machinery/bodyscanner/RefreshParts()
-/obj/machinery/bodyscanner/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+/obj/machinery/bodyscanner/RefreshParts()
+
+/obj/machinery/bodyscanner/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
if (istype(G, /obj/item/weapon/screwdriver))
if(src.occupant)
user << "The maintenance panel is locked."
- return
+ return
default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", G)
- return
-
+ return
+
if (istype(G, /obj/item/weapon/wrench))
if(src.occupant)
user << "The scanner is occupied."
- return
+ return
if(panel_open)
user << "Close the maintenance panel first."
- return
+ return
if(dir == 4)
dir = 8
else
@@ -55,12 +55,12 @@
if(exchange_parts(user, G))
return
- default_deconstruction_crowbar(G)
-
+ default_deconstruction_crowbar(G)
+
if(istype(G, /obj/item/weapon/grab))
if(panel_open)
user << "\blue Close the maintenance panel first."
- return
+ return
if(!ismob(G:affecting))
return
if (src.occupant)
@@ -84,7 +84,7 @@
//G = null
del(G)
return
-
+
/obj/machinery/bodyscanner/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
if(O.loc == user) //no you can't pull things out of your ass
return
@@ -104,7 +104,7 @@
return
if(panel_open)
user << "\blue Close the maintenance panel first."
- return
+ return
if(occupant)
user << "\blue The body scanner is already occupied!"
return
@@ -255,7 +255,7 @@
spawn(rand(0, 15))
src.icon_state = "bodyscannerconsole-p"
stat |= NOPOWER
-
+
/obj/machinery/body_scanconsole/New()
..()
component_parts = list()
@@ -266,7 +266,7 @@
RefreshParts()
findscanner()
-/obj/machinery/body_scanconsole/RefreshParts()
+/obj/machinery/body_scanconsole/RefreshParts()
/obj/machinery/body_scanconsole/ex_act(severity)
switch(severity)
@@ -295,8 +295,8 @@
bodyscannernew = locate(/obj/machinery/bodyscanner, get_step(src, dir))
src.connected = bodyscannernew
return
- return
-
+ return
+
/*
/obj/machinery/body_scanconsole/process() //not really used right now
@@ -323,22 +323,22 @@
/obj/machinery/body_scanconsole/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
if (istype(G, /obj/item/weapon/screwdriver))
default_deconstruction_screwdriver(user, "bodyscannerconsole-p", "bodyscannerconsole", G)
- return
-
+ return
+
if (istype(G, /obj/item/weapon/wrench))
if(panel_open)
user << "Close the maintenance panel first."
- return
+ return
if(dir == 4)
dir = 8
else
dir = 4
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-
+
if(exchange_parts(user, G))
return
- default_deconstruction_crowbar(G)
+ default_deconstruction_crowbar(G)
/obj/machinery/body_scanconsole/attack_paw(user as mob)
return src.attack_hand(user)
@@ -352,7 +352,7 @@
if(stat & (NOPOWER|BROKEN))
return
if (panel_open)
- user << "Close the maintenance panel first."
+ user << "Close the maintenance panel first."
return
if(!src.connected)
findscanner()
@@ -409,11 +409,11 @@
blood_percent *= 100
dat += text("[]\tBlood Level %: [] ([] units)
", (blood_volume > 448 ?"" : ""), blood_percent, blood_volume)
if(occupant.reagents)
- dat += text("Inaprovaline units: [] units
", occupant.reagents.get_reagent_amount("inaprovaline"))
- dat += text("Soporific (Sleep Toxin): [] units
", occupant.reagents.get_reagent_amount("stoxin"))
- dat += text("[]\tDermaline: [] units
", (occupant.reagents.get_reagent_amount("dermaline") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("dermaline"))
- dat += text("[]\tBicaridine: [] units
", (occupant.reagents.get_reagent_amount("bicaridine") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("bicaridine"))
- dat += text("[]\tDexalin: [] units
", (occupant.reagents.get_reagent_amount("dexalin") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("dexalin"))
+ dat += text("Epinephrine units: [] units
", occupant.reagents.get_reagent_amount("Epinephrine"))
+ dat += text("Morphine: [] units
", occupant.reagents.get_reagent_amount("morphine"))
+ dat += text("[]\tSilver Sulfadiazine: [] units
", (occupant.reagents.get_reagent_amount("silver_sulfadiazine") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("silver_sulfadiazine"))
+ dat += text("[]\tStyptic Powder: [] units
", (occupant.reagents.get_reagent_amount("styptic_powder") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("styptic_powder"))
+ dat += text("[]\tsalbutamol: [] units
", (occupant.reagents.get_reagent_amount("salbutamol") < 30 ? "" : ""), occupant.reagents.get_reagent_amount("salbutamol"))
dat += "
"
dat += ""
@@ -521,7 +521,7 @@
/obj/machinery/body_scanconsole/Topic(href, href_list)
if(..())
return 1
-
+
if (href_list["print_p"])
if (!(src.printing) && src.printing_text)
src.printing = 1
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 078d9fff2b9..a3bf925ece1 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -32,10 +32,10 @@
var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
radio_name = "Medical"
//Setting which reagents to use to treat what by default. By id.
- var/treatment_brute = "tricordrazine"
- var/treatment_oxy = "tricordrazine"
- var/treatment_fire = "tricordrazine"
- var/treatment_tox = "tricordrazine"
+ var/treatment_brute = "salglu_solution"
+ var/treatment_oxy = "salbutamol"
+ var/treatment_fire = "salglu_solution"
+ var/treatment_tox = "charcoal"
var/treatment_virus = "spaceacillin"
var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
var/shut_up = 0 //self explanatory :)
@@ -47,19 +47,19 @@
name = "Suspicious Medibot"
desc = "You'd better have insurance!"
skin = "bezerk"
- treatment_oxy = "dexalin"
- treatment_brute = "bicaridine"
- treatment_fire = "kelotane"
- treatment_tox = "anti_toxin"
+ treatment_oxy = "perfluorodecalin"
+ treatment_brute = "styptic_powder"
+ treatment_fire = "silver_sulfadiazine"
+ treatment_tox = "charcoal"
/obj/machinery/bot/medbot/mysterious
name = "\improper Mysterious Medibot"
desc = "International Medibot of mystery."
skin = "bezerk"
- treatment_oxy = "dexalinp"
- treatment_brute = "bicaridine"
- treatment_fire = "kelotane"
- treatment_tox = "anti_toxin"
+ treatment_oxy = "perfluorodecalin"
+ treatment_brute = "styptic_powder"
+ treatment_fire = "silver_sulfadiazine"
+ treatment_tox = "charcoal"
/obj/item/weapon/firstaid_arm_assembly
name = "incomplete medibot assembly."
@@ -429,7 +429,7 @@
var/reagent_id = null
if(emagged == 2) //Emagged! Time to poison everybody.
- reagent_id = "toxin"
+ reagent_id = "pancuronium"
else
if(treat_virus)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 27e16c1be95..e75c59888d6 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -301,10 +301,10 @@
src.occupant.adjustBrainLoss(-((speed_coeff/2)))
//So clones don't die of oxyloss in a running pod.
- if (src.occupant.reagents.get_reagent_amount("inaprovaline") < 30)
- src.occupant.reagents.add_reagent("inaprovaline", 60)
+ if (src.occupant.reagents.get_reagent_amount("salbutamol") < 5)
+ src.occupant.reagents.add_reagent("salbutamol", 5)
- //Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
+ //Also heal some oxyloss ourselves just in case!!
src.occupant.adjustOxyLoss(-4)
use_power(7500) //This might need tweaking.
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index e3aa2ae9624..41609e66d8e 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -45,12 +45,12 @@
// Reagent information for process(), consider moving this to a controller along
// with cycle information under 'mechanical concerns' at some point.
var/global/list/toxic_reagents = list(
- "anti_toxin" = -2,
+ "charcoal" = -2,
"toxin" = 2,
"fluorine" = 2.5,
"chlorine" = 1.5,
"sacid" = 1.5,
- "pacid" = 3,
+ "facid" = 3,
"atrazine" = 3,
"cryoxadone" = -3,
"radium" = 2
@@ -75,7 +75,7 @@
"phosphorus" = -2,
"sugar" = 2,
"sacid" = -2,
- "pacid" = -4,
+ "facid" = -4,
"atrazine" = -8,
"adminordrazine" = -5
)
@@ -104,7 +104,7 @@
"phosphorus" = list( -0.75, 0, 0 ),
"sodawater" = list( 0.1, 0, 0 ),
"sacid" = list( -1, 0, 0 ),
- "pacid" = list( -2, 0, 0 ),
+ "facid" = list( -2, 0, 0 ),
"atrazine" = list( -2, 0, 0.2 ),
"cryoxadone" = list( 3, 0, 0 ),
"ammonia" = list( 0.5, 0, 0 ),
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 6b26c084997..43a6eb339f2 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -170,8 +170,8 @@
if(O.reagents.get_reagent_amount("water") < 50)
O.reagents.add_reagent("water", 2 * coeff)
if(istype(O,/obj/item/weapon/reagent_containers/spray/alien/stun))
- if(O.reagents.get_reagent_amount("stoxin") < 250)
- O.reagents.add_reagent("stoxin", 2 * coeff)
+ if(O.reagents.get_reagent_amount("morphine") < 250)
+ O.reagents.add_reagent("morphine", 2 * coeff)
if(R)
@@ -183,11 +183,11 @@
if(istype(R.module.emag, /obj/item/weapon/reagent_containers/spray))
var/obj/item/weapon/reagent_containers/spray/S = R.module.emag
if(S.name == "polyacid spray")
- S.reagents.add_reagent("pacid", 2 * coeff)
+ S.reagents.add_reagent("facid", 2 * coeff)
if(S.name == "lube spray")
S.reagents.add_reagent("lube", 2 * coeff)
else if(S.name == "acid synthesizer")
- S.reagents.add_reagent("pacid", 2 * coeff)
+ S.reagents.add_reagent("facid", 2 * coeff)
S.reagents.add_reagent("sacid", 2 * coeff)
/obj/machinery/recharge_station/verb/move_eject()
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index e1ba215acac..f2469cd91f2 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -888,12 +888,12 @@
icon_deny = "med-deny"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access_txt = "5"
- products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/morphine = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4,
- /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/insulin = 4,/obj/item/weapon/reagent_containers/syringe = 12,
- /obj/item/device/healthanalyzer = 5,/obj/item/device/healthupgrade = 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/device/sensor_device = 2)
- 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)
+ products = list(/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 4,/obj/item/weapon/reagent_containers/glass/bottle/morphine = 4,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 4,
+ /obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe/insulin = 4,
+ /obj/item/weapon/reagent_containers/syringe = 12,/obj/item/device/healthanalyzer = 5,/obj/item/device/healthupgrade = 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/bruise_pack = 3,/obj/item/stack/medical/splint = 2, /obj/item/device/sensor_device = 2)
+ contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/pancuronium = 1,/obj/item/weapon/reagent_containers/glass/bottle/sulfonal = 1)
//This one's from bay12
@@ -913,7 +913,7 @@
req_access_txt = "5"
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)
- 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)
+ contraband = list(/obj/item/weapon/reagent_containers/syringe/charcoal = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1)
/obj/machinery/vending/wallmed2
name = "NanoMed"
@@ -922,7 +922,7 @@
icon_deny = "wallmed-deny"
req_access_txt = "5"
density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude
- products = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 5,/obj/item/weapon/reagent_containers/syringe/antitoxin = 3,/obj/item/stack/medical/bruise_pack = 3,
+ products = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 5,/obj/item/weapon/reagent_containers/syringe/charcoal = 3,/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment =3,/obj/item/device/healthanalyzer = 3)
contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3)
@@ -934,7 +934,7 @@
product_ads = "Go end some lives!;The best stuff for your ship.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access_txt = "150"
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)
- 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)
+ contraband = list(/obj/item/weapon/reagent_containers/syringe/charcoal = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1)
/obj/machinery/vending/security
name = "SecTech"
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index b3bccaeac06..4d5f134662d 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -227,8 +227,8 @@
M.AdjustStunned(-4)
M.AdjustWeakened(-4)
M.AdjustStunned(-4)
- if(M.reagents.get_reagent_amount("inaprovaline") < 5)
- M.reagents.add_reagent("inaprovaline", 5)
+ if(M.reagents.get_reagent_amount("epinephrine") < 5)
+ M.reagents.add_reagent("epinephrine", 5)
S.chassis.use_power(S.energy_drain)
S.update_equip_info()
return
@@ -405,7 +405,7 @@
..()
flags |= NOREACT
syringes = new
- known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Anti-Toxin (Dylovene)")
+ known_reagents = list("epinephrine"="Epinephrine","charcoal"="Charcoal")
processed_reagents = new
create_reagents(max_volume)
synth = new (list(src),0)
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index 47afd477a9d..d2536da66ec 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -40,9 +40,9 @@
name = pick("lunar","vorpal","hardcore","willow", "void","loopy","electro", "cyber","heavy", "ninja", "hydro", "blue", "red", "green", "purple", "strong", "divine","carp" ,"deadly","dead","vicious" ,"wild" ,"demon", "chill", "solid", "liquid", "crazy", "super", "hyper", "space", "wizard", "rainbow", "star", "turbo", "prism", "sticky") + " " + pick("jack","zero","null","beat","nip","bubbles" ,"ice","medicine","venom","shock","solar" ,"spice" ,"shredder", "heart" , "heat", "pill","hopper","scum","fruit", "bolt", "deck", "butter", "runoff", "grease", "flair", "sweat", "zone", "blast")
- reagents.add_reagent(pick("chloralhydrate","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "inaprovaline", "serotrotium"), pick(5,7,10,13,15))
- reagents.add_reagent(pick("chloralhydrate","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "inaprovaline", "serotrotium"), pick(5,7,10,13,15))
- reagents.add_reagent(pick("chloralhydrate","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "inaprovaline", "serotrotium"), pick(5,7,10,13,15))
+ reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "hydrocodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15))
+ reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "hydrocodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15))
+ reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "hydrocodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15))
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index b40efbb0ffc..9cb6a20a3f8 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -202,8 +202,8 @@ REAGENT SCANNER
user.show_message("Subject appears to be suffering from fatigue.")
if (M.getCloneLoss())
user.show_message("Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.")
-// if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-// user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
+// if (M.reagents && M.reagents.get_reagent_amount("epinephrine"))
+// user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.")
if (M.has_brain_worms())
user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index f1444bd0882..62f84eff0dd 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -61,7 +61,7 @@
// identify_probability = 0
New()
..()
- var/global/list/chems_only = list("slimejelly","blood","water","lube","anti_toxin","toxin","cyanide","stoxin","inaprovaline","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","pacid","glycerol","radium","ryetalyn","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","leporazine","cryptobiolin","lexorin","kelotane","dermaline","dexalin","dexalinp","tricordrazine","synaptizine","impedrezene","hyronalin","arithrazine","alkysine","imidazoline","bicaridine","hyperzine","cryoxadone","clonexadone","spaceacillin","carpotoxin","zombiepowder","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","ethylredoxrazine","chloralhydrate","lipozine","condensedcapsaicin","frostoil","amatoxin","psilocybin","enzyme","nothing","doctorsdelight","antifreeze","neurotoxin")
+ var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","clonexadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin")
var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
var/datum/reagent/R = pick(chems_only + rare_chems)
@@ -89,9 +89,9 @@
icon = 'icons/obj/drinks.dmi'
New()
..()
- var/list/drinks_only = list("beer2","hot_coco","orangejuice","tomatojuice","limejuice","carrotjuice","berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana","nothing","potato","milk","soymilk","cream","coffee","tea","icecoffee","icetea","cola","nuka_cola","spacemountainwind","thirteenloko","dr_gibb","space_up","lemon_lime","beer","whiskey","gin","rum","vodka","holywater","tequilla","vermouth","wine","tonic","kahlua","cognac","hooch","ale","sodawater","ice","bilk","atomicbomb","threemileisland","goldschlager","patron","gintonic","cubalibre","whiskeycola","martini","vodkamartini","whiterussian","screwdrivercocktail","booger","bloodymary","gargleblaster","bravebull","tequillasunrise","toxinsspecial","beepskysmash","doctorsdelight","irishcream","manlydorf","longislandicedtea","moonshine","b52","irishcoffee","margarita","blackrussian","manhattan","manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood","vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead","mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte","cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk","silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini")
+ var/list/drinks_only = list("beer2","hot_coco","orangejuice","tomatojuice","limejuice","carrotjuice","berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana","nothing","potato","milk","soymilk","cream","coffee","tea","icecoffee","icetea","cola","nuka_cola","spacemountainwind","thirteenloko","dr_gibb","space_up","lemon_lime","beer","whiskey","gin","rum","vodka","holywater","tequilla","vermouth","wine","tonic","kahlua","cognac","hooch","ale","sodawater","ice","bilk","atomicbomb","threemileisland","goldschlager","patron","gintonic","cubalibre","whiskeycola","martini","vodkamartini","whiterussian","screwdrivercocktail","booger","bloodymary","gargleblaster","bravebull","tequillasunrise","toxinsspecial","beepskysmash","salglu_solution","irishcream","manlydorf","longislandicedtea","moonshine","b52","irishcoffee","margarita","blackrussian","manhattan","manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood","vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead","mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte","cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk","silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini")
if(prob(50))
- drinks_only += list("chloralhydrate","adminordrazine","mindbreaker","tricordrazine","blood")
+ drinks_only += list("pancuronium","adminordrazine","mindbreaker","omnizine","blood")
var/datum/reagent/R = pick(drinks_only)
reagents.add_reagent(R,volume)
@@ -123,7 +123,7 @@
New()
..()
- var/global/list/meds_only = list("anti_toxin","toxin","cyanide","stoxin","inaprovaline","space_drugs","serotrotium","ryetalyn","mutagen","leporazine","cryptobiolin","lexorin","kelotane","dermaline","dexalin","dexalinp","tricordrazine","synaptizine","impedrezene","hyronalin","arithrazine","alkysine","imidazoline","bicaridine","hyperzine","spaceacillin","carpotoxin","zombiepowder","mindbreaker","ethanol","ammonia","diethylamine","ethylredoxrazine","chloralhydrate","lipozine","condensedcapsaicin","frostoil","amatoxin","psilocybin","nothing","doctorsdelight","neurotoxin")
+ var/global/list/meds_only = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","mutadone","mutagen","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","spaceacillin","carpotoxin","mindbreaker","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","nothing","salglu_solution","neurotoxin")
var/global/list/rare_meds = list("nanites","xenomicrobes","minttoxin","adminordrazine","blood")
var/i = 1
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e5cd25994f5..aee0c667847 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -62,7 +62,7 @@
if(O.reagents.total_volume < 1)
user << "The [O] is empty."
else if(O.reagents.total_volume >= 1)
- if(O.reagents.has_reagent("pacid", 1))
+ if(O.reagents.has_reagent("facid", 1))
user << "The acid chews through the balloon!"
O.reagents.reaction(user)
del(src)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 92990626a0e..27e3b00b489 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -73,6 +73,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
..()
flags |= NOREACT // so it doesn't react until you light it
create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
+ reagents.add_reagent("nicotine", 15)
/obj/item/clothing/mask/cigarette/Destroy()
..()
diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm
index 5a902401639..27dfceca0e4 100644
--- a/code/game/objects/items/weapons/grenades.dm
+++ b/code/game/objects/items/weapons/grenades.dm
@@ -143,7 +143,7 @@
B1.reagents.add_reagent("glycerol",30) // todo: someone says NG is overpowered, test.
B1.reagents.add_reagent("sacid",15)
B2.reagents.add_reagent("sacid",15)
- B2.reagents.add_reagent("pacid",30)
+ B2.reagents.add_reagent("facid",30)
beakers += B1
beakers += B2
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 2a941470364..9ff23eaba99 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -391,7 +391,7 @@
B1.reagents.add_reagent("aluminum", 30)
B2.reagents.add_reagent("foaming_agent", 10)
- B2.reagents.add_reagent("pacid", 10)
+ B2.reagents.add_reagent("facid", 10)
beakers += B1
beakers += B2
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 34d078e0497..8819d74df5a 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -434,8 +434,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
source.update_canmove()
source.reagents.add_reagent("synaptizine", 10)
- source.reagents.add_reagent("tricordrazine", 10)
- source.reagents.add_reagent("hyperzine", 10)
+ source.reagents.add_reagent("omnizine", 10)
+ source.reagents.add_reagent("methamphetamine", 10)
return
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index b0e0029057a..993394a2a75 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -581,8 +581,8 @@
New()
..()
- new /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine(src)
- new /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine(src)
+ new /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone(src)
+ new /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone(src)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src)
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 60704cb581e..3dc18e532ca 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -221,7 +221,7 @@
/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate/New()
..()
for(var/i = 1 to storage_slots)
- reagents.add_reagent("doctorsdelight",15)
+ reagents.add_reagent("omnizine",15)
/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift
name = "\improper Uplift Smooth packet"
@@ -267,7 +267,7 @@
/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims/New()
..()
for(var/i = 1 to storage_slots)
- reagents.add_reagent("lipozine",4)
+ reagents.add_reagent("lipolicide",4)
reagents.add_reagent("ammonia",2)
reagents.add_reagent("atrazine",1)
reagents.add_reagent("toxin",1.5)
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index a4ae17726d2..fb742a1bc29 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -146,7 +146,7 @@
new /obj/item/weapon/reagent_containers/hypospray/combat(src)
new /obj/item/weapon/reagent_containers/pill/patch/styptic(src)
new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
- new /obj/item/weapon/reagent_containers/ld50_syringe(src)
+ new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
new /obj/item/clothing/glasses/hud/health/night(src)
return
@@ -188,48 +188,19 @@
return
return
-/obj/item/weapon/storage/pill_bottle/kelotane
- name = "Pill bottle (kelotane)"
- desc = "Contains pills used to treat burns."
-
- New()
- ..()
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
- new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-
-/obj/item/weapon/storage/pill_bottle/antitox
- name = "Pill bottle (Anti-toxin)"
+/obj/item/weapon/storage/pill_bottle/charcoal
+ name = "Pill bottle (Charcoal)"
desc = "Contains pills used to counter toxins."
New()
..()
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
- new /obj/item/weapon/reagent_containers/pill/antitox( src )
-
-/obj/item/weapon/storage/pill_bottle/inaprovaline
- name = "Pill bottle (inaprovaline)"
- desc = "Contains pills used to stabilize patients."
-
- New()
- ..()
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
- new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
+ new /obj/item/weapon/reagent_containers/pill/charcoal( src )
/obj/item/weapon/storage/pill_bottle/dice
name = "pack of dice"
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 6f9873a7f9b..bbb918e14df 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -19,10 +19,10 @@
new /obj/item/weapon/reagent_containers/dropper(src)
new /obj/item/weapon/reagent_containers/glass/beaker(src)
new /obj/item/weapon/reagent_containers/glass/beaker(src)
- new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
- new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src)
- new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
- new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/epinephrine(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/epinephrine(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src)
return
@@ -87,8 +87,8 @@
/obj/item/weapon/storage/pill_bottle/psychiatrist/New()
..()
- new /obj/item/weapon/reagent_containers/pill/diphenhydramine(src)
- new /obj/item/weapon/reagent_containers/pill/diphenhydramine(src)
+ new /obj/item/weapon/reagent_containers/pill/haloperidol(src)
+ new /obj/item/weapon/reagent_containers/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/pill/methamphetamine(src)
@@ -107,7 +107,7 @@
sleep(2)
new /obj/item/clothing/suit/straight_jacket(src)
new /obj/item/weapon/reagent_containers/syringe(src)
- new /obj/item/weapon/reagent_containers/glass/bottle/stoxin(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/morphine(src)
new /obj/item/weapon/storage/pill_bottle/psychiatrist(src)
return
@@ -236,4 +236,27 @@
new /obj/item/clothing/head/helmet/space/eva/paramedic(src)
new /obj/item/clothing/head/helmet/space/eva/paramedic(src)
new /obj/item/device/sensor_device(src)
- return
\ No newline at end of file
+ return
+
+/obj/structure/closet/secure_closet/reagents
+ name = "Chemical Storage Closet"
+ desc = "Store dangerous chemicals in here."
+ icon_state = "chemical1"
+ icon_closed = "chemical"
+ icon_locked = "chemical1"
+ icon_opened = "medicalopen"
+ icon_broken = "chemicalbroken"
+ icon_off = "chemicaloff"
+ req_access = list(access_chemistry)
+
+
+ New()
+ ..()
+ sleep(2)
+ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/oil(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/acid(src)
+ new /obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine(src)
+ return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 32162d519d4..c3595645efa 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -361,8 +361,8 @@
New()
..()
sleep(2)
- new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
- new /obj/item/weapon/reagent_containers/ld50_syringe/choral(src)
+ new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
+ new /obj/item/weapon/reagent_containers/ld50_syringe/lethal(src)
return
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 30e46b62968..edbe871320a 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -123,7 +123,7 @@
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/datum/reagent/glycerol = 5,
/datum/reagent/sacid = 5,
- /datum/reagent/pacid = 5,)
+ /datum/reagent/facid = 5,)
tools = list(/obj/item/weapon/screwdriver)
time = 5
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index e28992cf0ba..e342c727b90 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -404,7 +404,7 @@
icon_state = "pill9"
New()
..()
- reagents.add_reagent("stoxin", 5)
+ reagents.add_reagent("morphine", 5)
reagents.add_reagent("sugar", 10)
reagents.add_reagent("ethanol", 5)
@@ -430,7 +430,7 @@
/obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1/New()
..()
- reagents.add_reagent("oxycodone", 15)
+ reagents.add_reagent("hydrocodone", 15)
update_icon()
return
diff --git a/code/modules/events/tgevents/vent_clog.dm b/code/modules/events/tgevents/vent_clog.dm
index db8cbe2694c..10b25a37eb8 100755
--- a/code/modules/events/tgevents/vent_clog.dm
+++ b/code/modules/events/tgevents/vent_clog.dm
@@ -21,10 +21,10 @@
var/obj/vent = pick_n_take(vents)
var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
- "atrazine","banana","anti_toxin","space_drugs","hyperzine","holywater","ethanol","hot_coco","pacid",
- "blood","stoxin","fluorine","ryetalyn","mutagen","oxycodone","fuel","cryptobiolin",
- "impedrezene","mindbreaker","nanites","lipozine","frostoil","doctorsdelight","beepskysmash",
- "tricordrazine", "amatoxin", "adminordrazine", "neurotoxin", "zombiepowder", "synaptizine")
+ "atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
+ "blood","morphine","fluorine","mutadone","mutagen","hydrocodone","fuel","cryptobiolin",
+ "haloperidol","mindbreaker","nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
+ "omnizine", "amanitin", "adminordrazine", "neurotoxin", "synaptizine")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = vent
R.add_reagent(pick(gunk), 50)
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 0cb7fa54f8f..30a4f0ebcd2 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -41,7 +41,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
/datum/recipe/microwave/dionaroast
- reagents = list("pacid" = 5) //It dissolves the carapace. Still poisonous, though.
+ reagents = list("facid" = 5) //It dissolves the carapace. Still poisonous, though.
items = list(
/obj/item/weapon/holder/diona,
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
@@ -221,7 +221,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
being_cooked.warm = 1
- being_cooked.reagents.add_reagent("tricordrazine", 5)
+ being_cooked.reagents.add_reagent("omnizine", 15)
being_cooked.bitesize = 6
being_cooked.name = "Warm " + being_cooked.name
being_cooked.cooltime()
@@ -629,7 +629,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly
make_food(var/obj/container as obj)
var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..(container)
- being_cooked.reagents.del_reagent("amatoxin")
+ being_cooked.reagents.del_reagent("amanitin")
return being_cooked
/datum/recipe/microwave/meatballsoup
diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm
index 74837433fc4..38f46945f03 100644
--- a/code/modules/genetics/side_effects.dm
+++ b/code/modules/genetics/side_effects.dm
@@ -16,7 +16,7 @@
/datum/genetics/side_effect/genetic_burn
name = "Genetic Burn"
symptom = "Subject's skin turns unusualy red."
- treatment = "Inject small dose of dexalin."
+ treatment = "Inject small dose of salbutamol."
effect = "Subject's skin burns."
duration = 10*30
@@ -24,7 +24,7 @@
H.emote("me", 1, "starts turning very red..")
finish(mob/living/carbon/human/H)
- if(!H.reagents.has_reagent("dexalin"))
+ if(!H.reagents.has_reagent("salbutamol"))
for(var/organ_name in list("chest","l_arm","r_arm","r_leg","l_leg","head","groin"))
var/datum/organ/external/E = H.get_organ(organ_name)
E.take_damage(0, 5, 0)
@@ -32,7 +32,7 @@
/datum/genetics/side_effect/bone_snap
name = "Bone Snap"
symptom = "Subject's limbs tremble notably."
- treatment = "Inject small dose of bicaridine."
+ treatment = "Inject small dose of Styptic Powder."
effect = "Subject's bone breaks."
duration = 10*60
@@ -40,7 +40,7 @@
H.emote("me", 1, "'s limbs start shivering uncontrollably.")
finish(mob/living/carbon/human/H)
- if(!H.reagents.has_reagent("bicaridine"))
+ if(!H.reagents.has_reagent("styptic_powder"))
var/organ_name = pick("chest","l_arm","r_arm","r_leg","l_leg","head","groin")
var/datum/organ/external/E = H.get_organ(organ_name)
E.take_damage(20, 0, 0)
@@ -49,7 +49,7 @@
/datum/genetics/side_effect/monkey
name = "Monkey"
symptom = "Subject starts drooling uncontrollably."
- treatment = "Inject small dose of dylovene."
+ treatment = "Inject small dose of charcoal."
effect = "Subject turns into monkey."
duration = 10*90
@@ -57,13 +57,13 @@
H.emote("me", 1, "has drool running down from his mouth.")
finish(mob/living/carbon/human/H)
- if(!H.reagents.has_reagent("anti_toxin"))
+ if(!H.reagents.has_reagent("charcoal"))
H.monkeyize()
/datum/genetics/side_effect/confuse
name = "Confuse"
symptom = "Subject starts drooling uncontrollably."
- treatment = "Inject small dose of dylovene."
+ treatment = "Inject small dose of charcoal."
effect = "Subject becomes confused."
duration = 10*30
@@ -71,7 +71,7 @@
H.emote("me", 1, "has drool running down from his mouth.")
finish(mob/living/carbon/human/H)
- if(!H.reagents.has_reagent("anti_toxin"))
+ if(!H.reagents.has_reagent("charcoal"))
H.confused += 100
proc/trigger_side_effect(mob/living/carbon/human/H)
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 0d64d2d6fbc..a5bd0ecc58b 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -588,7 +588,7 @@ proc/populate_seed_list()
mutants = null
packet_icon = "seed-deathnettle"
plant_icon = "deathnettle"
- chems = list("nutriment" = list(1,50), "pacid" = list(0,1))
+ chems = list("nutriment" = list(1,50), "facid" = list(0,1))
maturation = 8
yield = 2
@@ -734,7 +734,7 @@ proc/populate_seed_list()
packet_icon = "seed-ambrosiavulgaris"
plant_icon = "ambrosiavulgaris"
harvest_repeat = 1
- chems = list("nutriment" = list(1), "space_drugs" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1), "toxin" = list(1,10))
+ chems = list("nutriment" = list(1), "thc" = list(1,8), "silver_sulfadiazine" = list(1,8,1), "styptic_powder" = list(1,10,1), "toxin" = list(1,10))
lifespan = 60
maturation = 6
@@ -750,7 +750,7 @@ proc/populate_seed_list()
mutants = null
packet_icon = "seed-ambrosiadeus"
plant_icon = "ambrosiadeus"
- chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "space_drugs" = list(1,10))
+ chems = list("nutriment" = list(1), "styptic_powder" = list(1,8), "synaptizine" = list(1,8,1), "methamphetamine" = list(1,10,1), "thc" = list(1,10))
//Mushrooms/varieties.
/datum/seed/mushroom
@@ -823,7 +823,7 @@ proc/populate_seed_list()
mutants = null
packet_icon = "mycelium-liberty"
plant_icon = "liberty"
- chems = list("nutriment" = list(1), "stoxin" = list(3,3), "space_drugs" = list(1,25))
+ chems = list("nutriment" = list(1), "morphine" = list(3,3), "space_drugs" = list(1,25))
lifespan = 25
production = 1
@@ -838,7 +838,7 @@ proc/populate_seed_list()
mutants = list("destroyingangel","plastic")
packet_icon = "mycelium-amanita"
plant_icon = "amanita"
- chems = list("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25))
+ chems = list("nutriment" = list(1), "amanitin" = list(3,3), "psilocybin" = list(1,25))
lifespan = 50
maturation = 10
@@ -854,7 +854,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel)
packet_icon = "mycelium-angel"
plant_icon = "angel"
- chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25))
+ chems = list("nutriment" = list(1,50), "amanitin" = list(13,3), "psilocybin" = list(1,25))
maturation = 12
yield = 2
@@ -945,7 +945,7 @@ proc/populate_seed_list()
packet_icon = "seed-poppy"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/poppy)
plant_icon = "poppy"
- chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
+ chems = list("nutriment" = list(1,20), "styptic_powder" = list(1,10))
lifespan = 25
potency = 20
@@ -1020,7 +1020,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes)
mutants = null
plant_icon = "greengrape"
- chems = list("nutriment" = list(1,10), "kelotane" = list(3,5))
+ chems = list("nutriment" = list(1,10))
//Soybeans/varieties
/datum/seed/soybean
@@ -1085,7 +1085,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space)
plant_icon = "stobacco"
harvest_repeat = 1
- chems = list("nutriment" = list(1,40), "nicotine" = list(1,20), "inaprovaline" = list(1,30))
+ chems = list("nutriment" = list(1,40), "nicotine" = list(1,20), "epinephrine" = list(1,30))
lifespan = 25
maturation = 5
@@ -1104,7 +1104,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/teaaspera)
plant_icon = "teaaspera"
harvest_repeat = 1
- chems = list("teapowder" = list(1,20), "anti_toxin" = list(1,30))
+ chems = list("teapowder" = list(1,20), "charcoal" = list(1,30))
lifespan = 30
maturation = 5
@@ -1122,7 +1122,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/teaastra)
plant_icon = "teaastra"
harvest_repeat = 1
- chems = list("teapowder" = list(1,20), "impedrezene" = list(1,30))
+ chems = list("teapowder" = list(1,20), "haloperidol" = list(1,30))
lifespan = 30
maturation = 5
@@ -1158,7 +1158,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/coffeer)
plant_icon = "coffeer"
harvest_repeat = 1
- chems = list("coffeepowder" = list(1,20), "synaptizine" = list(1,20), "hyperzine" = list(1,40))
+ chems = list("coffeepowder" = list(1,20), "synaptizine" = list(1,20), "methamphetamine" = list(1,40))
lifespan = 30
maturation = 5
@@ -1208,7 +1208,7 @@ proc/populate_seed_list()
packet_icon = "seed-shand"
products = list(/obj/item/stack/medical/bruise_pack/tajaran)
plant_icon = "shand"
- chems = list("bicaridine" = list(0,10))
+ chems = list("styptic_powder" = list(0,10))
lifespan = 50
maturation = 3
@@ -1224,7 +1224,7 @@ proc/populate_seed_list()
packet_icon = "seed-mtear"
products = list(/obj/item/stack/medical/ointment/tajaran)
plant_icon = "mtear"
- chems = list("honey" = list(1,10), "kelotane" = list(3,5))
+ chems = list("honey" = list(1,10), "silver_sulfadiazine" = list(3,5))
lifespan = 50
maturation = 3
@@ -1318,7 +1318,7 @@ proc/populate_seed_list()
packet_icon = "seed-carrot"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/carrot)
plant_icon = "carrot"
- chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5))
+ chems = list("nutriment" = list(1,20), "oculine" = list(3,5))
lifespan = 25
maturation = 10
@@ -1513,7 +1513,7 @@ proc/populate_seed_list()
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod)
plant_icon = "kudzu"
product_colour = "#96D278"
- chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25))
+ chems = list("nutriment" = list(1,50), "charcoal" = list(1,25))
lifespan = 20
maturation = 6
diff --git a/code/modules/jungle/jungle_plants.dm b/code/modules/jungle/jungle_plants.dm
index 3bc0315c581..2a48dcf4f9b 100644
--- a/code/modules/jungle/jungle_plants.dm
+++ b/code/modules/jungle/jungle_plants.dm
@@ -58,7 +58,7 @@
//*******************************//
var/list/fruit_icon_states = list("badrecipe","kudzupod","reishi","lime","grapes","boiledrorocore","chocolateegg")
-var/list/reagent_effects = list("toxin","anti_toxin","stoxin","space_drugs","mindbreaker","zombiepowder","impedrezene")
+var/list/reagent_effects = list("toxin","charcoal","morphine","space_drugs","mindbreaker","haloperidol")
var/jungle_plants_init = 0
/proc/init_jungle_plants()
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 61569fb57d5..d3e955d13c4 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -149,7 +149,7 @@
var/obj/item/weapon/card/id/inserted_id
var/list/prize_list = list(
new /datum/data/mining_equipment("Stimpack MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack, 50),
- new /datum/data/mining_equipment("Leporazine MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine, 50),
+ new /datum/data/mining_equipment("Teporone MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone, 50),
new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/autoinjector/utility, 200),
new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
diff --git a/code/modules/mining/surprises/tg.dm b/code/modules/mining/surprises/tg.dm
index e80d3a87115..cadebb94841 100644
--- a/code/modules/mining/surprises/tg.dm
+++ b/code/modules/mining/surprises/tg.dm
@@ -175,7 +175,7 @@
/obj/structure/table/reinforced=2,
/obj/machinery/portable_atmospherics/hydroponics=1,
/obj/effect/glowshroom/single=2,
- /obj/item/weapon/reagent_containers/syringe/antitoxin=2,
+ /obj/item/weapon/reagent_containers/syringe/charcoal=2,
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,
/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3
)
\ No newline at end of file
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 25c712354ce..132949eca3e 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -1,4 +1,4 @@
-#define EMOTE_COOLDOWN 50 //Time in deciseconds that the cooldown lasts
+#define EMOTE_COOLDOWN 20 //Time in deciseconds that the cooldown lasts
//Emote Cooldown System (it's so simple!)
/mob/proc/handle_emote_CD()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 22f9bec9e0c..fbb2e477081 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -123,7 +123,7 @@
if( health <= 20 && prob(1) )
spawn(0)
emote("gasp")
- if(!reagents.has_reagent("inaprovaline"))
+ if(!reagents.has_reagent("epinephrine"))
adjustOxyLoss(1)
Paralyse(3)
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 6930ee09dd9..3b08794a76c 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -75,7 +75,7 @@
//if( health <= 20 && prob(1) )
// spawn(0)
// emote("gasp")
- if(!reagents.has_reagent("inaprovaline"))
+ if(!reagents.has_reagent("epinephrine"))
adjustOxyLoss(1)
Paralyse(3)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index bd0c6694da7..dfa3cb878b9 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -712,6 +712,8 @@
// Needed for M_TOXIC_FART
if("fart")
+ if(reagents.has_reagent("simethicone"))
+ return
// playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
if(locate(/obj/item/weapon/storage/bible) in get_turf(src))
viewers(src) << "[src] farts on the Bible!"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index e05fe59b2ac..4d1a6e37d54 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -448,8 +448,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(!breath || (breath.total_moles() == 0) || suiciding)
var/oxyloss = 0
- if(reagents.has_reagent("inaprovaline"))
- return
if(suiciding)
oxyloss = 2
adjustOxyLoss(oxyloss)//If you are suiciding, you should die a little bit faster
@@ -973,7 +971,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if( health <= 20 && prob(1) )
spawn(0)
emote("gasp")
- if(!reagents.has_reagent("inaprovaline"))
+ if(!reagents.has_reagent("epinephrine"))
adjustOxyLoss(1)*/
if(hallucination && !(species.flags & IS_SYNTHETIC))
@@ -1008,7 +1006,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
adjustStaminaLoss(-10)
adjustHalLoss(-3)
if (mind)
- //Are they SSD? If so we'll keep them asleep but work off some of that sleep var in case of stoxin or similar.
+ //Are they SSD? If so we'll keep them asleep but work off some of that sleep var in case of morphine or similar.
if(player_logged)
sleeping = max(sleeping-1, 2)
else
@@ -1625,6 +1623,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(species.flags & IS_SYNTHETIC)
return
+ if(reagents.has_reagent("formaldehyde")) //embalming fluid stops decay
+ return
+
if(decaytime <= 6000) //10 minutes for decaylevel1 -- stinky
return
@@ -1652,7 +1653,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(M && (M.flags & MASKCOVERSMOUTH))
return
H << "You smell something foul..."
- H.vomit()
+ H.fakevomit()
proc/handle_heartbeat()
var/client/C = src.client
diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm
index 66eba695377..6ea67b70c6c 100644
--- a/code/modules/mob/living/carbon/metroid/life.dm
+++ b/code/modules/mob/living/carbon/metroid/life.dm
@@ -185,9 +185,9 @@
if (reagents.get_reagent_amount("plasma")>=5)
mutation_chance = min(mutation_chance + 5,50) //Prevents mutation chance going >50%
reagents.remove_reagent("plasma", 5)
- if (reagents.get_reagent_amount("inaprovaline")>=5)
+ if (reagents.get_reagent_amount("epinephrine")>=5)
mutation_chance = max(mutation_chance - 5,0) //Prevents muation chance going <0%
- reagents.remove_reagent("inaprovaline", 5)
+ reagents.remove_reagent("epinephrine", 5)
src.updatehealth()
return //TODO: DEFERRED
@@ -205,7 +205,7 @@
else if(src.health <= config.health_threshold_crit)
- if(!src.reagents.has_reagent("inaprovaline"))
+ if(!src.reagents.has_reagent("epinephrine"))
src.adjustOxyLoss(10)
if(src.stat != DEAD)
diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index 7b00947daa2..8ee75f39be4 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -83,7 +83,7 @@
tally += (283.222 - bodytemperature) / 10 * 1.75
if(reagents)
- if(reagents.has_reagent("hyperzine")) // Hyperzine slows slimes down
+ if(reagents.has_reagent("methamphetamine")) // Meth slows slimes down
tally *= 2
if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 1cc651fdc32..cd0db0092b4 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -503,7 +503,7 @@
if( health <= 20 && prob(1) )
spawn(0)
emote("gasp")
- if(!reagents.has_reagent("inaprovaline"))
+ if(!reagents.has_reagent("epinephrine"))
adjustOxyLoss(1)
Paralyse(3)
if(halloss > 100)
diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm
index d48d878f524..258067ebdde 100644
--- a/code/modules/mob/living/carbon/shock.dm
+++ b/code/modules/mob/living/carbon/shock.dm
@@ -11,18 +11,10 @@
1 * src.getCloneLoss() + \
1 * src.halloss
- if(reagents.has_reagent("alkysine"))
- src.traumatic_shock -= 5
- if(reagents.has_reagent("inaprovaline"))
- src.traumatic_shock -= 15
- if(reagents.has_reagent("synaptizine"))
- src.traumatic_shock -= 30
- if(reagents.has_reagent("paracetamol"))
- src.traumatic_shock -= 40
- if(reagents.has_reagent("tramadol"))
- src.traumatic_shock -= 60
- if(reagents.has_reagent("oxycodone"))
- src.traumatic_shock -= 200
+ if(reagents)
+ for(var/datum/reagent/R in reagents.reagent_list)
+ if(R.shock_reduction)
+ src.traumatic_shock -= R.shock_reduction // now you too can varedit cyanide to reduce shock by 1000 - Iamgoofball
if(src.slurring)
src.traumatic_shock -= 10
if(src.analgesic)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 3ef82b89f72..4f256f2a003 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -125,14 +125,14 @@
src.emag = new /obj/item/weapon/reagent_containers/spray(src)
- src.emag.reagents.add_reagent("pacid", 250)
+ src.emag.reagents.add_reagent("facid", 250)
src.emag.name = "Polyacid spray"
return
/obj/item/weapon/robot_module/medical/respawn_consumable(var/mob/living/silicon/robot/R)
if(src.emag)
var/obj/item/weapon/reagent_containers/spray/PS = src.emag
- PS.reagents.add_reagent("pacid", 2)
+ PS.reagents.add_reagent("facid", 2)
..()
/obj/item/weapon/robot_module/engineering
@@ -365,13 +365,13 @@
src.modules += new /obj/item/device/flash/cyborg/alien(src)
src.modules += new /obj/item/borg/sight/thermal/alien(src)
var/obj/item/weapon/reagent_containers/spray/alien/stun/S = new /obj/item/weapon/reagent_containers/spray/alien/stun(src)
- S.reagents.add_reagent("stoxin",250) //nerfed to sleeptoxin to make it less instant drop.
+ S.reagents.add_reagent("morphine",250) //nerfed to sleeptoxin to make it less instant drop.
src.modules += S
var/obj/item/weapon/reagent_containers/spray/alien/smoke/A = new /obj/item/weapon/reagent_containers/spray/alien/smoke(src)
S.reagents.add_reagent("water",50) //Water is used as a dummy reagent for the smoke bombs. More of an ammo counter.
src.modules += A
src.emag = new /obj/item/weapon/reagent_containers/spray/alien/acid(src)
- src.emag.reagents.add_reagent("pacid", 125)
+ src.emag.reagents.add_reagent("facid", 125)
src.emag.reagents.add_reagent("sacid", 125)
/obj/item/weapon/robot_module/alien/hunter/add_languages(var/mob/living/silicon/robot/R)
diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm
index f8dd9e5c6fe..6a1916c25f5 100644
--- a/code/modules/mob/living/simple_animal/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer.dm
@@ -259,7 +259,7 @@
if(chemicals < 50)
src << "You don't have enough chemicals!"
- var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("alkysine","bicaridine","hyperzine","tramadol")
+ var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","acetaminophen")
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 2f4331f9245..a12992c2ea5 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -49,7 +49,7 @@
melee_damage_upper = 10
poison_per_bite = 10
var/atom/cocoon_target
- poison_type = "stoxin"
+ poison_type = "morphine"
var/fed = 0
//hunters have the most poison and move the fastest, so they can find prey
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 5670f5e55de..046274a541c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -153,6 +153,6 @@
for(counter=0, counter<=powerlevel, counter++)
var/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
S.reagents.add_reagent("mushroomhallucinogen", powerlevel)
- S.reagents.add_reagent("doctorsdelight", powerlevel)
+ S.reagents.add_reagent("omnizine", powerlevel)
S.reagents.add_reagent("synaptizine", powerlevel)
del(src)
\ No newline at end of file
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 6767170003a..e83b7e4bff3 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -453,9 +453,8 @@ Note that amputating the affected organ does in fact remove the infection from t
// Internal wounds get worse over time. Low temperatures (cryo) stop them.
if(W.internal && !W.can_autoheal() && owner.bodytemperature >= 170)
- var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
- var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
- if(!bicardose || !inaprovaline) //bicaridine and inaprovaline stop internal wounds from growing bigger with time, and also stop bleeding
+ var/bicardose = owner.reagents.get_reagent_amount("styptic_powder")
+ if(!bicardose) //styptic powder stops internal wounds from growing bigger with time, and also stop bleeding
W.open_wound(0.1 * wound_update_accuracy)
owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
@@ -463,8 +462,8 @@ Note that amputating the affected organ does in fact remove the infection from t
if(prob(1 * wound_update_accuracy))
owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
- //overdose of bicaridine begins healing IB
- if(owner.reagents.get_reagent_amount("bicaridine") >= 30)
+ //overdose of styptic powder begins healing IB
+ if(owner.reagents.get_reagent_amount("styptic_powder") >= 30)
W.damage = max(0, W.damage - 0.2)
// slow healing
diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm
index e0872804ce3..fda0d31051d 100644
--- a/code/modules/organs/organ_internal.dm
+++ b/code/modules/organs/organ_internal.dm
@@ -191,7 +191,7 @@
src.damage = 0
//High toxins levels are dangerous
- if(owner.getToxLoss() >= 60 && !owner.reagents.has_reagent("anti_toxin"))
+ if(owner.getToxLoss() >= 60 && !owner.reagents.has_reagent("charcoal"))
//Healthy liver suffers on its own
if (src.damage < min_broken_damage)
src.damage += 0.2 * process_accuracy
@@ -202,7 +202,7 @@
O.damage += 0.2 * process_accuracy
//Detox can heal small amounts of damage
- if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))
+ if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("charcoal"))
src.damage -= 0.2 * process_accuracy
// Damaged liver means some chemicals are very dangerous
@@ -213,7 +213,7 @@
owner.adjustToxLoss(0.1 * process_accuracy)
// Can't cope with toxins at all
- for(var/toxin in list("toxin", "plasma", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker"))
+ for(var/toxin in list("toxin", "plasma", "sacid", "facid", "cyanide", "amanitin", "carpotoxin", "mindbreaker"))
if(owner.reagents.has_reagent(toxin))
owner.adjustToxLoss(0.3 * process_accuracy)
diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm
index b064fdf6621..f606f7b7838 100644
--- a/code/modules/organs/pain.dm
+++ b/code/modules/organs/pain.dm
@@ -9,11 +9,11 @@ mob/var/next_pain_time = 0
// amount is a num from 1 to 100
mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
if(stat >= 2) return
- if(reagents.has_reagent("paracetamol"))
+ if(reagents.has_reagent("acetaminophen"))
return
- if(reagents.has_reagent("tramadol"))
+ if(reagents.has_reagent("morphine"))
return
- if(reagents.has_reagent("oxycodone"))
+ if(reagents.has_reagent("hydrocodone"))
return
if(analgesic)
return
@@ -58,9 +58,9 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
if(species && species.flags & NO_PAIN) return
- if(reagents.has_reagent("tramadol"))
+ if(reagents.has_reagent("morphine"))
return
- if(reagents.has_reagent("oxycodone"))
+ if(reagents.has_reagent("hydrocodone"))
return
if(analgesic)
return
@@ -80,9 +80,9 @@ mob/living/carbon/human/proc/handle_pain()
if(species && species.flags & NO_PAIN) return
if(stat >= 2) return
- if(reagents.has_reagent("tramadol"))
+ if(reagents.has_reagent("morphine"))
return
- if(reagents.has_reagent("oxycodone"))
+ if(reagents.has_reagent("hydrocodone"))
return
if(analgesic)
return
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index e8e27782ccb..1655470302b 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -174,7 +174,7 @@
..()
reagents.add_reagent("aluminum", 15)
reagents.add_reagent("foaming_agent", 5)
- reagents.add_reagent("pacid", 5)
+ reagents.add_reagent("facid", 5)
//This one is for future syringe guns update
/obj/item/projectile/bullet/dart/syringe
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index eec7eb1415d..b5a8ca98460 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -380,7 +380,9 @@ datum
del(A)
update_total()
my_atom.on_reagent_change()
+ check_ignoreslow(my_atom)
check_gofast(my_atom)
+ check_goreallyfast(my_atom)
return 0
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 6abe0deff5e..e704ce70950 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -995,7 +995,7 @@
/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
/obj/item/weapon/grown/nettle = list("sacid" = 0),
- /obj/item/weapon/grown/deathnettle = list("pacid" = 0),
+ /obj/item/weapon/grown/deathnettle = list("facid" = 0),
/obj/item/weapon/grown/novaflower = list("capsaicin" = 0),
//Blender Stuff
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index e08f7203444..1588cbb14f7 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -24,7 +24,7 @@ datum
var/metabolization_rate = REAGENTS_METABOLISM
//var/list/viruses = list()
var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!)
-
+ var/shock_reduction = 0
proc
reaction_mob(var/mob/M, var/method=TOUCH, var/volume) //By default we have a chance to transfer some
if(!istype(M, /mob/living)) return 0
@@ -85,7 +85,7 @@ datum
on_mob_life(var/mob/living/M as mob, var/alien)
if(!istype(M, /mob/living)) // YOU'RE A FUCKING RETARD NEO WHY CAN'T YOU JUST FIX THE PROBLEM ON THE REAGENT - Iamgoofball
- return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO
+ return //Noticed runtime errors from facid trying to damage ghosts, this should fix. --NEO
// Certain elements in too large amounts cause side-effects
holder.remove_reagent(src.id, metabolization_rate) //By default it slowly disappears.
current_cycle++
@@ -318,25 +318,6 @@ datum
T.wet_overlay = null
return
- anti_toxin
- name = "Anti-Toxin (Dylovene)"
- id = "anti_toxin"
- description = "Dylovene is a broad-spectrum antitoxin."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(!M) M = holder.my_atom
- if(!alien || alien != IS_DIONA)
- M.drowsyness = max(M.drowsyness-2*REM, 0)
- M.hallucination = max(0, M.hallucination - 5*REM)
- M.adjustToxLoss(-2*REM)
- for(var/datum/reagent/R in M.reagents.reagent_list)
- if(R != src)
- M.reagents.remove_reagent(R.id,0.5)
- ..()
- return
-
toxin
name = "Toxin"
id = "toxin"
@@ -433,50 +414,6 @@ datum
..()
return
- stoxin
- name = "Sleep Toxin"
- id = "stoxin"
- description = "An effective hypnotic used to treat insomnia."
- reagent_state = LIQUID
- color = "#E895CC" // rgb: 232, 149, 204
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- switch(data)
- if(1 to 12)
- if(prob(5)) M.emote("yawn")
- if(12 to 15)
- M.eye_blurry = max(M.eye_blurry, 10)
- if(15 to 25)
- M.drowsyness = max(M.drowsyness, 20)
- if(25 to INFINITY)
- M.Paralyse(20)
- M.drowsyness = max(M.drowsyness, 30)
- data++
- ..()
- return
-
- inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(!M) M = holder.my_atom
-
- if(alien && alien == IS_VOX)
- M.adjustToxLoss(REAGENTS_METABOLISM)
- else
- if(M.losebreath >= 10)
- M.losebreath = max(10, M.losebreath-5)
-
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- ..()
- return
-
space_drugs
name = "Space drugs"
id = "space_drugs"
@@ -852,90 +789,6 @@ datum
M << "\red \the [O] melts."
del(O)
- pacid
- name = "Polytrinic acid"
- id = "pacid"
- description = "Polytrinic acid is a an extremely corrosive chemical substance."
- reagent_state = LIQUID
- color = "#8E18A9" // rgb: 142, 24, 169
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustToxLoss(1*REM)
- M.adjustFireLoss(1)
- ..()
- return
-
- reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if(!istype(M, /mob/living))
- return //wooo more runtime fixin
- if(method == TOUCH)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
-
- if(H.wear_mask)
- if(!H.wear_mask.unacidable)
- del (H.wear_mask)
- H.update_inv_wear_mask()
- H << "\red Your mask melts away but protects you from the acid!"
- else
- H << "\red Your mask protects you from the acid!"
- return
-
- if(H.head)
- if(prob(15) && !H.head.unacidable)
- del(H.head)
- H.update_inv_head()
- H << "\red Your helmet melts away but protects you from the acid"
- else
- H << "\red Your helmet protects you from the acid!"
- return
-
- if(!H.unacidable)
- var/datum/organ/external/affecting = H.get_organ("head")
- if(affecting.take_damage(15, 0))
- H.UpdateDamageIcon()
- H.emote("scream")
- else if(ismonkey(M))
- var/mob/living/carbon/monkey/MK = M
-
- if(MK.wear_mask)
- if(!MK.wear_mask.unacidable)
- del (MK.wear_mask)
- MK.update_inv_wear_mask()
- MK << "\red Your mask melts away but protects you from the acid!"
- else
- MK << "\red Your mask protects you from the acid!"
- return
-
- if(!MK.unacidable)
- MK.take_organ_damage(min(15, volume * 4)) // same deal as sulphuric acid
- else
- if(!M.unacidable)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/datum/organ/external/affecting = H.get_organ("head")
- if(affecting.take_damage(15, 0))
- H.UpdateDamageIcon()
- H.emote("scream")
- H.status_flags |= DISFIGURED
- else
- M.take_organ_damage(min(15, volume * 4))
-
- reaction_obj(var/obj/O, var/volume)
- if(istype(O,/obj/item/weapon/organ/head))
- new/obj/item/weapon/skeleton/head(O.loc)
- for(var/mob/M in viewers(5, O))
- M << "\red \the [O] melts."
- del(O)
- if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)))
- if(!O.unacidable)
- var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
- I.desc = "Looks like this was \an [O] some time ago."
- for(var/mob/M in viewers(5, O))
- M << "\red \the [O] melts."
- del(O)
-
glycerol
name = "Glycerol"
id = "glycerol"
@@ -983,34 +836,6 @@ datum
new /obj/effect/decal/cleanable/greenglow(T)
return
-
- ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- description = "Ryetalyn can cure all genetic abnomalities."
- reagent_state = SOLID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
-
- var/needs_update = 1 //M.mutations.len > 0
-
- for(var/block=1;block<=DNA_SE_LENGTH;block++)
- M.dna.SetSEState(block,0)
- genemutcheck(M,block,null,MUTCHK_FORCED)
- M.update_mutations()
-
- M.dna.struc_enzymes = M.dna.struc_enzymes_original
-
- // Might need to update appearance for hulk etc.
- if(needs_update && ishuman(M))
- var/mob/living/carbon/human/H = M
- H.update_mutations()
-
- ..()
- return
-
thermite
name = "Thermite"
id = "thermite"
@@ -1033,13 +858,13 @@ datum
..()
return
-
- paracetamol
- name = "Paracetamol"
- id = "paracetamol"
- description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
+ acetaminophen
+ name = "Acetaminophenl"
+ id = "acetaminophen"
+ description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller."
reagent_state = LIQUID
color = "#C855DC"
+ shock_reduction = 40
metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
on_mob_life(var/mob/living/M as mob) // what the fuck are you idiots smoking
@@ -1052,7 +877,7 @@ datum
id = "mutagen"
description = "Might cause unpredictable mutations. Keep away from children."
reagent_state = LIQUID
- color = "#13BC5E" // rgb: 19, 188, 94
+ color = "#00FF00"
metabolization_rate = 0.3
reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
@@ -1075,35 +900,20 @@ datum
..()
return
- tramadol
- name = "Tramadol"
- id = "tramadol"
- description = "A simple, yet effective painkiller."
- reagent_state = LIQUID
- color = "#C8A5DC"
- metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- ..()
- return
-
-
- oxycodone
- name = "Oxycodone"
- id = "oxycodone"
- description = "An effective and very addictive painkiller."
+ hydrocodone
+ name = "Hydrocodone-Acetaminophen"
+ id = "hydrocodone"
+ description = "An extremely effective painkiller; may have long term abuse consequences."
reagent_state = LIQUID
color = "#C805DC"
metabolization_rate = 0.3 // Lasts 1.5 minutes for 15 units
+ shock_reduction = 200
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
..()
return
-
-
virus_food
name = "Virus Food"
id = "virusfood"
@@ -1136,22 +946,6 @@ datum
reaction_turf(var/turf/T, var/volume)
T.germ_level -= min(volume*20, T.germ_level)
- /* reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- src = null
- if (method==TOUCH)
- if(istype(M, /mob/living/carbon/human))
- if(M.health >= -100 && M.health <= 0)
- M.crit_op_stage = 0.0
- if (method==INGEST)
- usr << "Well, that was stupid."
- M.adjustToxLoss(3)
- return
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.apply_effect(3,IRRADIATE,0)
- ..()
- return
- */
iron
name = "Iron"
id = "iron"
@@ -1341,8 +1135,6 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- if(holder.has_reagent("inaprovaline"))
- holder.remove_reagent("inaprovaline", 2*REM)
M.adjustToxLoss(3*REM)
..()
return
@@ -1354,22 +1146,6 @@ datum
..()
return
- leporazine
- name = "Leporazine"
- id = "leporazine"
- description = "Leporazine can be use to stabilize an individuals body temperature."
- reagent_state = LIQUID
- color = "#E9D66B" // rgb: 233, 214, 107
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(M.bodytemperature > 310)
- M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
- else if(M.bodytemperature < 311)
- M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
- return
-
cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
@@ -1401,101 +1177,6 @@ datum
..()
return
- kelotane
- name = "Kelotane"
- id = "kelotane"
- description = "Kelotane is a drug used to treat burns."
- reagent_state = LIQUID
- color = "#ECD540" // rgb: 236, 213, 64
-
- on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- //This needs a diona check but if one is added they won't be able to heal burn damage at all.
- M.heal_organ_damage(0,2*REM)
- ..()
- return
-
- dermaline
- name = "Dermaline"
- id = "dermaline"
- description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN
- return
- if(!M) M = holder.my_atom
- if(!alien || alien != IS_DIONA)
- M.heal_organ_damage(0,3*REM)
- ..()
- return
-
- dexalin
- name = "Dexalin"
- id = "dexalin"
- description = "Dexalin is used in the treatment of oxygen deprivation."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return //See above, down and around. --Agouri
- if(!M) M = holder.my_atom
-
- if(alien && alien == IS_VOX)
- M.adjustToxLoss(2*REM)
- else if(!alien || alien != IS_DIONA)
- M.adjustOxyLoss(-2*REM)
-
- if(holder.has_reagent("lexorin"))
- holder.remove_reagent("lexorin", 2*REM)
- ..()
- return
-
- dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
-
- if(alien && alien == IS_VOX)
- M.adjustOxyLoss()
- else if(!alien || alien != IS_DIONA)
- M.adjustOxyLoss(-M.getOxyLoss())
-
- if(holder.has_reagent("lexorin"))
- holder.remove_reagent("lexorin", 2*REM)
- ..()
- return
-
- tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- if(!alien || alien != IS_DIONA)
- if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-1*REM)
- if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(1*REM,0)
- if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,1*REM)
- if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-1*REM)
- ..()
- return
-
adminordrazine //An OP chemical for admins
name = "Adminordrazine"
id = "adminordrazine"
@@ -1553,101 +1234,15 @@ datum
synaptizine
name = "Synaptizine"
id = "synaptizine"
- description = "Synaptizine is a synaptic stimulant that can also be used to treat certain diseases."
+ description = "Synaptizine is used to treat neuroleptic shock. Can be used to help remove disabling symptoms such as paralysis."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#FA46FA"
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- M.drowsyness = max(M.drowsyness-5, 0)
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
- if(holder.has_reagent("mindbreaker"))
- holder.remove_reagent("mindbreaker", 5)
- M.hallucination = max(0, M.hallucination - 10)
- if(prob(60)) M.adjustToxLoss(1)
- ..()
- return
-
-
- impedrezene
- name = "Impedrezene"
- id = "impedrezene"
- description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
- reagent_state = LIQUID
- color = "#2C1608" // rgb: 44, 22, 8
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.jitteriness = max(M.jitteriness-5,0)
- if(prob(80)) M.adjustBrainLoss(1*REM)
- if(prob(50)) M.drowsyness = max(M.drowsyness, 3)
- if(prob(10)) M.emote("drool")
- ..()
- return
-
- hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.apply_effect(max(M.radiation-3*REM,0),IRRADIATE,0)
- ..()
- return
-
- arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
- reagent_state = LIQUID
- color = "#BFFF00" // rgb: 191, 255, 0
-
- on_mob_life(var/mob/living/M as mob)
- if(M.stat == 2.0)
- return //See above, down and around. --Agouri
- if(!M) M = holder.my_atom
- M.radiation = M.apply_effect(max(M.radiation-7*REM,0),IRRADIATE,0)
- M.adjustToxLoss(-1*REM)
- if(prob(15))
- M.take_organ_damage(1, 0)
- ..()
- return
-
- alkysine
- name = "Alkysine"
- id = "alkysine"
- description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
- reagent_state = LIQUID
- color = "#F77FBE" // rgb: 247, 127, 190
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustBrainLoss(-3*REM)
- ..()
- return
-
- imidazoline
- name = "Imidazoline"
- id = "imidazoline"
- description = "Heals eye damage"
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.eye_blurry = max(M.eye_blurry-5 , 0)
- M.eye_blind = max(M.eye_blind-5 , 0)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"]
- if(istype(E))
- if(E.damage > 0)
- E.damage -= 1
..()
return
@@ -1685,44 +1280,12 @@ datum
..()
return
-
- bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
- reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
-
- on_mob_life(var/mob/living/M as mob, var/alien)
- if(M.stat == 2.0)
- return
- if(!M) M = holder.my_atom
- if(alien != IS_DIONA)
- M.heal_organ_damage(2*REM,0)
- ..()
- return
-
- hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
- reagent_state = LIQUID
- color = "#CCFF00" // rgb: 204, 255, 0
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(prob(5)) M.emote(pick("twitch","blink_r","shiver"))
- M.status_flags |= GOTTAGOFAST
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- // ..()
- return
-
cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
- description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
+ description = "A plasma mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 265K for it to metabolise correctly."
reagent_state = LIQUID
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#0000C8" // rgb: 200, 165, 220
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -1800,32 +1363,6 @@ datum
..()
return
- zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
- description = "A strong neurotoxin that puts the subject into a death-like state."
- color = "#669900" // rgb: 102, 153, 0
-
- on_mob_life(var/mob/living/carbon/M as mob)
- if(!M) M = holder.my_atom
- if(volume >= 1) //Hotfix for Fakedeath never ending.
- M.status_flags |= FAKEDEATH
- else
- M.status_flags &= ~FAKEDEATH
- M.adjustOxyLoss(0.5*REM)
- M.adjustToxLoss(0.5*REM)
- M.Weaken(5)
- M.silent = max(M.silent, 5)
- M.tod = worldtime2text()
- ..()
- return
-
- /*Del()
- if(holder && ismob(holder.my_atom))
- var/mob/M = holder.my_atom
- M.status_flags &= ~FAKEDEATH
- ..()8*/
-
staminatoxin
name = "Tirizene"
id = "tirizene"
@@ -1927,13 +1464,6 @@ datum
reagent_state = SOLID
color = "#664B63" // rgb: 102, 75, 99
- nicotine
- name = "Nicotine"
- id = "nicotine"
- description = "A highly addictive stimulant extracted from the tobacco plant."
- reagent_state = LIQUID
- color = "#181818" // rgb: 24, 24, 24
-
ammonia
name = "Ammonia"
id = "ammonia"
@@ -1949,23 +1479,6 @@ datum
reagent_state = LIQUID
color = "#604030" // rgb: 96, 64, 48
- ethylredoxrazine // FUCK YOU, ALCOHOL
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
- description = "A powerful oxidizer that reacts with ethanol."
- reagent_state = SOLID
- color = "#605048" // rgb: 96, 80, 72
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.dizziness = 0
- M.drowsyness = 0
- M.stuttering = 0
- M.confused = 0
- M.reagents.remove_all_type(/datum/reagent/ethanol, 1*REM, 0, 1)
- ..()
- return
-
Spores
name = "Spores"
id = "spores"
@@ -1981,30 +1494,6 @@ datum
M.eye_blurry = max(M.eye_blurry, 3)
return
- chloralhydrate //Otherwise known as a "Mickey Finn"
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- description = "A powerful sedative."
- reagent_state = SOLID
- color = "#000067" // rgb: 0, 0, 103
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
- switch(data)
- if(1 to 10)
- M.confused += 2
- M.drowsyness += 2
- if(10 to 50)
- M.sleeping += 1
- if(51 to INFINITY)
- M.sleeping += 1
- M.adjustToxLoss((data - 50)*REM)
- holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
- ..()
- return
-
beer2 //disguised as normal beer for use by emagged brobots
name = "Beer"
id = "beer2"
@@ -2043,23 +1532,6 @@ datum
..()
return
- lipozine
- name = "Lipozine" // The anti-nutriment.
- id = "lipozine"
- description = "A chemical compound that causes a powerful fat-burning reaction."
- reagent_state = LIQUID
- nutriment_factor = 10 * REAGENTS_METABOLISM
- color = "#BBEDA4" // rgb: 187, 237, 164
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.nutrition -= nutriment_factor
- M.overeatduration = 0
- if(M.nutrition < 0)//Prevent from going into negatives.
- M.nutrition = 0
- ..()
- return
-
soysauce
name = "Soysauce"
id = "soysauce"
@@ -2256,32 +1728,6 @@ datum
..()
return
- amatoxin
- name = "Amanitin"
- id = "amatoxin"
- description = "A powerful poison derived from certain species of mushroom."
- color = "#792300" // rgb: 121, 35, 0
-
- on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- if(!data) data = 1
- data++
- ..()
- return
-
- Del()
- if(holder)
- if (istype(holder.my_atom,/mob/living))
- var/mob/living/M as mob
- var/to_remove = 0
- if (holder.has_reagent("anti_toxin"))
- to_remove = min(holder.get_reagent_amount("anti_toxin"),data)
- holder.remove_reagent("anti_toxin", to_remove, 0)
- data -= to_remove
- if(M)
- M.adjustToxLoss((data-1)*rand(2,4))
- ..()
-
psilocybin
name = "Psilocybin"
id = "psilocybin"
@@ -2371,11 +1817,11 @@ datum
del(hotspot)
enzyme
- name = "Universal Enzyme"
+ name = "Denatured Enzyme"
id = "enzyme"
- description = "A universal enzyme used in the preperation of certain chemicals and foods."
+ description = "Heated beyond usefulness, this enzyme is now worthless."
reagent_state = LIQUID
- color = "#365E30" // rgb: 54, 94, 48
+ color = "#282314" // rgb: 54, 94, 48
dry_ramen
name = "Dry Ramen"
@@ -2594,12 +2040,7 @@ datum
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-2)
- if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(2,0)
- if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,2)
- if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-2)
- if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15)
- if(M.confused !=0) M.confused = max(0,M.confused - 5)
+ if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1)
..()
return
@@ -3332,11 +2773,6 @@ datum
reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
- on_mob_life(var/mob/living/M as mob)
- M.Stun(2)
- ..()
- return
-
changelingsting
name = "Changeling Sting"
id = "changelingsting"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 2bd3ec01812..6d34c808ab5 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -59,32 +59,12 @@ datum
required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
result_amount = 3
*/
- stoxin
- name = "Sleep Toxin"
- id = "stoxin"
- result = "stoxin"
- required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
- result_amount = 5
sterilizine
name = "Sterilizine"
id = "sterilizine"
result = "sterilizine"
- required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1)
- result_amount = 3
-
- inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- result = "inaprovaline"
- required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1)
- result_amount = 3
-
- anti_toxin
- name = "Anti-Toxin (Dylovene)"
- id = "anti_toxin"
- result = "anti_toxin"
- required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1)
+ required_reagents = list("ethanol" = 1, "charcoal" = 1, "chlorine" = 1)
result_amount = 3
mutagen
@@ -93,28 +73,23 @@ datum
result = "mutagen"
required_reagents = list("radium" = 1, "plasma" = 1, "chlorine" = 1)
result_amount = 3
+ mix_message = "The substance turns neon green and bubbles unnervingly."
- tramadol
- name = "Tramadol"
- id = "tramadol"
- result = "tramadol"
- required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
+ acetaminophen
+ name = "Acetaminophen"
+ id = "acetaminophen"
+ result = "acetaminophen"
+ required_reagents = list("phenol" = 1, "sodium" = 1, "oxygen" = 1, "nitrogen" = 1, "sacid" = 1, "water" = 1)
+ result_amount = 6
+ mix_message = "The mixture becomes a fine white powder."
+
+ hydrocodone
+ name = "Hydrocodone"
+ id = "hydrocodone"
+ result = "hydrocodone"
+ required_reagents = list("morphine" = 1, "acetaminophen" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
result_amount = 3
- paracetamol
- name = "Paracetamol"
- id = "paracetamol"
- result = "paracetamol"
- required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1)
- result_amount = 3
-
- oxycodone
- name = "Oxycodone"
- id = "oxycodone"
- result = "oxycodone"
- required_reagents = list("ethanol" = 1, "tramadol" = 1, "plasma" = 1)
- result_amount = 1
-
thermite
name = "Thermite"
id = "thermite"
@@ -137,53 +112,11 @@ datum
required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
result_amount = 4
- pacid
- name = "Polytrinic acid"
- id = "pacid"
- result = "pacid"
- required_reagents = list("sacid" = 1, "chlorine" = 1, "potassium" = 1)
- result_amount = 3
-
- synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- result = "synaptizine"
- required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
- result_amount = 3
-
- hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- result = "hyronalin"
- required_reagents = list("radium" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- result = "arithrazine"
- required_reagents = list("hyronalin" = 1, "hydrogen" = 1)
- result_amount = 2
-
- impedrezene
- name = "Impedrezene"
- id = "impedrezene"
- result = "impedrezene"
- required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
- result_amount = 2
-
- kelotane
- name = "Kelotane"
- id = "kelotane"
- result = "kelotane"
- required_reagents = list("silicon" = 1, "carbon" = 1)
- result_amount = 2
-
peridaxon
name = "Peridaxon"
id = "peridaxon"
result = "peridaxon"
- required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
+ required_reagents = list("styptic_powder" = 2, "clonexadone" = 2)
required_catalysts = list("plasma" = 5)
result_amount = 2
@@ -201,14 +134,6 @@ datum
required_reagents = list("water" = 1, "milk" = 1)
result_amount = 5
- leporazine
- name = "Leporazine"
- id = "leporazine"
- result = "leporazine"
- required_reagents = list("silicon" = 1, "copper" = 1)
- required_catalysts = list("plasma" = 5)
- result_amount = 2
-
cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
@@ -216,69 +141,13 @@ datum
required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
result_amount = 3
- tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- result = "tricordrazine"
- required_reagents = list("inaprovaline" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- alkysine
- name = "Alkysine"
- id = "alkysine"
- result = "alkysine"
- required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1)
- result_amount = 2
-
- dexalin
- name = "Dexalin"
- id = "dexalin"
- result = "dexalin"
- required_reagents = list("oxygen" = 2)
- required_catalysts = list("plasma" = 5)
- result_amount = 1
-
- dermaline
- name = "Dermaline"
- id = "dermaline"
- result = "dermaline"
- required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1)
- result_amount = 3
-
- dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- result = "dexalinp"
- required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1)
- result_amount = 3
-
- bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- result = "bicaridine"
- required_reagents = list("inaprovaline" = 1, "carbon" = 1)
- result_amount = 2
-
- hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- result = "hyperzine"
- required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,)
- result_amount = 3
-
- ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- result = "ryetalyn"
- required_reagents = list("arithrazine" = 1, "carbon" = 1)
- result_amount = 2
-
cryoxadone
name = "Cryoxadone"
id = "cryoxadone"
result = "cryoxadone"
required_reagents = list("cryostylane" = 1, "plasma" = 1, "acetone" = 1, "mutagen" = 1)
result_amount = 4
+ mix_message = "The solution bubbles softly."
clonexadone
name = "Clonexadone"
@@ -292,30 +161,16 @@ datum
name = "Spaceacillin"
id = "spaceacillin"
result = "spaceacillin"
- required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1)
- result_amount = 2
-
- imidazoline
- name = "imidazoline"
- id = "imidazoline"
- result = "imidazoline"
- required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+ required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
result_amount = 2
inacusiate
name = "inacusiate"
id = "inacusiate"
result = "inacusiate"
- required_reagents = list("water" = 1, "carbon" = 1, "anti_toxin" = 1)
+ required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
result_amount = 2
- ethylredoxrazine
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
- result = "ethylredoxrazine"
- required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
- result_amount = 3
-
glycerol
name = "Glycerol"
id = "glycerol"
@@ -327,7 +182,7 @@ datum
name = "Nitroglycerin"
id = "nitroglycerin"
result = "nitroglycerin"
- required_reagents = list("glycerol" = 1, "pacid" = 1, "sacid" = 1)
+ required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
result_amount = 2
on_reaction(var/datum/reagents/holder, var/created_volume)
var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -343,47 +198,7 @@ datum
result = "sodiumchloride"
required_reagents = list("sodium" = 1, "chlorine" = 1, "water" = 1)
result_amount = 3
-
- flash_powder
- name = "Flash powder"
- id = "flash_powder"
- result = null
- required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
- result_amount = null
- on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(2, 1, location)
- s.start()
- for(var/mob/living/carbon/C in hearers(5, location))
- if(C.eyecheck())
- continue
- flick("e_flash", C.flash)
- if(get_dist(C, location) < 4)
- C.Weaken(5)
- continue
- C.Stun(5)
-
- chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- result = "chloralhydrate"
- required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
- result_amount = 1
-
- stoxin
- name = "Sleep Toxin"
- id = "stoxin"
- result = "stoxin"
- required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
- result_amount = 5
-
- zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
- result = "zombiepowder"
- required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5)
- result_amount = 2
+ mix_message = "The solution crystallizes with a brief flare of light."
rezadone
name = "Rezadone"
@@ -396,21 +211,14 @@ datum
name = "Mindbreaker Toxin"
id = "mindbreaker"
result = "mindbreaker"
- required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1)
+ required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
result_amount = 5
- lipozine
- name = "Lipozine"
- id = "Lipozine"
- result = "lipozine"
- required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1)
- result_amount = 3
-
plastication
name = "Plastic"
id = "solidplastic"
result = null
- required_reagents = list("pacid" = 10, "plasticide" = 20)
+ required_reagents = list("facid" = 10, "plasticide" = 20)
result_amount = 1
on_reaction(var/datum/reagents/holder)
var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/mineral/plastic
@@ -515,7 +323,7 @@ datum
name = "Metal Foam"
id = "metalfoam"
result = null
- required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1)
+ required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "facid" = 1)
result_amount = 5
on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -535,7 +343,7 @@ datum
name = "Iron Foam"
id = "ironlfoam"
result = null
- required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1)
+ required_reagents = list("iron" = 3, "foaming_agent" = 1, "facid" = 1)
result_amount = 5
on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -635,9 +443,9 @@ datum
slimeinaprov
- name = "Slime Inaprovaline"
- id = "m_inaprov"
- result = "inaprovaline"
+ name = "Slime Epinephrine"
+ id = "m_epinephrine"
+ result = "epinephrine"
required_reagents = list("water" = 5)
result_amount = 3
required_other = 1
@@ -1442,7 +1250,7 @@ datum
name = "The Doctor's Delight"
id = "doctordelight"
result = "doctorsdelight"
- required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "tricordrazine" = 1)
+ required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1)
result_amount = 5
irish_cream
@@ -1698,7 +1506,7 @@ datum
name = "Neurotoxin"
id = "neurotoxin"
result = "neurotoxin"
- required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
+ required_reagents = list("gargleblaster" = 1, "morphine" = 1)
result_amount = 2
snowwhite
diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm
index 151b6ea1841..277a7c9708b 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/reagents/dartgun.dm
@@ -294,10 +294,10 @@
desc = "A small gas-powered dartgun, fitted for nonhuman hands."
/obj/item/weapon/gun/dartgun/vox/medical
- starting_chems = list("kelotane","bicaridine","anti_toxin")
+ starting_chems = list("silver_sulfadiazine","styptic_powder","charcoal")
/obj/item/weapon/gun/dartgun/vox/raider
- starting_chems = list("space_drugs","stoxin","impedrezene")
+ starting_chems = list("space_drugs","morphine","haloperidol")
/obj/effect/syringe_gun_dummy //moved this shitty thing here
name = ""
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index c9f51162080..6b3e34759db 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -18,8 +18,11 @@ datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob)
var/smoke_message = pick("You can just feel your lungs dying!", "You feel relaxed.", "You feel calmed.", "You feel the lung cancer forming.", "You feel the money you wasted.", "You feel like a space cowboy.", "You feel rugged.")
if(prob(5))
M << "[smoke_message]"
- M.AdjustStunned(-1)
- M.adjustStaminaLoss(-1*REM)
+ if(prob(50))
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ M.adjustStaminaLoss(-1*REM)
..()
return
@@ -84,12 +87,19 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
required_temp = 390
+/datum/chemical_reaction/crank/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/T = get_turf(holder.my_atom)
+ for(var/turf/turf in range(1,T))
+ new /obj/fire(turf)
+ explosion(T,0,0,2)
+ return
+
/datum/reagent/krokodil
name = "Krokodil"
id = "krokodil"
- description = "Cools and calms you down. If overdosed it will deal significant Brain and Toxin damage. If addicted it will begin to deal fatal amounts of Brute damage as the subject's skin falls off."
+ description = "A sketchy homemade opiate, often used by disgruntled Cosmonauts."
reagent_state = LIQUID
- color = "#60A584" // rgb: 96, 165, 132
+ color = "#0264B4"
overdose_threshold = 20
addiction_threshold = 15
@@ -157,10 +167,10 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
if(prob(5))
M << "[high_message]"
- M.AdjustParalysis(-3)
- M.AdjustStunned(-3)
- M.AdjustWeakened(-3)
- M.adjustStaminaLoss(-3)
+ M.AdjustParalysis(-2)
+ M.AdjustStunned(-2)
+ M.AdjustWeakened(-2)
+ M.adjustStaminaLoss(-2)
M.status_flags |= GOTTAGOREALLYFAST
M.Jitter(3)
M.adjustBrainLoss(0.5)
@@ -170,9 +180,6 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
return
/datum/reagent/methamphetamine/overdose_process(var/mob/living/M as mob)
- if(M.canmove && !istype(M.loc, /turf/space))
- for(var/i = 0, i < 4, i++)
- step(M, pick(cardinal))
if(prob(20))
M.emote("laugh")
if(prob(33))
@@ -181,8 +188,8 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
if(I)
M.drop_item()
..()
- if(prob(20))
- M.adjustToxLoss(5)
+ if(prob(50))
+ M.adjustToxLoss(10)
M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
return
@@ -200,9 +207,6 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
..()
return
/datum/reagent/methamphetamine/addiction_act_stage3(var/mob/living/M as mob)
- if(M.canmove && !istype(M.loc, /turf/space))
- for(var/i = 0, i < 4, i++)
- step(M, pick(cardinal))
M.Jitter(15)
M.Dizzy(15)
if(prob(40))
@@ -210,9 +214,6 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
..()
return
/datum/reagent/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
- if(M.canmove && !istype(M.loc, /turf/space))
- for(var/i = 0, i < 8, i++)
- step(M, pick(cardinal))
M.Jitter(20)
M.Dizzy(20)
M.adjustToxLoss(5)
@@ -346,13 +347,13 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
name = "aranesp"
id = "aranesp"
result = "aranesp"
- required_reagents = list("epinephrine" = 1, "atropine" = 1, "morphine" = 1)
+ required_reagents = list("epinephrine" = 1, "atropine" = 1, "insulin" = 1)
result_amount = 3
/datum/reagent/aranesp
name = "Aranesp"
id = "aranesp"
- description = "Amps you up and gets you going, fixes all stamina damage you might have but can cause toxin and oxygen damage.."
+ description = "An illegal performance enhancing drug. Side effects might include chest pain, seizures, swelling, headache, fever... ... ..."
reagent_state = LIQUID
color = "#60A584" // rgb: 96, 165, 132
@@ -368,3 +369,20 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
M.adjustOxyLoss(20)
..()
return
+
+/datum/reagent/thc
+ name = "Tetrahydrocannabinol"
+ id = "thc"
+ description = "A mild psychoactive chemical extracted from the cannabis plant."
+ reagent_state = LIQUID
+ color = "#0FBE0F"
+
+
+/datum/reagent/thc/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(prob(8))
+ M.emote(pick("smile","giggle","laugh"))
+ if(prob(50))
+ M.stuttering += 2
+ ..()
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
new file mode 100644
index 00000000000..3e4c4dbbce4
--- /dev/null
+++ b/code/modules/reagents/newchem/food.dm
@@ -0,0 +1,76 @@
+datum/reagent/egg
+ name = "Egg"
+ id = "egg"
+ description = "A runny and viscous mixture of clear and yellow fluids."
+ reagent_state = LIQUID
+ color = "#F0C814"
+
+datum/reagent/egg/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(prob(5))
+ M.emote("fart")
+ ..()
+ return
+
+datum/reagent/triple_citrus
+ name = "Triple Citrus"
+ id = "triple_citrus"
+ description = "A solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+/datum/chemical_reaction/triple_citrus
+ name = "triple_citrus"
+ id = "triple_citrus"
+ result = "triple_citrus"
+ required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
+ result_amount = 5
+
+datum/reagent/corn_starch
+ name = "Corn Starch"
+ id = "corn_starch"
+ description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+/datum/chemical_reaction/corn_syrup
+ name = "corn_syrup"
+ id = "corn_syrup"
+ result = "corn_syrup"
+ required_reagents = list("corn_starch" = 1, "sacid" = 1)
+ result_amount = 2
+ required_temp = 374
+
+datum/reagent/corn_syrup
+ name = "Corn Syrup"
+ id = "corn_syrup"
+ description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/corn_syrup/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.reagents.add_reagent("sugar", 1.2)
+ ..()
+ return
+
+/datum/chemical_reaction/vhfcs
+ name = "vhfcs"
+ id = "vhfcs"
+ result = "vhfcs"
+ required_reagents = list("corn_syrup" = 1)
+ required_catalysts = list("enzyme" = 1)
+ result_amount = 1
+
+datum/reagent/vhfcs
+ name = "Very-high-fructose corn syrup"
+ id = "vhfcs"
+ description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.reagents.add_reagent("sugar", 2.4)
+ ..()
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 2ad2c3708ec..c730e4a0469 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -7,9 +7,9 @@
datum/reagent/silver_sulfadiazine
name = "Silver Sulfadiazine"
id = "silver_sulfadiazine"
- description = "On touch, quickly heals burn damage. Basic anti-burn healing drug. On ingestion, deals minor toxin damage."
+ description = "This antibacterial compound is used to treat burn victims."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#F0C814"
metabolization_rate = 2
datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
@@ -17,11 +17,11 @@ datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/meth
if(method == TOUCH)
M.adjustFireLoss(-volume)
if(show_message)
- M << "You feel your burns healing!"
+ M << "The silver sulfadiazine soothes your burns."
if(method == INGEST)
M.adjustToxLoss(0.5*volume)
if(show_message)
- M << "You probably shouldn't have eaten that. Maybe you should of splashed it on, or applied a patch?"
+ M << "You feel sick..."
..()
return
@@ -34,7 +34,7 @@ datum/reagent/silver_sulfadiazine/on_mob_life(var/mob/living/M as mob)
datum/reagent/styptic_powder
name = "Styptic Powder"
id = "styptic_powder"
- description = "On touch, quickly heals brute damage. Basic anti-brute healing drug. On ingestion, deals minor toxin damage."
+ description = "Styptic (aluminium sulfate) powder helps control bleeding and heal physical wounds."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 2
@@ -44,12 +44,12 @@ datum/reagent/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TO
if(method == TOUCH)
M.adjustBruteLoss(-volume)
if(show_message)
- M << "You feel your wounds knitting back together!"
+ M << "The styptic powder stings like hell as it closes some of your wounds!"
M.emote("scream")
if(method == INGEST)
M.adjustToxLoss(0.5*volume)
if(show_message)
- M << "You probably shouldn't have eaten that. Maybe you should of splashed it on, or applied a patch?"
+ M << "You feel gross!"
..()
return
@@ -63,7 +63,7 @@ datum/reagent/styptic_powder/on_mob_life(var/mob/living/M as mob)
datum/reagent/salglu_solution
name = "Saline-Glucose Solution"
id = "salglu_solution"
- description = "Has a 33% chance per metabolism cycle to heal brute and burn damage."
+ description = "This saline and glucose solution can help stabilize critically injured patients and cleanse wounds."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.15
@@ -79,9 +79,9 @@ datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob)
datum/reagent/synthflesh
name = "Synthflesh"
id = "synthflesh"
- description = "Has a 100% chance of instantly healing brute and burn damage. One unit of the chemical will heal one point of damage. Touch application only."
+ description = "A resorbable microfibrillar collagen and protein mixture that can rapidly heal injuries when applied topically."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#FFEBEB"
datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume,var/show_message = 1)
if(!M) M = holder.my_atom
@@ -90,14 +90,14 @@ datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vo
M.adjustBruteLoss(-1.5*volume)
M.adjustFireLoss(-1.5*volume)
if(show_message)
- M << "You feel your burns healing and your flesh knitting together!"
+ M << "The synthetic flesh integrates itself into your wounds, healing you."
..()
return
datum/reagent/charcoal
name = "Charcoal"
id = "charcoal"
- description = "Heals toxin damage, and will also slowly remove any other chemicals."
+ description = "Activated charcoal helps to absorb toxins."
reagent_state = LIQUID
color = "#C8A5DC"
@@ -125,6 +125,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
result = "silver_sulfadiazine"
required_reagents = list("ammonia" = 1, "silver" = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
result_amount = 5
+ mix_message = "A strong and cloying odor begins to bubble from the mixture."
/datum/chemical_reaction/salglu_solution
name = "Saline-Glucose Solution"
@@ -151,7 +152,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
datum/reagent/omnizine
name = "Omnizine"
id = "omnizine"
- description = "Heals 1 of each damage type a cycle. If overdosed it will deal significant amounts of each damage type."
+ description = "Omnizine is a highly potent healing medication that can be used to treat a wide range of injuries."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.2
@@ -177,9 +178,9 @@ datum/reagent/omnizine/overdose_process(var/mob/living/M as mob)
datum/reagent/calomel
name = "Calomel"
id = "calomel"
- description = "Quickly purges the body of all chemicals. If your health is above 20, toxin damage is dealt. When you hit 20 health or lower, the damage will cease."
+ description = "This potent purgative rids the body of impurities. It is highly toxic however and close supervision is required."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#1EA532"
datum/reagent/calomel/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -204,9 +205,9 @@ datum/reagent/calomel/on_mob_life(var/mob/living/M as mob)
datum/reagent/potass_iodide
name = "Potassium Iodide"
id = "potass_iodide"
- description = "Reduces low radiation damage very effectively."
+ description = "Potassium Iodide is a medicinal drug used to counter the effects of radiation poisoning."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#B4DCBE"
datum/reagent/potass_iodide/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -224,11 +225,12 @@ datum/reagent/potass_iodide/on_mob_life(var/mob/living/M as mob)
result = "potass_iodide"
required_reagents = list("potassium" = 1, "iodine" = 1)
result_amount = 2
+ mix_message = "The solution settles calmly and emits gentle fumes."
datum/reagent/pen_acid
name = "Pentetic Acid"
id = "pen_acid"
- description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body. Has a chance of dealing brute damage."
+ description = "Pentetic Acid is an aggressive chelation agent. May cause tissue damage. Use with caution."
reagent_state = LIQUID
color = "#C8A5DC"
@@ -254,11 +256,12 @@ datum/reagent/pen_acid/on_mob_life(var/mob/living/M as mob)
result = "pen_acid"
required_reagents = list("fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
result_amount = 6
+ mix_message = "The substance becomes very still, emitting a curious haze."
datum/reagent/sal_acid
name = "Salicylic Acid"
id = "sal_acid"
- description = "If you have less than 50 brute damage, there is a 50% chance to heal one unit. If overdosed it will have a 50% chance to deal 2 brute damage if the patient has less than 50 brute damage already."
+ description = "This is a is a standard salicylate pain reliever and fever reducer."
reagent_state = LIQUID
color = "#C8A5DC"
overdose_threshold = 25
@@ -284,13 +287,14 @@ datum/reagent/sal_acid/overdose_process(var/mob/living/M as mob)
result = "sal_acid"
required_reagents = list("sodium" = 1, "phenol" = 1, "carbon" = 1, "oxygen" = 1, "sacid" = 1)
result_amount = 5
+ mix_message = "The mixture crystallizes."
datum/reagent/salbutamol
name = "Salbutamol"
id = "salbutamol"
- description = "Quickly heals oxygen damage while slowing down suffocation. Great for stabilizing critical patients!"
+ description = "Salbutamol is a common bronchodilation medication for asthmatics. It may help with other breathing problems as well."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#A5F0EE"
metabolization_rate = 0.2
datum/reagent/salbutamol/on_mob_life(var/mob/living/M as mob)
@@ -307,11 +311,12 @@ datum/reagent/salbutamol/on_mob_life(var/mob/living/M as mob)
result = "salbutamol"
required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminum" = 1, "bromine" = 1, "ammonia" = 1)
result_amount = 5
+ mix_message = "The solution bubbles freely, creating a head of bluish foam."
datum/reagent/perfluorodecalin
name = "Perfluorodecalin"
id = "perfluorodecalin"
- description = "Heals suffocation damage so quickly that you could have a spacewalk, but it mutes your voice. Has a 33% chance of healing brute and burn damage per cycle as well."
+ description = "This experimental perfluoronated solvent has applications in liquid breathing and tissue oxygenation. Use with caution."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.2
@@ -338,7 +343,7 @@ datum/reagent/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob)
datum/reagent/ephedrine
name = "Ephedrine"
id = "ephedrine"
- description = "Reduces stun times, increases run speed. If overdosed it will deal toxin and oxyloss damage."
+ description = "Ephedrine is a plant-derived stimulant."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.3
@@ -397,9 +402,9 @@ datum/reagent/ephedrine/addiction_act_stage4(var/mob/living/M as mob)
datum/reagent/diphenhydramine
name = "Diphenhydramine"
id = "diphenhydramine"
- description = "Purges body of lethal Histamine and reduces jitteriness while causing minor drowsiness."
+ description = "Anti-allergy medication. May cause drowsiness, do not operate heavy machinery while using this."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#A5F0EE"
datum/reagent/diphenhydramine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.drowsyness += 1
@@ -414,25 +419,30 @@ datum/reagent/diphenhydramine/on_mob_life(var/mob/living/M as mob)
result = "diphenhydramine"
required_reagents = list("oil" = 1, "carbon" = 1, "bromine" = 1, "diethylamine" = 1, "ethanol" = 1)
result_amount = 4
- mix_message = "The mixture dries into a pale blue powder."
+ mix_message = "The mixture fizzes gently."
datum/reagent/morphine
name = "Morphine"
id = "morphine"
- description = "Will allow you to ignore slowdown from equipment and damage. Will eventually knock you out if you take too much. If overdosed it will cause jitteriness, dizziness, force the victim to drop items in their hands and eventually deal toxin damage."
+ description = "A strong but highly addictive opiate painkiller with sedative side effects."
reagent_state = LIQUID
color = "#C8A5DC"
- var/cycle_count = 0
overdose_threshold = 30
addiction_threshold = 25
-
+ shock_reduction = 60
datum/reagent/morphine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.status_flags |= IGNORESLOWDOWN
- if(cycle_count >= 36)
- M.sleeping += 3
- cycle_count++
+ switch(current_cycle)
+ if(0 to 15)
+ if(prob(5))
+ M.emote("yawn")
+ if(16 to 35)
+ M.drowsyness = max(M.drowsyness, 10)
+ if(36 to INFINITY)
+ M.Paralyse(10)
+ M.drowsyness = max(M.drowsyness, 15)
..()
return
@@ -502,14 +512,14 @@ datum/reagent/oculine/on_mob_life(var/mob/living/M as mob)
name = "Oculine"
id = "oculine"
result = "oculine"
- required_reagents = list("charcoal" = 1, "carbon" = 1, "hydrogen" = 1)
+ required_reagents = list("atropine" = 1, "spaceacillin" = 1, "salglu_solution" = 1)
result_amount = 3
- mix_message = "The mixture sputters loudly and becomes a pale pink color."
+ mix_message = "The mixture settles, becoming a milky white."
datum/reagent/oculine
name = "Oculine"
id = "oculine"
- description = "Cures blindness and heals eye damage over time."
+ description = "Oculine is a saline eye medication with mydriatic and antibiotic effects."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.4
@@ -518,9 +528,9 @@ datum/reagent/oculine
datum/reagent/atropine
name = "Atropine"
id = "atropine"
- description = "If patients health is below -25 it will heal 3 brute and burn damage per cycle, as well as stop any oxyloss. Good for stabilising critical patients."
+ description = "Atropine is a potent cardiac resuscitant but it can causes confusion, dizzyness and hyperthermia."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#000000"
metabolization_rate = 0.2
overdose_threshold = 35
@@ -556,11 +566,12 @@ datum/reagent/atropine/overdose_process(var/mob/living/M as mob)
result = "atropine"
required_reagents = list("ethanol" = 1, "acetone" = 1, "diethylamine" = 1, "phenol" = 1, "sacid" = 1)
result_amount = 5
+ mix_message = "A horrid smell like something died drifts from the mixture."
datum/reagent/epinephrine
name = "Epinephrine"
id = "epinephrine"
- description = "Reduces most of the knockout/stun effects, minor stamina regeneration buff. Attempts to stop you taking too much oxygen damage. If the patient is in low to severe crit, heals toxins, brute, and burn very effectively. Will not heal patients who are almost dead. If overdosed will stun and deal toxin damage"
+ description = "Epinephrine is a potent neurotransmitter, used in medical emergencies to halt anaphylactic shock and prevent cardiac arrest."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.2
@@ -578,11 +589,6 @@ datum/reagent/epinephrine/on_mob_life(var/mob/living/M as mob)
M.losebreath -= 4
if(M.losebreath < 0)
M.losebreath = 0
- M.adjustStaminaLoss(-1*REM)
- if(prob(30))
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
..()
return
@@ -600,22 +606,24 @@ datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob)
result = "epinephrine"
required_reagents = list("phenol" = 1, "acetone" = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
result_amount = 6
+ mix_message = "Tiny white crystals precipitate out of the solution."
datum/reagent/strange_reagent
name = "Strange Reagent"
id = "strange_reagent"
- description = "A miracle drug that can bring a dead body back to life! If the corpse has suffered too much damage, however, no change will occur to the body. If used on a living person it will deal Brute and Burn damage."
+ description = "A glowing green fluid highly reminiscent of nuclear waste."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#60A584"
datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, var/method=TOUCH, var/volume)
if(M.stat == DEAD)
if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100)
- M.visible_message("[M]'s body convulses a bit, and then falls still once more.")
+ M.visible_message("[M]'s body starts convulsing!")
+ M.gib()
return
var/mob/dead/observer/ghost = M.get_ghost()
- M.visible_message("[M]'s body convulses a bit.")
if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
+ M.visible_message("[M]'s appears to rise from the dead!")
M.stat = 1
M.adjustOxyLoss(-20)
M.adjustToxLoss(-20)
@@ -721,12 +729,12 @@ proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reac
result = "mannitol"
required_reagents = list("sugar" = 1, "hydrogen" = 1, "water" = 1)
result_amount = 3
- mix_message = "The solution slightly bubbles, becoming thicker."
+ mix_message = "The mixture bubbles slowly, making a slightly sweet odor."
/datum/reagent/mannitol
name = "Mannitol"
id = "mannitol"
- description = "Heals brain damage effectively. Use it in cyro tubes alongside Cryoxadone."
+ description = "Mannitol is a sugar alcohol that can help alleviate cranial swelling."
color = "#C8A5DC"
/datum/reagent/mutadone/on_mob_life(var/mob/living/carbon/human/M as mob)
@@ -753,19 +761,20 @@ proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reac
result = "mutadone"
required_reagents = list("mutagen" = 1, "acetone" = 1, "bromine" = 1)
result_amount = 3
+ mix_message = "A foul astringent liquid emerges from the reaction."
/datum/reagent/mutadone
name = "Mutadone"
id = "mutadone"
- description = "Heals your genetic defects."
- color = "#C8A5DC"
+ description = "Mutadone is an experimental bromide that can cure genetic abnomalities."
+ color = "#5096C8"
datum/reagent/antihol
name = "Antihol"
id = "antihol"
- description = "Helps remove Alcohol from someone's body, as well as eliminating its side effects."
- color = "#C8A5DC"
+ description = "A medicine which quickly eliminates alcohol in the body."
+ color = "#009CA8"
datum/reagent/antihol/on_mob_life(var/mob/living/M as mob)
M.dizziness = 0
@@ -781,13 +790,7 @@ datum/reagent/antihol/on_mob_life(var/mob/living/M as mob)
result = "antihol"
required_reagents = list("ethanol" = 1, "charcoal" = 1)
result_amount = 2
-
-/datum/chemical_reaction/cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
- result = "cryoxadone"
- required_reagents = list("plasma" = 1, "acetone" = 1, "mutagen" = 1)
- result_amount = 3
+ mix_message = "A minty and refreshing smell drifts from the effervescent mixture."
/datum/reagent/stimulants
name = "Stimulants"
@@ -819,13 +822,88 @@ datum/reagent/stimulants/reagent_deleted(var/mob/living/M as mob)
datum/reagent/insulin
name = "Insulin"
id = "insulin"
- description = "Increases sugar depletion rates."
+ description = "A hormone generated by the pancreas responsible for metabolizing carbohydrates and fat in the bloodstream."
reagent_state = LIQUID
color = "#C8A5DC"
datum/reagent/insulin/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- if(M.sleeping)
- M.sleeping--
M.reagents.remove_reagent("sugar", 5)
..()
return
+
+
+/datum/reagent/simethicone
+ name = "Simethicone"
+ id = "simethicone"
+ description = "This strange liquid seems to have no bubbles on the surface."
+ color = "#14AA46"
+
+/datum/chemical_reaction/Simethicone
+ name = "Simethicone"
+ id = "simethicone"
+ result = "simethicone"
+ required_reagents = list("hydrogen" = 1, "chlorine" = 1, "silicon" = 1, "oxygen" = 1)
+ result_amount = 4
+
+
+datum/reagent/teporone
+ name = "Teporone"
+ id = "teporone"
+ description = "This experimental plasma-based compound seems to regulate body temperature."
+ reagent_state = LIQUID
+ color = "#D782E6"
+
+datum/reagent/teporone/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(M.bodytemperature > 310)
+ M.bodytemperature -= 10
+ if(M.bodytemperature < 310)
+ M.bodytemperature += 10
+ ..()
+ return
+
+/datum/chemical_reaction/teporone
+ name = "Teporone"
+ id = "teporone"
+ result = "teporone"
+ required_reagents = list("acetone" = 1, "silicon" = 1, "plasma" = 1)
+ result_amount = 2
+ mix_message = "The mixture turns an odd lavender color."
+
+datum/reagent/haloperidol
+ name = "Haloperidol"
+ id = "haloperidol"
+ description = "Haloperidol is a powerful antipsychotic and sedative. Will help control psychiatric problems, but may cause brain damage."
+ reagent_state = LIQUID
+ color = "#FFDCFF"
+
+datum/reagent/haloperidol/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.reagents.remove_reagent("crank",5)
+ M.reagents.remove_reagent("methamphetamine",5)
+ M.reagents.remove_reagent("space_drugs",5)
+ M.reagents.remove_reagent("psilocybin",5)
+ M.reagents.remove_reagent("ephedrine",5)
+ M.reagents.remove_reagent("epinephrine",5)
+ M.reagents.remove_reagent("stimulants",5)
+ M.reagents.remove_reagent("bath_salts",5)
+ M.reagents.remove_reagent("mindbreaker",5)
+ M.druggy -= 5
+ M.hallucination -= 5
+ M.jitteriness -= 5
+ if(prob(40))
+ M.drowsyness = max(M.drowsyness, 2)
+ if(prob(10))
+ M.emote("drool")
+ if(prob(20))
+ M.adjustBrainLoss(1)
+ ..()
+ return
+
+/datum/chemical_reaction/haloperidol
+ name = "Haloperidol"
+ id = "haloperidol"
+ result = "haloperidol"
+ required_reagents = list("chlorine" = 1, "fluorine" = 1, "aluminum" = 1, "potass_iodide" = 1, "oil" = 1)
+ result_amount = 4
+ mix_message = "The chemicals mix into an odd pink slush."
\ No newline at end of file
diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm
index 1b336a8df66..3df9450e73b 100644
--- a/code/modules/reagents/newchem/other.dm
+++ b/code/modules/reagents/newchem/other.dm
@@ -119,17 +119,6 @@ datum/reagent/colorful_reagent
required_reagents = list("plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
result_amount = 5
-datum/reagent/colorful_reagent/on_mob_life(var/mob/living/M as mob)
- if(M && isliving(M))
- M.color = pick(random_color_list)
- ..()
- return
-
-datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume)
- if(M && isliving(M))
- M.color = pick(random_color_list)
- ..()
- return
datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume)
if(O)
O.color = pick(random_color_list)
@@ -141,70 +130,6 @@ datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume)
..()
return
-
-datum/reagent/triple_citrus
- name = "Triple Citrus"
- id = "triple_citrus"
- description = "A solution."
- reagent_state = LIQUID
- color = "#C8A5DC"
-
-/datum/chemical_reaction/triple_citrus
- name = "triple_citrus"
- id = "triple_citrus"
- result = "triple_citrus"
- required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
- result_amount = 5
-
-datum/reagent/corn_starch
- name = "Corn Starch"
- id = "corn_starch"
- description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings."
- reagent_state = LIQUID
- color = "#C8A5DC"
-
-/datum/chemical_reaction/corn_syrup
- name = "corn_syrup"
- id = "corn_syrup"
- result = "corn_syrup"
- required_reagents = list("corn_starch" = 1, "sacid" = 1)
- result_amount = 2
- required_temp = 374
-
-datum/reagent/corn_syrup
- name = "Corn Syrup"
- id = "corn_syrup"
- description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars."
- reagent_state = LIQUID
- color = "#C8A5DC"
-
-datum/reagent/corn_syrup/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.reagents.add_reagent("sugar", 1.2)
- ..()
- return
-
-/datum/chemical_reaction/vhfcs
- name = "vhfcs"
- id = "vhfcs"
- result = "vhfcs"
- required_reagents = list("corn_syrup" = 1)
- required_catalysts = list("enzyme" = 1)
- result_amount = 1
-
-datum/reagent/vhfcs
- name = "Very-high-fructose corn syrup"
- id = "vhfcs"
- description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose."
- reagent_state = LIQUID
- color = "#C8A5DC"
-
-datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.reagents.add_reagent("sugar", 2.4)
- ..()
- return
-
/datum/chemical_reaction/corgium
name = "corgium"
id = "corgium"
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 6699a688ffe..20f9036870a 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -7,9 +7,9 @@
/datum/reagent/stabilizing_agent
name = "Stabilizing Agent"
id = "stabilizing_agent"
- description = "Keeps unstable chemicals stable. This does not work on everything."
+ description = "A chemical that stabilises normally volatile compounds, preventing them from reacting immediately."
reagent_state = LIQUID
- color = "#FFFFFF"
+ color = "#FFFF00"
/datum/chemical_reaction/stabilizing_agent
name = "stabilizing_agent"
@@ -17,6 +17,7 @@
result = "stabilizing_agent"
required_reagents = list("iron" = 1, "oxygen" = 1, "hydrogen" = 1)
result_amount = 3
+ mix_message = "The mixture becomes a yellow liquid!"
/datum/reagent/clf3
name = "Chlorine Trifluoride"
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index 91fb49b6b31..4f22123c78b 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -44,6 +44,7 @@ datum/reagent/histamine/on_mob_life(var/mob/living/M as mob)
M.adjustBruteLoss(2*REM)
..()
return
+
datum/reagent/histamine/overdose_process(var/mob/living/M as mob)
M.adjustOxyLoss(pick(1,3)*REM)
M.adjustBruteLoss(pick(1,3)*REM)
@@ -54,7 +55,7 @@ datum/reagent/histamine/overdose_process(var/mob/living/M as mob)
datum/reagent/formaldehyde
name = "Formaldehyde"
id = "formaldehyde"
- description = "Deals a moderate amount of Toxin damage over time. 10% chance to decay into 10-15 histamine."
+ description = "Formaldehyde is a common industrial chemical and is used to preserve corpses and medical samples. It is highly toxic and irritating."
reagent_state = LIQUID
color = "#CF3600"
@@ -62,8 +63,7 @@ datum/reagent/formaldehyde/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustToxLoss(1*REM)
if(prob(10))
- M.reagents.add_reagent("histamine",pick(5,15))
- M.reagents.remove_reagent("formaldehyde",1)
+ M.reagents.add_reagent("histamine",rand(5,15))
..()
return
@@ -74,6 +74,7 @@ datum/reagent/formaldehyde/on_mob_life(var/mob/living/M as mob)
required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
result_amount = 3
required_temp = 420
+ mix_message = "Ugh, it smells like the morgue in here."
datum/reagent/venom
name = "Venom"
@@ -82,32 +83,38 @@ datum/reagent/venom
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.2
+ overdose_threshold = 40
+
datum/reagent/venom/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustToxLoss((0.1*volume)*REM)
M.adjustBruteLoss((0.1*volume)*REM)
if(prob(25))
- M.reagents.add_reagent("histamine",pick(5,10))
- M.reagents.remove_reagent("venom",1)
+ M.reagents.add_reagent("histamine",rand(5,10))
+ ..()
+ return
+
+datum/reagent/venom/overdose_process(var/mob/living/M as mob)
+ if(volume >= 40)
+ if(prob(4))
+ M.gib()
..()
return
datum/reagent/neurotoxin2
name = "Neurotoxin"
id = "neurotoxin2"
- description = "Deals toxin and brain damage up to 60 before it slows down, causing confusion and a knockout after 17 elapsed cycles."
+ description = "A dangerous toxin that attacks the nervous system."
reagent_state = LIQUID
- color = "#CF3600"
- var/cycle_count = 0
+ color = "#60A584"
metabolization_rate = 1
datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
- cycle_count++
if(M.brainloss < 60)
M.adjustBrainLoss(1*REM)
M.adjustToxLoss(1*REM)
- if(cycle_count == 17)
- M.sleeping += 10 // buffed so it works
+ if(current_cycle >= 17)
+ M.Paralyse(10)
..()
return
@@ -122,7 +129,7 @@ datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
datum/reagent/cyanide
name = "Cyanide"
id = "cyanide"
- description = "Deals toxin damage, alongside some oxygen loss. 8% chance of stun and some extra toxin damage."
+ description = "A highly toxic chemical with some uses as a building block for other things."
reagent_state = LIQUID
color = "#CF3600"
metabolization_rate = 0.1
@@ -146,6 +153,7 @@ datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob)
required_reagents = list("oil" = 1, "ammonia" = 1, "oxygen" = 1)
result_amount = 3
required_temp = 380
+ mix_message = "The mixture gives off a faint scent of almonds."
/datum/reagent/questionmark // food poisoning
name = "????"
@@ -324,9 +332,9 @@ datum/reagent/initropidril/on_mob_life(var/mob/living/M as mob)
datum/reagent/pancuronium
name = "Pancuronium"
id = "pancuronium"
- description = "Knocks you out after 30 seconds, 7% chance to cause some oxygen loss."
+ description = "Pancuronium bromide is a powerful skeletal muscle relaxant."
reagent_state = LIQUID
- color = "#CF3600"
+ color = "#1E4664"
metabolization_rate = 0.2
datum/reagent/pancuronium/on_mob_life(var/mob/living/M as mob)
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index afe56a4f731..e27b9647491 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -14,14 +14,14 @@
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/list/datum/reagents/reagent_list = list()
- var/list/reagent_ids = list("doctorsdelight", "inaprovaline", "spaceacillin")
- //var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "anti_toxin", "inaprovaline", "spaceacillin")
+ var/list/reagent_ids = list("salglu_solution", "epinephrine", "spaceacillin")
+ //var/list/reagent_ids = list("salbutamol", "silver_sulfadiazine", "styptic_powder", "charcoal", "epinephrine", "spaceacillin")
/obj/item/weapon/reagent_containers/borghypo/surgeon
- reagent_ids = list("bicaridine", "inaprovaline", "dexalin")
+ reagent_ids = list("styptic_powder", "epinephrine", "salbutamol")
/obj/item/weapon/reagent_containers/borghypo/crisis
- reagent_ids = list("doctorsdelight", "inaprovaline", "tramadol")
+ reagent_ids = list("salglu_solution", "epinephrine", "acetaminophen")
/obj/item/weapon/reagent_containers/borghypo/New()
..()
@@ -78,7 +78,7 @@
user << "\blue You inject [M] with the injector."
M << "\red You feel a tiny prick!"
- R.reaction(M, INGEST)
+ R.add_reagent(M)
if(M.reagents)
var/trans = R.trans_to(M, amount_per_transfer_from_this)
user << "\blue [trans] units injected. [R.total_volume] units remaining."
diff --git a/code/modules/reagents/reagent_containers/drugs.dm b/code/modules/reagents/reagent_containers/drugs.dm
index ffa14dd2bf0..d1c0fe2b449 100644
--- a/code/modules/reagents/reagent_containers/drugs.dm
+++ b/code/modules/reagents/reagent_containers/drugs.dm
@@ -147,4 +147,4 @@
/obj/item/weapon/reagent_containers/drugs/baggie/meth
New()
..()
- reagents.add_reagent("hyperzine", 10)
\ No newline at end of file
+ reagents.add_reagent("methamphetamine", 10)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm
index a2eee3c62ed..208cfbf4629 100644
--- a/code/modules/reagents/reagent_containers/food/cans.dm
+++ b/code/modules/reagents/reagent_containers/food/cans.dm
@@ -181,7 +181,7 @@
..()
reagents.add_reagent("admorinazine", 5)
reagents.add_reagent("capsaicin", 5)
- reagents.add_reagent("hyperzine", 20)
+ reagents.add_reagent("methamphetamine", 20)
reagents.add_reagent("thirteenloko", 20)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
@@ -205,7 +205,7 @@
New()
..()
reagents.add_reagent("mutagen", 25)
- reagents.add_reagent("anti_toxin", 10)
+ reagents.add_reagent("charcoal", 10)
reagents.add_reagent("thirteenloko", 15)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 82031837c90..b0049ffb723 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -316,7 +316,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 8)
+ reagents.add_reagent("omnizine", 8)
bitesize = 3
/*
@@ -457,7 +457,7 @@
if(9)
reagents.add_reagent("berryjuice", 3)
if(10)
- reagents.add_reagent("tricordrazine", 3)
+ reagents.add_reagent("omnizine", 3)
if(prob(30))
src.icon_state = "donut2"
src.name = "Frosted Chaos Donut"
@@ -524,6 +524,7 @@
New()
..()
reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("egg", 5)
throw_impact(atom/hit_atom)
..()
@@ -649,7 +650,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("stoxin", 3)
+ reagents.add_reagent("morphine", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/stuffing
@@ -719,7 +720,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent("methamphetamine", 5)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
@@ -789,7 +790,7 @@
if (src.warm)
spawn( 4200 )
src.warm = 0
- src.reagents.del_reagent("tricordrazine")
+ src.reagents.del_reagent("omnizine")
src.name = "donk-pocket"
return
@@ -802,7 +803,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("alkysine", 6)
+ reagents.add_reagent("mannitol", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/ghostburger
@@ -1072,7 +1073,7 @@
New()
..()
reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("amatoxin", 3)
+ reagents.add_reagent("amanitin", 3)
reagents.add_reagent("psilocybin", 1)
bitesize = 3
@@ -1088,7 +1089,7 @@
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent("omnizine", 5)
bitesize = 2
else
reagents.add_reagent("nutriment", 8)
@@ -1282,7 +1283,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("doctorsdelight", 5)
+ reagents.add_reagent("salglu_solution", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
@@ -1407,7 +1408,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("amatoxin", 6)
+ reagents.add_reagent("amanitin", 6)
reagents.add_reagent("psilocybin", 3)
bitesize = 3
@@ -1499,7 +1500,7 @@
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent("omnizine", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
@@ -1524,7 +1525,7 @@
if(3)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent("omnizine", 5)
if(4)
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("water", 10)
@@ -1546,7 +1547,7 @@
if(10)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("oculine", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wishsoup
@@ -1860,7 +1861,7 @@
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("oculine", 5)
reagents.add_reagent("water", 5)
bitesize = 10
@@ -2021,7 +2022,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("imidazoline", 3)
+ reagents.add_reagent("oculine", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/superbiteburger
@@ -2146,7 +2147,7 @@
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent("omnizine", 5)
bitesize = 2
else
reagents.add_reagent("nutriment", 5)
@@ -2211,7 +2212,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("doctorsdelight", 5)
+ reagents.add_reagent("omnizine", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart
@@ -2383,7 +2384,7 @@
New()
..()
reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("imidazoline", 10)
+ reagents.add_reagent("oculine", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
@@ -2404,7 +2405,7 @@
New()
..()
reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("alkysine", 10)
+ reagents.add_reagent("mannitol", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice
@@ -2746,7 +2747,7 @@
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("imidazoline", 12)
+ reagents.add_reagent("oculine", 12)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
@@ -3026,7 +3027,7 @@
New()
..()
reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("stoxin", 3)
+ reagents.add_reagent("morphine", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/stuffing
diff --git a/code/modules/reagents/reagent_containers/food/snacks/candy.dm b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
index bd593340012..22b5f10e73d 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/candy.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/candy.dm
@@ -704,7 +704,7 @@
New()
..()
- reagents.add_reagent("tricordrazine", 20)
+ reagents.add_reagent("omnizine", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index 72ad5b32575..7083019f866 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -55,29 +55,6 @@
var/image/lid = image(icon, src, "lid_bottle")
overlays += lid
-/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
- name = "inaprovaline bottle"
- desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
-
- New()
- ..()
- reagents.add_reagent("inaprovaline", 30)
-
-
-/obj/item/weapon/reagent_containers/glass/bottle/hyperzine
- name = "hyperzine bottle"
- desc = "A small bottle. Contains hyperzine - a powerful stimulant."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle18"
-
- New()
- ..()
- reagents.add_reagent("hyperzine", 30)
-
-
-
/obj/item/weapon/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
@@ -98,36 +75,6 @@
..()
reagents.add_reagent("cyanide", 30)
-/obj/item/weapon/reagent_containers/glass/bottle/stoxin
- name = "sleep-toxin bottle"
- desc = "A small bottle of sleep toxins. Just the fumes make you sleepy."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle20"
-
- New()
- ..()
- reagents.add_reagent("stoxin", 30)
-
-/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
- name = "Chloral Hydrate Bottle"
- desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle20"
-
- New()
- ..()
- reagents.add_reagent("chloralhydrate", 15) //Intentionally low since it is so strong. Still enough to knock someone out.
-
-/obj/item/weapon/reagent_containers/glass/bottle/antitoxin
- name = "anti-toxin bottle"
- desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
- icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle17"
-
- New()
- ..()
- reagents.add_reagent("anti_toxin", 30)
-
/obj/item/weapon/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
@@ -158,14 +105,14 @@
..()
reagents.add_reagent("diethylamine", 30)
-/obj/item/weapon/reagent_containers/glass/bottle/pacid
- name = "Polytrinic Acid Bottle"
- desc = "A small bottle. Contains a small amount of Polytrinic Acid"
+/obj/item/weapon/reagent_containers/glass/bottle/facid
+ name = "Fluorosulfuric Acid Bottle"
+ desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
New()
..()
- reagents.add_reagent("pacid", 30)
+ reagents.add_reagent("facid", 30)
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
@@ -201,4 +148,98 @@
icon_state = "bottle17"
New()
..()
- reagents.add_reagent("morphine", 30)
\ No newline at end of file
+ reagents.add_reagent("morphine", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/charcoal
+ name = "Charcoal Bottle"
+ desc = "A small bottle. Contains charcoal."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle17"
+ New()
+ ..()
+ reagents.add_reagent("charcoal", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/epinephrine
+ name = "Epinephrine Bottle"
+ desc = "A small bottle. Contains epinephrine."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle17"
+ New()
+ ..()
+ reagents.add_reagent("epinephrine", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/pancuronium
+ name = "Pancuronium Bottle"
+ desc = "A small bottle of pancuronium."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle14"
+
+ New()
+ ..()
+ reagents.add_reagent("pancuronium", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/sulfonal
+ name = "Sulfonal Bottle"
+ desc = "A small bottle of Sulfonal."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "bottle19"
+
+ New()
+ ..()
+ reagents.add_reagent("sulfonal", 30)
+
+//Reagent bottles
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent
+ name = "Reagent Bottle"
+ desc = "A bottle for storing reagents"
+ icon_state = "rbottle"
+ volume = 50
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/oil
+ name = "Oil Bottle"
+ desc = "A reagent bottle. Contains oil."
+ icon_state = "rbottle1"
+ New()
+ ..()
+ reagents.add_reagent("oil", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/phenol
+ name = "Phenol Bottle"
+ desc = "A reagent bottle. Contains phenol."
+ icon_state = "rbottle2"
+ New()
+ ..()
+ reagents.add_reagent("phenol", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/acetone
+ name = "Acetone Bottle"
+ desc = "A reagent bottle. Contains acetone."
+ icon_state = "rbottle3"
+ New()
+ ..()
+ reagents.add_reagent("acetone", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/ammonia
+ name = "Ammonia Bottle"
+ desc = "A reagent bottle. Contains ammonia."
+ icon_state = "rbottle4"
+ New()
+ ..()
+ reagents.add_reagent("ammonia", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/diethylamine
+ name = "Diethylamine Bottle"
+ desc = "A reagent bottle. Contains diethylamine."
+ icon_state = "rbottle5"
+ New()
+ ..()
+ reagents.add_reagent("diethylamine", 50)
+
+/obj/item/weapon/reagent_containers/glass/bottle/reagent/acid
+ name = "Acid Bottle"
+ desc = "A reagent bottle. Contains sulfuric acid."
+ icon_state = "rbottle6"
+ New()
+ ..()
+ reagents.add_reagent("sacid", 50)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
index 7c8bf02a5bb..cb6a7cb0a8a 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
@@ -7,27 +7,27 @@
var/reagent = ""
-/obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline
- name = "internal inaprovaline bottle"
- desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
+/obj/item/weapon/reagent_containers/glass/bottle/robot/epinephrine
+ name = "internal epinephrine bottle"
+ desc = "A small bottle. Contains epinephrine - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
- reagent = "inaprovaline"
+ reagent = "epinephrine"
New()
..()
- reagents.add_reagent("inaprovaline", 60)
+ reagents.add_reagent("epinephrine", 60)
return
-/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin
- name = "internal anti-toxin bottle"
- desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
+/obj/item/weapon/reagent_containers/glass/bottle/robot/charcoal
+ name = "internal charcoal bottle"
+ desc = "A small bottle of charcoal. Counters poisons and repairs damage."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
- reagent = "anti_toxin"
+ reagent = "charcoal"
New()
..()
- reagents.add_reagent("anti_toxin", 60)
+ reagents.add_reagent("charcoal", 60)
return
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 60e2b504cf5..6a522fec688 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -30,7 +30,7 @@
user << "\blue You inject [M] with [src]."
M << "\red You feel a tiny prick!"
- src.reagents.reaction(M, INGEST)
+ src.reagents.add_reagent(M)
if(M.reagents)
var/list/injected = list()
@@ -53,7 +53,7 @@
/obj/item/weapon/reagent_containers/hypospray/CMO/New()
..()
- reagents.add_reagent("doctorsdelight", 30)
+ reagents.add_reagent("omnizine", 30)
/obj/item/weapon/reagent_containers/hypospray/combat
name = "combat stimulant injector"
@@ -112,15 +112,15 @@
else
usr << "\blue It is spent."
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine //basilisks
- name = "leporazine autoinjector"
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone //basilisks
+ name = "teporone autoinjector"
desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction at the cost of some shortness of breath."
icon_state = "lepopen"
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine/New()
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone/New()
..()
reagents.remove_reagent("epinephrine", 10)
- reagents.add_reagent("leporazine", 9)
+ reagents.add_reagent("teporone", 9)
reagents.add_reagent("lexorin", 1)
update_icon()
return
@@ -133,7 +133,7 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack/New()
..()
reagents.remove_reagent("epinephrine", 10)
- reagents.add_reagent("hyperzine", 9)
+ reagents.add_reagent("methamphetamine", 9)
reagents.add_reagent("lexorin", 1)
update_icon()
return
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 38099ee851e..5a03b9c0032 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -97,14 +97,6 @@
////////////////////////////////////////////////////////////////////////////////
//Pills
-/obj/item/weapon/reagent_containers/pill/antitox
- name = "Anti-toxins pill"
- desc = "Neutralizes many common toxins."
- icon_state = "pill17"
- New()
- ..()
- reagents.add_reagent("anti_toxin", 25)
-
/obj/item/weapon/reagent_containers/pill/tox
name = "Toxins pill"
desc = "Highly toxic."
@@ -129,39 +121,6 @@
..()
reagents.add_reagent("adminordrazine", 50)
-/obj/item/weapon/reagent_containers/pill/stox
- name = "Sleeping pill"
- desc = "Commonly used to treat insomnia."
- icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("stoxin", 30)
-
-/obj/item/weapon/reagent_containers/pill/kelotane
- name = "Kelotane pill"
- desc = "Used to treat burns."
- icon_state = "pill11"
- New()
- ..()
- reagents.add_reagent("kelotane", 30)
-
-/obj/item/weapon/reagent_containers/pill/dermaline
- name = "Dermaline pill"
- desc = "Used to treat severe burns."
- icon_state = "pill12"
- New()
- ..()
- reagents.add_reagent("dermaline", 30)
-
-/obj/item/weapon/reagent_containers/pill/tramadol
- name = "Tramadol pill"
- desc = "A simple painkiller."
- icon_state = "pill8"
- New()
- ..()
- reagents.add_reagent("tramadol", 15)
-
-
/obj/item/weapon/reagent_containers/pill/methamphetamine
name = "Methamphetamine pill"
desc = "Helps improve the ability to concentrate."
@@ -170,13 +129,13 @@
..()
reagents.add_reagent("methamphetamine", 5)
-/obj/item/weapon/reagent_containers/pill/diphenhydramine
- name = "Diphenhydramine pill"
- desc = "A mild tranquilizer and anti-psychotic."
+/obj/item/weapon/reagent_containers/pill/haloperidol
+ name = "Haloperidol pill"
+ desc = "Haloperidol is an anti-psychotic use to treat psychiatric problems."
icon_state = "pill8"
New()
..()
- reagents.add_reagent("diphenhydramine", 15)
+ reagents.add_reagent("haloperidol", 15)
/obj/item/weapon/reagent_containers/pill/paroxetine
name = "Paroxetine pill"
@@ -186,29 +145,6 @@
..()
reagents.add_reagent("paroxetine", 15)
-/obj/item/weapon/reagent_containers/pill/inaprovaline
- name = "Inaprovaline pill"
- desc = "Used to stabilize patients."
- icon_state = "pill20"
- New()
- ..()
- reagents.add_reagent("inaprovaline", 30)
-
-/obj/item/weapon/reagent_containers/pill/dexalin
- name = "Dexalin pill"
- desc = "Used to treat oxygen deprivation."
- icon_state = "pill16"
- New()
- ..()
- reagents.add_reagent("dexalin", 30)
-
-/obj/item/weapon/reagent_containers/pill/bicaridine
- name = "Bicaridine pill"
- desc = "Used to treat physical injuries."
- icon_state = "pill18"
- New()
- ..()
- reagents.add_reagent("bicaridine", 30)
/obj/item/weapon/reagent_containers/pill/happy
name = "Happy pill"
@@ -225,9 +161,8 @@
icon_state = "pill18"
New()
..()
- reagents.add_reagent("impedrezene", 10)
reagents.add_reagent("synaptizine", 5)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent("methamphetamine", 5)
/obj/item/weapon/reagent_containers/pill/charcoal
name = "Chacoal pill"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 59ec5175f1a..351cb4af276 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -15,7 +15,7 @@
amount_per_transfer_from_this = 5
volume = 250
possible_transfer_amounts = null
- banned_reagents = list("pacid","sacid")
+ banned_reagents = list("facid","sacid")
/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
@@ -51,9 +51,9 @@
if(reagents.has_reagent("sacid"))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")
- if(reagents.has_reagent("pacid"))
- message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
- log_game("[key_name(user)] fired Polyacid from \a [src].")
+ if(reagents.has_reagent("facid"))
+ message_admins("[key_name_admin(user)] fired Fluorosulfuric Acid from \a [src].")
+ log_game("[key_name(user)] fired Fluorosulfuric Acid from \a [src].")
if(reagents.has_reagent("lube"))
message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
log_game("[key_name(user)] fired Space lube from \a [src].")
@@ -211,7 +211,7 @@
reagents.add_reagent("spores", 150)
reagents.add_reagent("cryptobiolin", 150)
reagents.add_reagent("mutagen", 150)
- reagents.add_reagent("chloralhydrate", 150)
+ reagents.add_reagent("pancuronium", 150)
// Plant-B-Gone
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index f424e494f91..06b5d3f0bb5 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -442,25 +442,6 @@
////////////////////////////////////////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/syringe/inaprovaline
- name = "Syringe (inaprovaline)"
- desc = "Contains inaprovaline - used to stabilize patients."
- New()
- ..()
- reagents.add_reagent("inaprovaline", 15)
- mode = SYRINGE_INJECT
- update_icon()
-
-/obj/item/weapon/reagent_containers/syringe/antitoxin
- name = "Syringe (anti-toxin)"
- desc = "Contains anti-toxins."
- New()
- ..()
- reagents.add_reagent("anti_toxin", 15)
- mode = SYRINGE_INJECT
- update_icon()
-
/obj/item/weapon/reagent_containers/syringe/antiviral
name = "Syringe (spaceacillin)"
desc = "Contains antiviral agents."
@@ -470,41 +451,43 @@
mode = SYRINGE_INJECT
update_icon()
-/obj/item/weapon/reagent_containers/ld50_syringe/choral
+/obj/item/weapon/reagent_containers/ld50_syringe/lethal
New()
..()
- reagents.add_reagent("chloralhydrate", 50)
+ reagents.add_reagent("sulfonal", 4)
+ reagents.add_reagent("pancuronium", 6)
+ reagents.add_reagent("neurotoxin2", 40)
mode = SYRINGE_INJECT
update_icon()
//Robot syringes
//Not special in any way, code wise. They don't have added variables or procs.
-/obj/item/weapon/reagent_containers/syringe/robot/antitoxin
- name = "Syringe (anti-toxin)"
- desc = "Contains anti-toxins."
+/obj/item/weapon/reagent_containers/syringe/robot/charcoal
+ name = "Syringe (charcoal)"
+ desc = "Contains charcoal."
New()
..()
- reagents.add_reagent("anti_toxin", 15)
+ reagents.add_reagent("charcoal", 15)
mode = SYRINGE_INJECT
update_icon()
-/obj/item/weapon/reagent_containers/syringe/robot/inoprovaline
- name = "Syringe (inoprovaline)"
- desc = "Contains inaprovaline - used to stabilize patients."
+/obj/item/weapon/reagent_containers/syringe/robot/epinephrine
+ name = "Syringe (Epinephrine)"
+ desc = "Contains epinephrine - used to stabilize patients."
New()
..()
- reagents.add_reagent("inaprovaline", 15)
+ reagents.add_reagent("epinephrine", 15)
mode = SYRINGE_INJECT
update_icon()
/obj/item/weapon/reagent_containers/syringe/robot/mixed
name = "Syringe (mixed)"
- desc = "Contains inaprovaline & anti-toxins."
+ desc = "Contains epinephrine & charcoal."
New()
..()
- reagents.add_reagent("inaprovaline", 7)
- reagents.add_reagent("anti_toxin", 8)
+ reagents.add_reagent("epinephrine", 7)
+ reagents.add_reagent("charcoal", 8)
mode = SYRINGE_INJECT
update_icon()
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
index 1351af58f79..aeecd5ff2b2 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
@@ -252,7 +252,7 @@ var/list/valid_secondary_effect_types = list(\
my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_WATER && prob(25))
secondary_effect.ToggleActivate(0)
- else if(W.reagents.has_reagent("acid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1))
+ else if(W.reagents.has_reagent("acid", 1) || W.reagents.has_reagent("facid", 1) || W.reagents.has_reagent("diethylamine", 1))
if(my_effect.trigger == TRIGGER_ACID)
my_effect.ToggleActivate()
if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25))
diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm
index b2c0fb38986..10a89d3f4d6 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_special.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm
@@ -8,7 +8,7 @@
/obj/item/weapon/reagent_containers/glass/replenishing/New()
..()
processing_objects.Add(src)
- spawning_id = pick("blood","holywater","lube","stoxin","ethanol","ice","glycerol","fuel","cleaner")
+ spawning_id = pick("blood","holywater","lube","morphine","ethanol","ice","glycerol","fuel","cleaner")
/obj/item/weapon/reagent_containers/glass/replenishing/process()
reagents.add_reagent(spawning_id, 0.3)
diff --git a/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm b/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm
index d9212ac5b01..b345844d57d 100644
--- a/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm
+++ b/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm
@@ -38,7 +38,6 @@
icon_state = "amaurifruit"
New(var/loc, var/potency)
..()
- reagents.add_reagent("zombiepowder", potency * 10)
reagents.add_reagent("condensedcapsaicin", potency * 5)
reagents.add_reagent("nutriment", potency)
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -51,7 +50,7 @@
New(var/loc, var/potency)
..()
//this may prove a little strong
- reagents.add_reagent("stoxin", (potency * potency) / 5)
+ reagents.add_reagent("morphine", (potency * potency) / 5)
reagents.add_reagent("capsaicin", (potency * potency) / 5)
reagents.add_reagent("nutriment", potency)
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -63,8 +62,8 @@
icon_state = "valeleaves"
New(var/loc, var/potency)
..()
- reagents.add_reagent("paracetamol", potency * 5)
- reagents.add_reagent("dexalin", potency * 2)
+ reagents.add_reagent("acetaminophen", potency * 5)
+ reagents.add_reagent("salbutamol", potency * 2)
reagents.add_reagent("nutriment", potency)
bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -75,7 +74,7 @@
icon_state = "surikfruit"
New(var/loc, var/potency)
..()
- reagents.add_reagent("impedrezene", potency * 3)
+ reagents.add_reagent("haloperidol", potency * 3)
reagents.add_reagent("synaptizine", potency * 2)
reagents.add_reagent("nutriment", potency)
bitesize = 1+round(reagents.total_volume / 2, 1)
\ No newline at end of file
diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
index 3e15764fee6..fc2fe0d2e7a 100644
--- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
@@ -51,11 +51,8 @@
coolant_reagents_purity["icecoffee"] = 0.6
coolant_reagents_purity["icetea"] = 0.6
coolant_reagents_purity["milkshake"] = 0.6
- coolant_reagents_purity["leporazine"] = 0.7
- coolant_reagents_purity["kelotane"] = 0.7
+ coolant_reagents_purity["teporone"] = 0.7
coolant_reagents_purity["sterilizine"] = 0.7
- coolant_reagents_purity["dermaline"] = 0.7
- coolant_reagents_purity["hyperzine"] = 0.8
coolant_reagents_purity["cryoxadone"] = 0.9
coolant_reagents_purity["coolant"] = 1
coolant_reagents_purity["adminordrazine"] = 2
@@ -144,15 +141,15 @@
data["radiation"] = round(radiation)
data["t_left_radspike"] = round(t_left_radspike)
data["rad_shield_on"] = rad_shield
-
+
// update the ui if it exists, returns null if no ui is passed/found
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
ui = new(user, src, ui_key, "geoscanner.tmpl", "High Res Radiocarbon Spectrometer", 900, 825)
// when the ui is first opened this is the data it will use
- ui.set_initial_data(data)
+ ui.set_initial_data(data)
// open the new ui window
ui.open()
// auto update every Master Controller tick
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index 12183f91498..b247a0694b2 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -104,12 +104,12 @@
////////////////////////STAGE 4/////////////////////////////////
-/datum/disease2/effect/doctorsdelight
+/datum/disease2/effect/omnizine
name = "Panacea Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("doctorsdelight") < 1)
- mob.reagents.add_reagent("doctorsdelight", 1)
+ if (mob.reagents.get_reagent_amount("omnizine") < 1)
+ mob.reagents.add_reagent("omnizine", 1)
/datum/disease2/effect/viralsputum_major
name = "Hemoptysis"
@@ -291,7 +291,7 @@
name = "Spontaneous Cellular Collapse"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
- mob.reagents.add_reagent("pacid", 1)
+ mob.reagents.add_reagent("facid", 1)
mob << " Your body burns as your cells break down."
shake_camera(mob,5*multiplier)
@@ -419,8 +419,8 @@
name = "Regenerative Synapse Effect"
stage = 3
activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("alkysine") < 1)
- mob.reagents.add_reagent("alkysine", 1)
+ if (mob.reagents.get_reagent_amount("mannitol") < 1)
+ mob.reagents.add_reagent("mannitol", 1)
/datum/disease2/effect/paroxetine
name = "Psyche Collapse Syndrome"
@@ -686,37 +686,8 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
flags |= NODROP //curses!
..()
-
-//Lets not make people nearly immortal. ~Alex-gh
-/*
-/datum/disease2/effect/spaceadapt
- name = "Space Adaptation Effect"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- var/mob/living/carbon/human/H = mob
- if (mob.reagents.get_reagent_amount("dexalinp") < 10)
- mob.reagents.add_reagent("dexalinp", 4)
- if (mob.reagents.get_reagent_amount("leporazine") < 10)
- mob.reagents.add_reagent("leporazine", 4)
- if (mob.reagents.get_reagent_amount("bicaridine") < 10)
- mob.reagents.add_reagent("bicaridine", 4)
- if (mob.reagents.get_reagent_amount("dermaline") < 10)
- mob.reagents.add_reagent("dermaline", 4)
- mob.emote("me",1,"exhales slowly.")
- var/datum/organ/external/chest/chest = H.get_organ("chest")
- for(var/datum/organ/internal/I in chest.internal_organs)
- I.damage = 0
-*/
-
-
////////////////////////STAGE 2/////////////////////////////////
-/datum/disease2/effect/methylphenidate
- name = "Mental Stability Phenomenon"
- stage = 2
- activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("methylphenidate") < 5)
- mob.reagents.add_reagent("methylphenidate", 1)
/datum/disease2/effect/pain
name = "Acute Muscle Ache"
@@ -827,8 +798,8 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
name = "Adrenal Overload"
stage = 2
activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("hyperzine") < 40)
- mob.reagents.add_reagent("hyperzine", 4)
+ if (mob.reagents.get_reagent_amount("methamphetamine") < 40)
+ mob.reagents.add_reagent("methamphetamine", 4)
if (prob(30))
mob << "You feel a rush of energy inside you!"
mob.jitteriness += 10
@@ -904,8 +875,8 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
stage = 2
activate(var/mob/living/carbon/mob,var/multiplier)
mob << " You feel optimistic!"
- if (mob.reagents.get_reagent_amount("tricordrazine") < 1)
- mob.reagents.add_reagent("tricordrazine", 1)
+ if (mob.reagents.get_reagent_amount("salglu_solution") < 1)
+ mob.reagents.add_reagent("salglu_solution", 1)
////////////////////////STAGE 1/////////////////////////////////
@@ -929,8 +900,8 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
name = "Adrenaline Extra"
stage = 1
activate(var/mob/living/carbon/mob,var/multiplier)
- if (mob.reagents.get_reagent_amount("hyperzine") < 10)
- mob.reagents.add_reagent("hyperzine", 4)
+ if (mob.reagents.get_reagent_amount("ephedrine") < 10)
+ mob.reagents.add_reagent("ephedrine", 4)
if (prob(30))
mob << "You feel a rush of energy inside you!"
mob.jitteriness += 10
diff --git a/code/setup.dm b/code/setup.dm
index f841b9f6ab4..d5e032cd431 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -800,9 +800,9 @@ var/list/be_special_flags = list(
#define PULSE_2FAST 4 //>120 bpm
#define PULSE_THREADY 5 //occurs during hypovolemic shock
//feel free to add shit to lists below
-var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") //increase heart rate
-var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin") //decrease heart rate
-var/list/heartstopper = list("zombie_powder", "capulettium", "capulettium_plus") //this stops the heart
+var/list/tachycardics = list("coffee", "methamphetamine", "nitroglycerin", "thirteenloko", "nicotine") //increase heart rate
+var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs") //decrease heart rate
+var/list/heartstopper = list("capulettium", "capulettium_plus") //this stops the heart
var/list/cheartstopper = list() //this stops the heart when overdose is met -- c = conditional
//proc/get_pulse methods
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index a639e4bf623..b072e46257e 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index bc543261840..bb129c19067 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm
index 66871ddc3c3..e428074808e 100644
--- a/maps/cyberiad.dmm
+++ b/maps/cyberiad.dmm
@@ -576,7 +576,7 @@
"ald" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "white"},/area/security/medbay)
"ale" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{icon_state = "white"},/area/security/medbay)
"alf" = (/obj/structure/table,/obj/item/clothing/accessory/stethoscope,/obj/item/weapon/storage/belt/medical,/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; dir = 4},/area/security/medbay)
-"alg" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/adv,/obj/item/weapon/reagent_containers/syringe/antitoxin,/obj/item/weapon/reagent_containers/syringe/inaprovaline,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "white"},/area/security/medbay)
+"alg" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/adv,/obj/item/weapon/reagent_containers/syringe/charcoal,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "white"},/area/security/medbay)
"alh" = (/obj/structure/table,/obj/machinery/computer/med_data/laptop,/turf/simulated/floor{tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; dir = 4},/area/security/medbay)
"ali" = (/obj/structure/table,/obj/item/weapon/storage/box/masks{pixel_x = 6; pixel_y = 2},/obj/item/weapon/storage/box/gloves,/turf/simulated/floor{dir = 6; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/security/medbay)
"alj" = (/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "Prisoner Processing APC"; pixel_x = -24; pixel_y = 0},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "red"; dir = 10},/area/security/processing)
@@ -3782,7 +3782,7 @@
"buL" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Chemist"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
"buM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
"buN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4; initialize_directions = 11; level = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
-"buO" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
+"buO" = (/obj/structure/table,/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; freerange = 0; frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/item/device/megaphone,/obj/item/weapon/reagent_containers/glass/bottle/morphine,/turf/simulated/floor{dir = 2; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/medical/cmo)
"buP" = (/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor{tag = "icon-whiteblue (WEST)"; icon_state = "whiteblue"; dir = 8},/area/medical/reception)
"buQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/reception)
"buR" = (/obj/structure/table,/obj/item/weapon/storage/box/cups,/obj/item/weapon/storage/box/cups{pixel_x = 5; pixel_y = 5},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/medical/reception)
@@ -3792,7 +3792,7 @@
"buV" = (/obj/structure/table,/obj/machinery/door/window/northright{name = "Medbay Lobby"; req_access_txt = "5"},/obj/item/device/radio/intercom{broadcasting = 1; canhear_range = 5; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = 0},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/medical/reception)
"buW" = (/obj/structure/table,/obj/machinery/media/receiver/boombox,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/phone{pixel_x = -3; pixel_y = 3},/turf/simulated/floor{dir = 5; icon_state = "blue"},/area/medical/reception)
"buX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor{tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; dir = 4},/area/medical/reception)
-"buY" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/storage/pill_bottle/antitox,/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"; pixel_y = -32},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room)
+"buY" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/closet/secure_closet/reagents,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
"buZ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/table,/obj/item/weapon/cane,/obj/item/weapon/cane{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cane{pixel_x = -6; pixel_y = 4},/obj/item/weapon/storage/box/rxglasses,/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room)
"bva" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_y = -10},/obj/item/weapon/folder/white,/obj/item/weapon/pen,/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room)
"bvb" = (/obj/structure/table,/obj/item/weapon/storage/box/bodybags,/obj/item/weapon/storage/box/bodybags,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/medical/morgue)
@@ -3863,7 +3863,7 @@
"bwo" = (/obj/machinery/chem_dispenser,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
"bwp" = (/obj/machinery/camera{c_tag = "Medbay Chemistry"; network = list("SS13")},/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/obj/machinery/chem_master,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
"bwq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
-"bwr" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/structure/table/reinforced,/obj/item/stack/packageWrap,/obj/item/device/mass_spectrometer/adv,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
+"bwr" = (/obj/structure/table/reinforced,/obj/item/stack/packageWrap,/obj/item/weapon/storage/box/syringes,/obj/item/device/mass_spectrometer/adv,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
"bws" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1; initialize_directions = 11; level = 1},/turf/simulated/wall,/area/magistrateoffice)
"bwt" = (/turf/simulated/floor{tag = "icon-whiteblue (SOUTHWEST)"; icon_state = "whiteblue"; dir = 10},/area/medical/reception)
"bwu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{tag = "icon-whiteblue"; icon_state = "whiteblue"},/area/medical/reception)
@@ -5103,7 +5103,7 @@
"bUg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{level = 1},/turf/simulated/wall,/area/hydroponics)
"bUh" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/maintenance{name = "Hydroponics Maintenance"; req_access_txt = "35"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{level = 1},/turf/simulated/floor/plating,/area/hydroponics)
"bUi" = (/obj/machinery/light,/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{dir = 10; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/medical/cmo)
-"bUj" = (/obj/structure/table,/obj/item/device/radio/intercom{broadcasting = 0; canhear_range = 5; freerange = 0; frequency = 1485; listening = 1; name = "Station Intercom (Medbay)"; pixel_x = 0; pixel_y = -30},/obj/item/device/megaphone,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/floor{dir = 2; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/medical/cmo)
+"bUj" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"; pixel_y = -32},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room)
"bUk" = (/turf/simulated/floor{dir = 2; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/medical/cmo)
"bUl" = (/obj/machinery/computer/crew,/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{dir = 6; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/medical/cmo)
"bUm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/wall,/area/hydroponics)
@@ -8345,7 +8345,7 @@
"dey" = (/obj/machinery/door/window{base_state = "right"; dir = 4; icon_state = "right"; name = "Infirmary"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"dez" = (/obj/machinery/door/window{dir = 8; name = "Tool Storage"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deA" = (/obj/structure/table,/obj/item/weapon/gun/syringe,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
-"deB" = (/obj/structure/table,/obj/item/weapon/reagent_containers/syringe/antitoxin,/obj/item/weapon/reagent_containers/syringe/antitoxin{pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/antitoxin{pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
+"deB" = (/obj/structure/table,/obj/item/weapon/reagent_containers/syringe/charcoal,/obj/item/weapon/reagent_containers/syringe/charcoal{pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/charcoal{pixel_y = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deC" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deD" = (/obj/machinery/door/window{dir = 1; name = "Secure Storage"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deE" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; initialize_directions = 10},/obj/structure/table,/obj/item/device/radio/beacon/syndicate/bomb{pixel_y = 5},/obj/item/device/radio/beacon/syndicate/bomb,/turf/unsimulated/floor{icon_state = "floor4"},/area/syndicate_station/start)
@@ -8355,7 +8355,7 @@
"deI" = (/obj/machinery/telecomms/allinone,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deJ" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/obj/item/robot_parts/r_arm,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deK" = (/obj/structure/closet/crate/internals,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
-"deL" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgicaldrill,/obj/item/weapon/scalpel,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
+"deL" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgicaldrill,/obj/item/weapon/scalpel,/obj/item/weapon/reagent_containers/glass/bottle/morphine,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deM" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/syndicate_station/start)
"deN" = (/obj/machinery/teleport/station,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
"deO" = (/obj/machinery/teleport/hub/upgraded,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start)
@@ -8475,10 +8475,10 @@
"dgY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
"dgZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
"dha" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/centcom/control)
-"dhb" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
+"dhb" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/obj/item/weapon/reagent_containers/glass/bottle/epinephrine,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
"dhc" = (/obj/structure/table/reinforced,/obj/item/roller{pixel_y = 5},/obj/item/roller{pixel_y = 5},/obj/item/roller{pixel_y = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
"dhd" = (/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/centcom/control)
-"dhe" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/antitox{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/pill_bottle/antitox{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/pill_bottle/antitox{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/pill_bottle/kelotane{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/pill_bottle/kelotane{pixel_x = -3; pixel_y = 3},/obj/item/weapon/storage/pill_bottle/kelotane{pixel_x = -3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
+"dhe" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/firstaid/fire{pixel_x = -10},/obj/item/weapon/storage/firstaid/fire{pixel_x = -10},/obj/item/weapon/storage/firstaid/fire{pixel_x = -10},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 10},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 10},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
"dhf" = (/obj/machinery/door/poddoor{icon_state = "pdoor1"; id = "ASSAULT0"; name = "Launch Bay #0"; p_open = 0},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops)
"dhg" = (/obj/machinery/camera{c_tag = "CentCom Special Ops. Assault Armor South"; dir = 1; network = list("ERT","CentCom")},/turf/unsimulated/floor{icon_state = "loadingarea"; dir = 8},/area/centcom/specops)
"dhh" = (/obj/structure/reagent_dispensers/fueltank,/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops)
@@ -12470,7 +12470,7 @@
"eFP" = (/obj/structure/rack,/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Fitness Ring"},/turf/simulated/floor{tag = "icon-vault (NORTH)"; icon_state = "vault"; dir = 1},/area/traitor/inter)
"eFQ" = (/obj/machinery/door/airlock/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/traitor/tox)
"eFR" = (/obj/structure/rack,/obj/machinery/door/window/eastright{name = "Gear Rack"},/obj/structure/window/reinforced,/turf/simulated/floor{tag = "icon-vault (EAST)"; icon_state = "vault"; dir = 4},/area/traitor/inter)
-"eFS" = (/obj/structure/table,/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 10},/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 6},/obj/item/weapon/reagent_containers/ld50_syringe/choral{pixel_x = 3; pixel_y = 2},/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/traitor/inter)
+"eFS" = (/obj/structure/table,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/traitor/inter)
"eFT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{icon_state = "dark"},/area/traitor/inter)
"eFU" = (/obj/structure/stool/bed,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/remains/human,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/traitor/inter)
"eFV" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "dark"},/area/traitor/inter)
@@ -13289,8 +13289,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablrblrblrblrblrblrblrblrblrblrblrbhibhjbmrbmsboLbmuboMbmuboNboObmubmubmuaZSboPboQboQboRbfZbhpboSbiHboTbfZboUboVboWboXboYboZboZbpaboZbpbbpcbhBbpdbpebiQbpfbpgbocbphbiWbpibkebkebpjbpkbplbombkjbpmchubpnbpobppbpqbprbpsbptchuchubpuczkbpvbpwbpxbpwbpyczkaaaczEcjVbpzbpAbpBbpCbowbkxbpDcjVbpEbpFbpGcpTbpKbpIbwpbpJbpLcAgbpNbpObpPbpQbpRbpRbpQbpSbpTbpUcrtbpVbpWbpXbpYcrtbpZbqabqbbqcbqdbqebqebqfctpbqgcBocAMbqhcAMbqibqicxObqjbqkbqlcxOcBSbqncBScxObqobnzboJcxQcCqbqqcCqcxQbqrbqscxQbqtbqubqvcDsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaKPaKPaKPaKPaKPaKPaaaaKPaKPaKPaKPaKPaKPaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaablrblrblrblrblrblrblrblrblrblraaabqwaTzbqxbizbqybmubqzbmubqAbqBbqCbqDbmubqEbqFbqGbqHboRbfZbfZbfZbfZbfZbfZbqIbqJbqKbqLbqMbhBbhBbhBbhBbhBbhBbhBbqNbhBbhBbhBbqObhBbqPbqQbqRbkebkebkebqSbolbqTbkjbqUchubqVbpocjccjccjcchubqWchubqXbqYcDXbqZbrabrbbrcbrdcDYbrebrfcjVbrgbkxbrhbribowbrjbkxcjVbrkbrlbrmcpTbrnbrobrpbrqbrrbrsbrtbpRbpRbpRbpRbpRbpRbpRbrubrvcDZbrxbrybrzbrAcrtbrBbrCbrDbrEbrFbrGbrCbqfctpbrHcBobrIbrJbrKbrLbrLcEFbrMbrNbrObrPbrQbrRbrScxOcFEbrTcGWcxQbrUbGybrWbrXbrXbrYcxQbrZbsabsbcDsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaKPaKPaKPaKPaKPaKPaaaaKPaKPaKPaKPaKPaKPaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGbayabjNaHcbhjbbgbbgbbgbscbbgbsdaERbsebsfbmubsgbshbsibsjbskbslbsmbcWbblbblbblbsnbnUbnUbnUbnUbnUbnUbsobspbspbsqbsrbhBbssbstbsubsvbswbsxbsybszbsAbsBbsCbsDbphbolbqRbkebkebsEbiWbiWbsFbsGbsHcGXbsIbsJbsKbsLcIWbsMbsNcJFbsObsPcDYbsQbsRbsQbsRbsScDYbrebsTdjnbsUbsVbsWbsXbsYbsZbtadjnbtbbpFbpFcpTbtcbtdbtebtfbtgcpTbrtbpRbpRbpRbpRbpRbpRbpRbthbtibtjbtkbtlbrxbtmcrtbtnbtobtpbrEbqfbrGbtqbtrctpbtseKcbtubtvbtvbtwbtxbtybtzbtAbtAbtAbtBbtAbtCeKdbtEbtFbtGeKebtHbtIbtJbtJbtJbtKcxQbtLbsabtMcDsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaKPaKPaKPaKPaKPaaaaKPaKPaKPaKPaKPaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaMIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtNbtObtPbtQbtRbtSbtSbtTbtUaDybmubtVbtWbsjbtXbmubmubmuberbtYbtZbuabubbuabuabuabubbuaberberbhBbhBbhBbucbhBbudbudbudbudbudbudbsybuebufbugbuhbuibujbukbulbumbunbuobupbuqburbusbutbuubuvbuvbuwbuxeKfbuybuzeKgbuAbuBczkbuCbrcbuDbrabuEczkaaabuFeKheKibuGeKheKheKheKhbuHcjVbuIbpFbuJeKjbuKbuLbuMbuNbuOcpTbuPbuQbuRbuSbuTbuUbuVbuWbrubuXcrtbuYbtlbuZbvacrtbvbbvcbrDbrEbqfbrGbrCbqfctpbrHcBobvdbvebvfbvgbvheKkbvibvjbvkbvlbvmbvnbvocxObvpbvqbvrcxQbvsbvtbvubrXbvvbvwcxQbtLbsabvxcDsaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtNbvybvzbvAaDxaDxbvBbvCaDxbvDbmubvEbvFbvGbvHbmuaaaaaaaaaaabaabbvIbvIbvIbvIbvIbvIbvIaaaaaabvJbvKbvLbvMbvNbudbudbudbudbudbudbvObvPbvQbvRbvSbvTbvUbvVbiWbiWbvWbiWbiWbiWbvYbvZbwaeKlbwbeKmeKmeKneKmeKobwceKpbwdbuBczkbwebpwbpwbpwbwfczkaaabuFeKhbwgbwhbwibwjbwkeKqbwleKrbwmbpFbwncpTbpKbwociLbwqbwreKsbwtbwubwvbwwbwxbwybwzbwAbwBbwCeKtbwDbtlbwEbwFcrtbwGbwHbwIbwJbwKbwLbwMbqfctpbwNeKubwPbwQbwQbwRbwSeKvbwUbwVbwWbwXbwYbwZbxacxObxbbvqbxccxQbxdbxebxfbrXbrXbxgcxQbrZbsabxhcDsaaaaaaaaaaaaaabbxibxjbxkbxjbxkbxjbxlaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtNbtObtPbtQbtRbtSbtSbtTbtUaDybmubtVbtWbsjbtXbmubmubmuberbtYbtZbuabubbuabuabuabubbuaberberbhBbhBbhBbucbhBbudbudbudbudbudbudbsybuebufbugbuhbuibujbukbulbumbunbuobupbuqburbusbutbuubuvbuvbuwbuxeKfbuybuzeKgbuAbuBczkbuCbrcbuDbrabuEczkaaabuFeKheKibuGeKheKheKheKhbuHcjVbuIbpFbuJeKjbuKbuLbuMbuNbwrcpTbuPbuQbuRbuSbuTbuUbuVbuWbrubuXcrtbUjbtlbuZbvacrtbvbbvcbrDbrEbqfbrGbrCbqfctpbrHcBobvdbvebvfbvgbvheKkbvibvjbvkbvlbvmbvnbvocxObvpbvqbvrcxQbvsbvtbvubrXbvvbvwcxQbtLbsabvxcDsaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabtNbvybvzbvAaDxaDxbvBbvCaDxbvDbmubvEbvFbvGbvHbmuaaaaaaaaaaabaabbvIbvIbvIbvIbvIbvIbvIaaaaaabvJbvKbvLbvMbvNbudbudbudbudbudbudbvObvPbvQbvRbvSbvTbvUbvVbiWbiWbvWbiWbiWbiWbvYbvZbwaeKlbwbeKmeKmeKneKmeKobwceKpbwdbuBczkbwebpwbpwbpwbwfczkaaabuFeKhbwgbwhbwibwjbwkeKqbwleKrbwmbpFbwncpTbpKbwociLbwqbuYeKsbwtbwubwvbwwbwxbwybwzbwAbwBbwCeKtbwDbtlbwEbwFcrtbwGbwHbwIbwJbwKbwLbwMbqfctpbwNeKubwPbwQbwQbwRbwSeKvbwUbwVbwWbwXbwYbwZbxacxObxbbvqbxccxQbxdbxebxfbrXbrXbxgcxQbrZbsabxhcDsaaaaaaaaaaaaaabbxibxjbxkbxjbxkbxjbxlaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabxmaDwbxnbxnbxobbgbxpaGbayabxqbxpbmubxrbxsbxtbxubmuaaaaaaaaaaaaaaabvIbvIbvIbvIbvIbvIbvIaaaaaabxvbxwbudbxxbxybxybxybxybxybxzbxAbxybxBbxCbxDbxEbxFbxGbxHbiWbxIbkebxJbxKbxLbxMbxNbxOeKleKleKpbxPbxQbxRbxSbxTeKpbpubuBczkbxUbxVbxWbxXbxYczkaaabxZeKhbyabybbyceKwbydeKwbyeeKxbyfbpFbygcpTeKzeKyeKAbyjeKCeKBbylbymbynbyobypbypbyqbyrbysbytcrtbwDbyubyvcrtcrtcsweKDeKFeKEcswctpctpctpeKGbyycBobyzbvebvfbyAbwQeKHbyCbyDbyDbyEbrObyFbyGeKJeKIbrTeKKcxQbyJbyKbrXbyLbyMbyNcxQbtLbyOcDscDsaaaaaaaaaaaaaabbyPbyQbyRbySbySbyTbyPaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabvIbvIbvIbvIbvIbvIbvIbyWbyXbyYbFbbyZbzabzbbzbbzbbyZbudbsybuebudbudbufbzcbzdbzebzfbzgbzhbzibkebkebzjbzkbxMbxNbzlbzmbznbzobzpbzqbzrbzsbzteKpbzubzvcDXbzwbzxbzybzzbzAcDYbrebzBeKhbzCbzDbzEeKwbzFeKwbzGeKxbzHbpFbzIcpTbzJbzKbzLbzMbzNeKLbzObzPeKMeKMeKNbzReKMeKMbzSbzTeKPeKObzUbzVbzWbzXbzYbzZbAabAbbAceKQbAdbAebAfbAgcBobAhbAibAjbAkbAlcEFbAmbyDbyDbAnbAobyFbApcxObAqbAqbArcxQbAsbAtbAubAvbrXbAwcxQbtLbAxcDsaaaaaaaaaaaaaaaaabbAybAzbyRbySbyRbAAbxkaabaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabvIbvIbvIbvIbvIbvIbvIbABbACbABbADeHueHveHueHueHueHubAEbsybuebAFbhBbhBbAGbkebuhbzfbAHbAIbAJbAKbAKbALbAMbANbAObAPeKRbARbASbATbAUbAVbAWbAXeKpbwdbuBczkbAYbAZbBabBbbBcczkaaabxZeKSeKTeKSeKSeKSeKSeKSbBdeKSbBebpFbzIcpTbCFbBgbBgbBhbBieKBbBjbBkeKUbBmbBnbBobBpeKUbBqbBrbBsbBtbBubBvbBwbBwbBxbBybBzbBAbBBbBCbBDbBEbBFbBGbBHbBIbBIbBJbBKbBLcEFbBMbrObrObBNbBObyFbBPbBQbBRbBSbBTeKVbBUeKXeKWbBWeKYcxQcxQbBXeKIeKIeKZeLaeLaeLaeLbeKIbyPbySbyRbySbySbCbbyPaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhhbhhbhhbhhbhhbhhbhhbhhbhhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -13306,7 +13306,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUby
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabMzbPibPjbPibMzbPkbPlbPmbPnbPobPpbPqbPrbPsbIybPtbPubPvbPwbIybOjbOjbPxbXibPybPzbPAbPBbPCcblbPDbPEbPFbPGbPHcblbPIbPJbPKeMybPLbPMbPNbPObPPbPQbPReMObPTeMPbPUbPVbPWbPXbPYbPZbQabQbbQcbQdbQebQfbQgbLKbQhbQibQjbQkbQlbQmbCSbQnbQobQpbQqbOKbQrbQrbQsbQteLubQubQvbQwbQxbQybQzbQAeLtbQBbQCbQDbQEbQDbQDbQFeMReMQbQGbQHbQIbQJeMcbQKbQLbJneKIbsabQMbQNbQObQObQNbQObQPeMtbQQbQReMIbPebQSbQTeMwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeMSbQVbQWbQVeMMbQZbQZbQXbQYbQXbQZbQZaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNSbPibPibPibRabRbbMCbRcbRdbRebMCbPqbRfbRgbIybIybIybIybIybIybRhbOjbRicbXbRmbRkbRkbRkbRocbldrybRnbRnbRnduveMTbRpbRqbRreMUbRsbRtbRubRvbRwbRxeMyeMAbRyeMBbRzbRAbRBbRCbRDeMBbLFbKmbLGbLHbREbRFbRGbRHeMVbRIbRJbRKbRLeMFbRMbRNbROeMWbRPbRQbRRbRSbRTbRUeLueLueLueLueLueMXeMZeMYeLtbRVbQDbQDbRWbQDbRXbRYeNbeNabRZbKSbSabSaeMcbJlbSbbJneKIeMtbcZeMteMteMteMteMteMteMtbSdbSeeMwbSfbSgbSheMwaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacbSibQVbQVbSjbQZbQZbQXbQXbSkbQXbQXbQZbQZaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabMzbPjbPjbPjbMzbSlbSmbSnbSobSpbMCbSqbSrbSsbStbSubSubSubSvbOjbOjbOjbPxbXibRlbRkbSwbRkbSxcblbSybRnbSzbRnbSAcblbSBbSCbSDeMybSEbSFbSGbSHbSIbSJeNdbSKbSLeNebSMbSNbSObSPbSQeMBbNjbKmbKmbSRbREbRFbSSbSTeNfbQibSVbSWbSXeNgbSZbTabTbeNhbTdbTebTfbTfbQrbTgeMGbThbTibTjbTkbTlbTmbTneNbbRVbTobQDbQDbQDbTpbTqeNbeNabTrbKSbSabSaeMcbTsbTtbJneKIbTubTvbTweMtbTxbTybTzbTAbTBbTCbTDeMwbTEbTFbTGeMweMteMteMteMteMteMteMteMtaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaeNibQZbSibQZbQZbQXbQXbQXbQXbQXbQXbQXbQZbQZaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaabNSbTIbTJbTKbNSbTLbNXbNYbIwbIwbTMbTMbTMbIwbIwbOjbTNbTNbTObTPbOjbTQbTRbXibRlbRkbRkbRkbTScblbSybRnbRnbTTbTUeNjbTVbTWbTXeMyeMyeMyeMyeMyeNkeMyeMybTZbUaeMBeMBeNleMBeMCeMBeMBbUcbUdbUdbUcbUcbUebUfeNmeNnbUibUjbUkbUleNoeNpbUnbTbeNqbUpbUqbUrbUsbUtbUueMGbUvbUwbUxbUybUzbUAbUBeNrbUCeNrbUDbUEbUFeNreNseNreNrbUGbUHbSabSaeMcbUIbSbbJnbUJbUKbULbUMbUNbUObUPbUPbUQbURbUSbUTbUUbUVbUWbUXbUYbUZbVabVbeNtbVcbVdbVeeNuaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaeMMbQZbVgbVhbVhbQXbQXbQXbQXbQXbQXbQXbQXbQZbQZaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaaaaaaaabyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVbyVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaabNSbTIbTJbTKbNSbTLbNXbNYbIwbIwbTMbTMbTMbIwbIwbOjbTNbTNbTObTPbOjbTQbTRbXibRlbRkbRkbRkbTScblbSybRnbRnbTTbTUeNjbTVbTWbTXeMyeMyeMyeMyeMyeNkeMyeMybTZbUaeMBeMBeNleMBeMCeMBeMBbUcbUdbUdbUcbUcbUebUfeNmeNnbUibuObUkbUleNoeNpbUnbTbeNqbUpbUqbUrbUsbUtbUueMGbUvbUwbUxbUybUzbUAbUBeNrbUCeNrbUDbUEbUFeNreNseNreNrbUGbUHbSabSaeMcbUIbSbbJnbUJbUKbULbUMbUNbUObUPbUPbUQbURbUSbUTbUUbUVbUWbUXbUYbUZbVabVbeNtbVcbVdbVeeNuaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaeMMbQZbVgbVhbVhbQXbQXbQXbQXbQXbQXbQXbQXbQZbQZaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyUbyUbyUbyUbyUbyUbyUbyUbyUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabVibMybVjbMybVkbVlaabaaaaaabIwbVmbVnbVobIwaaabOjbVpbVqbVrbVsbSubVtbVvbXibVwbVxbVybRkbRlccZbVzbVAbVBbVCbVDcblbVEbVFbVGbVHbVIbVIbVIbVIbVJbVKbVLbVMbVMbVNbVNbVObVPbVQeMAbUcbVRbVSbVTbVUeNvbRFbVWeNmeNxeNweNybVZeMkeNzeNAbWbbWceNBeNBeNCeNBeNBeNBeNDeMGbWfbWgbWhbWibWjbWkbWleNrbWmbWnbWobWpbWqbWnbWrbWsbWnbWtbWubKTeMceMcbWvbWwbWxacFbWybWzbWAeNEbWBbWCbWDbWEbWFbWGbWHbWIbWJbWKbWJbWLbWKbWKbWKbWMbWNbWObWPeNFaabaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaabQZbQZbWRbQXbQXbQXbQXbQXbQXbQXbQXbQXbQXbQXbQZbQZaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabbWSbOjbOjbOjbWTbOjbOjbWUbXibWVbWWbWXbWYbWZcdgbXabXbbXcbXdbXeccZbXfbXgbXhccacepcepcepcepcfyceqcfCeNGbXjeNGeNGbYLbXlbXmbXnbXobXpbXqbXrbXsbXtbXubXvbXwbXxbXybXzbXAbXBbXCbXDbXEbXFbXFbXFbXGbXHbXIbXJbXKeNHeNHbXLeNHeNJeNIeNLeNKeNrbXPbXQbXRbXSbXRbXTbXUbXVbWneMcbXWeMceMcbXXbXYbSbbvqeKIeMtbXZeMteMtbYabYbbYcbYdbYebWKbYfbYgbYhbWDbYhbWDbYibWDbWDeMtbYjbYkbYleNMaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaabQZbQXbQXbQXbQXbQXbQXbYnbQXbYobQXbQXbQXbQXbQXbQZbQZaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWSbYpbYqbYrbOjbYsbXibYtbYubYvbRlbYwcfUbYxbSybYybYzbYAcfUbYBbYCbYDcgYcgYbYEbYFbYGbYHbYIciobYJbDgbYKeMAbZXbDgbDgeNOeNNbYNbYObYPbXsbYQbYRbYSbYTbYUbYVbYWbYXbYYbYVbYVbYZbZabZabZabZbbZabZcbZabZdbZebZfbZgbZhbZibZjbZkbZleNrbZmbZnbZobZpbZobZqbZrbXRbZsbZtbZubvqbZvbvqbXYbSbbvqeKIbZwbZxbZyeMteMteMteMteMtbZzbWDbZAbZBbYibWDbZCbWDbSdbWDbZDeMtbZEbZFbZGeMtaabaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaabQZbZHbZHbZHbZHbZHbZHbZIbQXbZJbZHbYobQXbQXbQXbQXbQZaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/paradise.dme b/paradise.dme
index 962e092d630..b48d7a4e506 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1466,6 +1466,7 @@
#include "code\modules\reagents\syringe_gun.dm"
#include "code\modules\reagents\newchem\chem_heater.dm"
#include "code\modules\reagents\newchem\drugs.dm"
+#include "code\modules\reagents\newchem\food.dm"
#include "code\modules\reagents\newchem\medicine.dm"
#include "code\modules\reagents\newchem\newchem_procs.dm"
#include "code\modules\reagents\newchem\other.dm"