From 9e45c0351c88b63900c1c2d9f06ba1de273ebdc6 Mon Sep 17 00:00:00 2001 From: "uhangi@gmail.com" Date: Tue, 22 Feb 2011 08:08:17 +0000 Subject: [PATCH] Some chemistry stuff: -Cyanide pills and cyanide bottles added, only admins can spawn them for now though. -Cyanide reagent modified to put you to sleep upon ingestion -Antitoxin now mixable via chemistry -Inaprovaline now mixable via chemistry git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1086 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Reagents.dm | 1 + code/WorkInProgress/Chemistry-Recipes.dm | 16 +++++++++++++++- code/WorkInProgress/Chemistry-Tools.dm | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index f91efa222b0..5bd8b3d2c44 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -280,6 +280,7 @@ datum if(!M) M = holder.my_atom M:toxloss += 3 M:oxyloss += 3 + M:sleeping += 1 ..() return diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index d4320077258..0cbe8f134c9 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -49,6 +49,20 @@ datum 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) + result_amount = 3 + mutagen name = "Unstable mutagen" id = "mutagen" @@ -61,7 +75,7 @@ datum // id = "cyanide" // result = "cyanide" // required_reagents = list("hydrogen" = 1, "carbon" = 1, "nitrogen" = 1) - // result_amount = 3 + // result_amount = 1 thermite name = "Thermite" diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 0f326c19b30..61970d92547 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -1236,6 +1236,16 @@ ..() reagents.add_reagent("toxin", 30) +/obj/item/weapon/reagent_containers/glass/bottle/cyanide + name = "cyanide bottle" + desc = "A small bottle." + icon = 'chemical.dmi' + icon_state = "bottle12" + + New() + ..() + reagents.add_reagent("cyanide", 30) + /obj/item/weapon/reagent_containers/glass/bottle/stoxin name = "sleep-toxin bottle" desc = "A small bottle." @@ -2429,6 +2439,14 @@ ..() reagents.add_reagent("toxin", 50) +/obj/item/weapon/reagent_containers/pill/cyanide + name = "Cyanide pill" + desc = "Don't swallow this." + icon_state = "pill5" + New() + ..() + reagents.add_reagent("cyanide", 50) + /obj/item/weapon/reagent_containers/pill/stox name = "Sleeping pill" desc = "Commonly used to treat insomnia."