From 2352001cfb5636d57b53d490bce0b3c3f97280cb Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Thu, 10 Nov 2016 22:53:59 -0600
Subject: [PATCH] Adds teargas grenades, currently aspawn only

---
 .../items/weapons/grenades/chem_grenade.dm    | 23 +++++++++++++++++++
 .../objects/items/weapons/storage/boxes.dm    | 10 ++++++++
 2 files changed, 33 insertions(+)

diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index be7d90830de..0ec3dc13df5 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -278,3 +278,26 @@
 		beakers += B1
 		beakers += B2
 		icon_state = initial(icon_state) +"_locked"
+
+/obj/item/weapon/grenade/chem_grenade/teargas
+	name = "tear gas grenade"
+	desc = "Concentrated Capsaicin. Contents under pressure. Use with caution."
+	stage = 2
+	path = 1
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)
+
+		B1.reagents.add_reagent("phosphorus", 40)
+		B1.reagents.add_reagent("potassium", 40)
+		B1.reagents.add_reagent("condensedcapsaicin", 40)
+		B2.reagents.add_reagent("sugar", 40)
+		B2.reagents.add_reagent("condensedcapsaicin", 80)
+
+		detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
+
+		beakers += B1
+		beakers += B2
+		icon_state = initial(icon_state) +"_locked"
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index f8d5376a642..5c3d090d711 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -339,6 +339,16 @@
 	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/chem_grenade/metalfoam(src)
 
+/obj/item/weapon/storage/box/teargas
+	name = "box of teargas grenades"
+	desc = "A box containing 7 teargas grenades."
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/teargas/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+
 /obj/item/weapon/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."