From 009d0915bf66d91b388db41576e7cb61e5b2a33c Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Thu, 8 Dec 2011 14:22:45 -0700
Subject: [PATCH] Removed most other cyanide references.  Remade cyanide pills
 into suicide pills (100 units of Toxin)

---
 code/game/gamemodes/events/ninja_equipment.dm | 2 +-
 code/modules/chemical/Chemistry-Reagents.dm   | 8 ++++----
 code/modules/chemical/Chemistry-Recipes.dm    | 2 +-
 code/modules/chemical/Chemistry-Tools.dm      | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm
index 6c489d87a22..6ae765c6f9f 100644
--- a/code/game/gamemodes/events/ninja_equipment.dm
+++ b/code/game/gamemodes/events/ninja_equipment.dm
@@ -380,7 +380,7 @@ ________________________________________________________________________________
 					<b>Equipment</b>: cannot be tracked by AI (passive), faster speed (passive), stealth (active), vision switch (passive if toggled), voice masking (passive), SpiderOS (passive if toggled), energy drain (passive if toggled).
 					<ul>
 					<li><i>Voice masking</i> generates a random name the ninja can use over the radio and in-person. Although, the former use is recommended.</li>
-					<li><i>Toggling vision</i> cycles to one of the following: thermal, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.</li>
+					<li><i>Toggling vision</i> cycles to one of the following: 	, meson, or darkness vision. The starting mode allows one to scout the identity of those in view, revealing their role. Traitors, revolutionaries, wizards, and other such people will be made known to you.</li>
 					<li><i>Stealth</i>, when activated, drains more battery charge and works similarly to a syndicate cloak. The cloak will deactivate when most Abilities are utilized.</li>
 					<li><i>On-board AI</i>: The suit is able to download an AI much like an intelicard. Check with SpiderOS for details once downloaded.</li>
 					<li><i>SpiderOS</i> is a specialized, PDA-like screen that allows for a small variety of functions, such as injecting healing chemicals directly from the suit. You are using it now, if that was not already obvious. You may also download AI modules directly to the OS.</li>
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index bb1facaaee5..5bbd90e4101 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -314,8 +314,8 @@ datum
 					holder.remove_reagent("plasma", 1)
 				if(holder.has_reagent("acid"))
 					holder.remove_reagent("acid", 1)
-				if(holder.has_reagent("cyanide"))
-					holder.remove_reagent("cyanide", 1)
+/*				if(holder.has_reagent("cyanide"))
+					holder.remove_reagent("cyanide", 1)	*/
 				if(holder.has_reagent("amatoxin"))
 					holder.remove_reagent("amatoxin", 2)
 				if(holder.has_reagent("chloralhydrate"))
@@ -1235,8 +1235,8 @@ datum
 					holder.remove_reagent("acid", 5)
 				if(holder.has_reagent("pacid"))
 					holder.remove_reagent("pacid", 5)
-				if(holder.has_reagent("cyanide"))
-					holder.remove_reagent("cyanide", 5)
+/*				if(holder.has_reagent("cyanide"))
+					holder.remove_reagent("cyanide", 5)	*/
 				if(holder.has_reagent("lexorin"))
 					holder.remove_reagent("lexorin", 5)
 				if(holder.has_reagent("amatoxin"))
diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm
index 36183d6f889..6c568571302 100644
--- a/code/modules/chemical/Chemistry-Recipes.dm
+++ b/code/modules/chemical/Chemistry-Recipes.dm
@@ -600,7 +600,7 @@ datum
 				var/list/data = list("viruses"= list(F))
 				holder.add_reagent("blood", 20, data)
 
-				holder.add_reagent("cyanide", rand(1,10))
+				holder.add_reagent("toxin", rand(1,10))
 
 				return
 
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 16f0fe07c7a..cd2709ec38c 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -1768,7 +1768,7 @@
 		..()
 		reagents.add_reagent("toxin", 30)
 
-/obj/item/weapon/reagent_containers/glass/bottle/cyanide
+/*/obj/item/weapon/reagent_containers/glass/bottle/cyanide
 	name = "cyanide bottle"
 	desc = "A small bottle of cyanide. Bitter almonds?"
 	icon = 'chemical.dmi'
@@ -1776,7 +1776,7 @@
 
 	New()
 		..()
-		reagents.add_reagent("cyanide", 30)
+		reagents.add_reagent("cyanide", 30)	*/
 
 /obj/item/weapon/reagent_containers/glass/bottle/stoxin
 	name = "sleep-toxin bottle"
@@ -2557,12 +2557,12 @@
 		reagents.add_reagent("toxin", 50)
 
 /obj/item/weapon/reagent_containers/pill/cyanide
-	name = "Cyanide pill"
+	name = "Suicide pill"
 	desc = "Don't swallow this."
 	icon_state = "pill5"
 	New()
 		..()
-		reagents.add_reagent("cyanide", 50)
+		reagents.add_reagent("toxin", 100)
 
 /obj/item/weapon/reagent_containers/pill/adminordrazine
 	name = "Adminordrazine pill"