Cardox Buff (#7471)

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)
 

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)

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."