From da8fdc070b23e671d1f7d618fe3063e0b5e56474 Mon Sep 17 00:00:00 2001
From: forest2001 <ingram.josh@gmail.com>
Date: Sat, 9 Sep 2023 03:37:55 +0100
Subject: [PATCH 1/2] logging

---
 code/game/objects/structures/pipes/vents/vents.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/game/objects/structures/pipes/vents/vents.dm b/code/game/objects/structures/pipes/vents/vents.dm
index b830097eaf1c..298fbc57f4ad 100644
--- a/code/game/objects/structures/pipes/vents/vents.dm
+++ b/code/game/objects/structures/pipes/vents/vents.dm
@@ -150,6 +150,7 @@
 		var/confirm = alert(user, "Confirm gas setup. \n\nGas: '[gas_choice]'\nRadius: '[radius_choice]'\nWarn Time: '[warn_choice / 10] seconds' \n\n Is this correct?", "Confirmation", "Yes", "No")
 		if(confirm != "Yes")
 			return FALSE
+		log_admin("[key_name(user)] released gas (Gas: [gas_choice], Radius: [radius_choice], Delay: [warn_choice]) from [name] at X[x], Y[y], Z[z].")
 		create_gas(gas_choice, radius_choice, warn_choice)
 		return TRUE
 

From a2abda219a209b6701d4a24767477880edc93021 Mon Sep 17 00:00:00 2001
From: forest2001 <ingram.josh@gmail.com>
Date: Sat, 9 Sep 2023 04:24:24 +0100
Subject: [PATCH 2/2] gas grenades

---
 .../items/explosives/grenades/marines.dm      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
index a8e0e1803a33..1ea09d7b78c1 100644
--- a/code/game/objects/items/explosives/grenades/marines.dm
+++ b/code/game/objects/items/explosives/grenades/marines.dm
@@ -465,6 +465,45 @@
 	icon_state = "grenade_phos_clf"
 	item_state = "grenade_phos_clf"
 
+/*
+//================================================
+			Nerve Gas Grenades
+//================================================
+*/
+/obj/item/explosive/grenade/nerve_gas
+	name = "\improper CN20 canister grenade"
+	desc = "A canister grenade of deadly nerve gas. It is set to detonate in 4 seconds."
+	icon_state = "flashbang2"//temp icon
+	det_time = 40
+	item_state = "grenade_phos_clf"//temp icon
+	underslug_launchable = FALSE
+	harmful = TRUE
+	antigrief_protection = TRUE
+	var/datum/effect_system/smoke_spread/cn20/nerve_gas
+	var/nerve_gas_radius = 2
+
+/obj/item/explosive/grenade/nerve_gas/New()
+	..()
+	nerve_gas = new /datum/effect_system/smoke_spread/cn20
+	nerve_gas.attach(src)
+
+/obj/item/explosive/grenade/nerve_gas/Destroy()
+	QDEL_NULL(nerve_gas)
+	return ..()
+
+/obj/item/explosive/grenade/nerve_gas/prime()
+	playsound(src.loc, 'sound/effects/smoke.ogg', 25, 1, 4)
+	nerve_gas.set_up(nerve_gas_radius, 0, get_turf(src), null, 6)
+	nerve_gas.start()
+	qdel(src)
+
+/obj/item/explosive/grenade/nerve_gas/xeno
+	name = "\improper CN20-X canister grenade"
+
+/obj/item/explosive/grenade/nerve_gas/xeno/New()
+	nerve_gas = new /datum/effect_system/smoke_spread/cn20/xeno
+	nerve_gas.attach(src)
+
 /*
 //================================================
 			Airburst Smoke Grenades