From 587b219cfdb81b9f06841e265e4ae7dcc3708d58 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Mon, 25 Nov 2019 13:45:32 +0200
Subject: [PATCH] Cardox Buff (#7471)

---
 .../objects/items/weapons/grenades/chem_grenade.dm   |  8 ++++----
 .../Chemistry-Reagents/Chemistry-Reagents-Toxins.dm  | 12 +++++++++++-
 html/changelogs/geeves - cardoxNade.yml              |  7 +++++++
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/geeves - cardoxNade.yml

diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index bf37c1e0756..2d323ea9503 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -312,10 +312,10 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
 
-	B1.reagents.add_reagent("water", 60)
-	B1.reagents.add_reagent("cardox", 60)
-	B2.reagents.add_reagent("surfactant", 60)
-	B2.reagents.add_reagent("cardox", 60)
+	B1.reagents.add_reagent("cardox", 40)
+	B1.reagents.add_reagent("potassium", 40)
+	B2.reagents.add_reagent("phosphorus", 40)
+	B2.reagents.add_reagent("sugar", 40)
 
 	detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
 
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
index b8c4e820fdb..fee32fad967 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
@@ -164,10 +164,20 @@
 	holder.remove_reagent(conflicting.id, amount)
 
 /datum/reagent/toxin/cardox/touch_turf(var/turf/T, var/amount)
-
 	if(amount >= 1)
 		for(var/mob/living/carbon/slime/M in T)
 			M.adjustToxLoss(amount*10)
+	if(amount >= 10)
+		for(var/obj/item/reagent_containers/food/snacks/grown/K in T)
+			if((K.plantname == "koisspore" || K.plantname == "blackkois") || (K.name == "kois" || K.name == "black kois"))
+				qdel(K)
+		for(var/obj/machinery/portable_atmospherics/hydroponics/H in T)
+			if(((H.name == "kois" || H.name == "black kois") || H.seed == /datum/seed/koisspore) && !(H.closed_system))
+				H.health = 0 // kill this boi - geeves
+				H.force_update = TRUE // and quick
+				H.process()
+				if(istype(H, /obj/machinery/portable_atmospherics/hydroponics/soil/invisible))
+					qdel(H)
 
 	var/datum/gas_mixture/environment = T.return_air()
 	environment.adjust_gas("phoron",-amount*10)
diff --git a/html/changelogs/geeves - cardoxNade.yml b/html/changelogs/geeves - cardoxNade.yml
new file mode 100644
index 00000000000..7d2ed3b7207
--- /dev/null
+++ b/html/changelogs/geeves - cardoxNade.yml	
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - rscadd: "Standard Cardox grenades now produce a gas explosion, instead of foaming like a cleaner grenade."
+  - rscadd: "Cardox now properly gets rids of K'ois and K'ois plants."