From d7214b91e170e72c51e125725c94729e6d4d8e3b Mon Sep 17 00:00:00 2001
From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Date: Thu, 14 Sep 2023 23:01:31 -0400
Subject: [PATCH 1/3] Update marines.dm

---
 code/game/objects/items/explosives/grenades/marines.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
index 2abb28075496..a789b454df8c 100644
--- a/code/game/objects/items/explosives/grenades/marines.dm
+++ b/code/game/objects/items/explosives/grenades/marines.dm
@@ -483,7 +483,7 @@
 	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)
 
@@ -501,6 +501,7 @@
 	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)
 

From 9c2dd60796c445df6b58158a3da21cd06487bd7d Mon Sep 17 00:00:00 2001
From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Date: Thu, 14 Sep 2023 23:05:29 -0400
Subject: [PATCH 2/3] Update marines.dm

---
 .../objects/items/explosives/grenades/marines.dm     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
index a789b454df8c..ab9adb066ce1 100644
--- a/code/game/objects/items/explosives/grenades/marines.dm
+++ b/code/game/objects/items/explosives/grenades/marines.dm
@@ -479,12 +479,16 @@
 	underslug_launchable = FALSE
 	harmful = TRUE
 	antigrief_protection = TRUE
+	/// The nerve gas datum
 	var/datum/effect_system/smoke_spread/cn20/nerve_gas
+	/// The typepath of the nerve gas
+	var/nerve_gas_type = /datum/effect_system/smoke_spread/cn20
+	/// The radius the gas will reach
 	var/nerve_gas_radius = 2
 
 /obj/item/explosive/grenade/nerve_gas/New()
 	. = ..()
-	nerve_gas = new /datum/effect_system/smoke_spread/cn20
+	nerve_gas = new nerve_gas_type
 	nerve_gas.attach(src)
 
 /obj/item/explosive/grenade/nerve_gas/Destroy()
@@ -499,11 +503,7 @@
 
 /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)
+	nerve_gas_type = /datum/effect_system/smoke_spread/cn20/xeno
 
 /*
 //================================================

From 15b0c4afc96fcac38419046377bf34d56ac48cdf Mon Sep 17 00:00:00 2001
From: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Date: Fri, 15 Sep 2023 12:30:31 -0400
Subject: [PATCH 3/3] Update marines.dm

---
 code/game/objects/items/explosives/grenades/marines.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
index ab9adb066ce1..46d2d4eba921 100644
--- a/code/game/objects/items/explosives/grenades/marines.dm
+++ b/code/game/objects/items/explosives/grenades/marines.dm
@@ -486,7 +486,7 @@
 	/// The radius the gas will reach
 	var/nerve_gas_radius = 2
 
-/obj/item/explosive/grenade/nerve_gas/New()
+/obj/item/explosive/grenade/nerve_gas/Initialize(mapload, ...)
 	. = ..()
 	nerve_gas = new nerve_gas_type
 	nerve_gas.attach(src)