From fbad839b4c4d66d0554b4e9bd154412bc3dae86f Mon Sep 17 00:00:00 2001
From: Iamgoofball <iamgoofball@gmail.com>
Date: Sun, 1 Feb 2015 12:26:53 -0800
Subject: [PATCH 1/2] Fixes #7493

Fixes #7493

this also fixes ODing on epi pills
---
 code/modules/reagents/reagent_containers/pill.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 04131cd4de8..8fa4f87ebe8 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -111,7 +111,7 @@
 	name = "epinephrine pill"
 	desc = "Used to stabilize patients."
 	icon_state = "pill5"
-	list_reagents = list("epinephrine" = 50)
+	list_reagents = list("epinephrine" = 15)
 
 /obj/item/weapon/reagent_containers/pill/mannitol
 	name = "mannitol pill"
@@ -129,4 +129,4 @@
 	name = "salicyclic acid pill"
 	desc = "Used to dull pain."
 	icon_state = "pill5"
-	list_reagents = list("sal_acid" = 50)
+	list_reagents = list("sal_acid" = 24)

From 48413b4a89a05d44d6930f90585f3bff74db1d41 Mon Sep 17 00:00:00 2001
From: Iamgoofball <iamgoofball@gmail.com>
Date: Mon, 2 Feb 2015 18:35:51 -0800
Subject: [PATCH 2/2] makes roundstart pills append their reagent number to
 their name, only roundstart ones do this

---
 .../reagents/reagent_containers/pill.dm       | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 8fa4f87ebe8..dfdb24a2863 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -8,11 +8,14 @@
 	volume = 50
 	var/apply_type = INGEST
 	var/apply_method = "swallow"
+	var/roundstart = 0
 
 /obj/item/weapon/reagent_containers/pill/New()
 	..()
 	if(!icon_state)
 		icon_state = "pill[rand(1,20)]"
+	if(reagents.total_volume && roundstart)
+		name += " ([reagents.total_volume]u)"
 
 
 /obj/item/weapon/reagent_containers/pill/attack_self(mob/user)
@@ -70,63 +73,64 @@
 	desc = "Highly toxic."
 	icon_state = "pill5"
 	list_reagents = list("toxin" = 50)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/cyanide
 	name = "cyanide pill"
 	desc = "Don't swallow this."
 	icon_state = "pill5"
 	list_reagents = list("cyanide" = 50)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/adminordrazine
 	name = "adminordrazine pill"
 	desc = "It's magic. We don't have to explain it."
 	icon_state = "pill16"
 	list_reagents = list("adminordrazine" = 50)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/morphine
 	name = "morphine pill"
 	desc = "Commonly used to treat insomnia."
 	icon_state = "pill8"
 	list_reagents = list("morphine" = 30)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/stimulant
 	name = "stimulant pill"
 	desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!"
 	icon_state = "pill19"
 	list_reagents = list("ephedrine" = 10, "ethylredoxrazine" = 10, "coffee" = 30)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/salbutamol
 	name = "salbutamol pill"
 	desc = "Used to treat oxygen deprivation."
 	icon_state = "pill18"
 	list_reagents = list("salbutamol" = 30)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/charcoal
 	name = "antitoxin pill"
 	desc = "Neutralizes many common toxins."
 	icon_state = "pill17"
 	list_reagents = list("charcoal" = 50)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/epinephrine
 	name = "epinephrine pill"
 	desc = "Used to stabilize patients."
 	icon_state = "pill5"
 	list_reagents = list("epinephrine" = 15)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/mannitol
 	name = "mannitol pill"
 	desc = "Used to treat brain damage."
 	icon_state = "pill17"
 	list_reagents = list("mannitol" = 50)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/mutadone
 	name = "mutadone pill"
 	desc = "Used to treat genetic damage."
 	icon_state = "pill20"
 	list_reagents = list("mutadone" = 50)
-
+	roundstart = 1
 /obj/item/weapon/reagent_containers/pill/salicyclic
-	name = "salicyclic acid pill"
+	name = "salicylic acid pill"
 	desc = "Used to dull pain."
 	icon_state = "pill5"
 	list_reagents = list("sal_acid" = 24)
+	roundstart = 1