Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90

Lot of tweaks and fixes, read the description.

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"))
@@ -341,7 +341,7 @@ datum
 				..()
 				return
 
-		cyanide
+/*		cyanide
 			name = "Cyanide"
 			id = "cyanide"
 			description = "A highly toxic chemical."
@@ -354,7 +354,7 @@ datum
 				M:adjustOxyLoss(3)
 				M:sleeping += 1
 				..()
-				return
+				return	*/
 
 		stoxin
 			name = "Sleep Toxin"
@@ -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"))

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
 

code/modules/chemical/Chemistry-Tools.dm

@@ -1868,7 +1868,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'
@@ -1876,7 +1876,7 @@
 
 	New()
 		..()
-		reagents.add_reagent("cyanide", 30)
+		reagents.add_reagent("cyanide", 30)	*/
 
 /obj/item/weapon/reagent_containers/glass/bottle/stoxin
 	name = "sleep-toxin bottle"
@@ -2657,12 +2657,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"