From f165cb70794cb1d5562792c233dc8af94527a9e9 Mon Sep 17 00:00:00 2001
From: Iamgoofball <iamgoofball@gmail.com>
Date: Tue, 24 Mar 2015 21:01:02 -0700
Subject: [PATCH] muh fixes 2.0

---
 code/game/machinery/vending.dm                      |  2 +-
 code/modules/reagents/newchem/toxins.dm             | 13 +++++++++++++
 .../reagents/reagent_containers/glass/bottle.dm     | 11 ++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index d5dc9a0e838..92462c401c7 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -888,7 +888,7 @@
 	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/inaprovaline = 4,
+	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 = 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,
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index e8b26c70533..64c77fd8fb3 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -198,6 +198,19 @@ datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob)
 	required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
 	result_amount = 3
 
+datum/reagent/facid/on_mob_life(var/mob/living/M as mob)
+	if(!M) M = holder.my_atom
+	M.adjustToxLoss(2*REM)
+	M.take_organ_damage(0, 1*REM)
+	..()
+	return
+
+datum/reagent/facid
+	name = "Fluorosulfuric Acid"
+	id = "facid"
+	description = ""
+	reagent_state = LIQUID
+	color = "#CF3600"
 /datum/chemical_reaction/facid
 	name = "Fluorosulfuric acid"
 	id = "facid"
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index 5c903608707..72ad5b32575 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -192,4 +192,13 @@
 	icon_state = "bottle17"
 	New()
 		..()
-		reagents.add_reagent("frostoil", 30)
\ No newline at end of file
+		reagents.add_reagent("frostoil", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/morphine
+	name = "Morphine Bottle"
+	desc = "A small bottle. Contains morphine."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle17"
+	New()
+		..()
+		reagents.add_reagent("morphine", 30)
\ No newline at end of file