From 67dfd1d656490629bddd568c5c15832d68468ef0 Mon Sep 17 00:00:00 2001 From: MrBagHead Date: Tue, 17 Sep 2024 20:22:29 -0400 Subject: [PATCH 1/3] Changes the Bioterror Grenade into a Large Grenade Casing --- code/game/objects/items/grenades/chem_grenade.dm | 7 +++++-- code/game/objects/items/storage/backpack.dm | 5 ++++- code/game/objects/items/storage/uplink_kits.dm | 5 ++++- .../code/modules/assault_ops/code/armaments/explosives.dm | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index df7d0849debf..c355f2e2c155 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -617,12 +617,15 @@ beakers += beaker_one beakers += beaker_two -/obj/item/grenade/chem_grenade/bioterrorfoam +// MONKESTATION EDIT START +// MONKESTATION EDIT ORIGINAL /obj/item/grenade/chem_grenade/bioterrorfoam +/obj/item/grenade/chem_grenade/large/bioterrorfoam +// MONKESTATION EDIT END name = "Bio terror foam grenade" desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload) +/obj/item/grenade/chem_grenade/large/bioterrorfoam/Initialize(mapload) . = ..() var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src) var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index a324dddaca25..bf359e802a96 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -712,7 +712,10 @@ new /obj/item/gun/ballistic/automatic/c20r/toy(src) new /obj/item/storage/box/syringes(src) new /obj/item/ammo_box/foambox/riot(src) - new /obj/item/grenade/chem_grenade/bioterrorfoam(src) + // MONKESTATION EDIT START + // MONKESTATION EDIT ORIGINAL new /obj/item/grenade/chem_grenade/bioterrorfoam(src) + new /obj/item/grenade/chem_grenade/large/bioterrorfoam(src) + // MONKESTATION EDIT END if(prob(5)) new /obj/item/food/pizza/pineapple(src) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 6514377887d6..e1e3ea8be608 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -224,7 +224,10 @@ new /obj/item/megaphone(src) // 0 tc new /obj/item/grenade/clusterbuster/random(src) // 10 tc? new /obj/item/grenade/clusterbuster/random(src) // 10 tc? - new /obj/item/grenade/chem_grenade/bioterrorfoam(src) // 5 tc + // MONKESTATION EDIT START + // MONKESTATION EDIT ORIGINAL new /obj/item/grenade/chem_grenade/bioterrorfoam(src) + new /obj/item/grenade/chem_grenade/large/bioterrorfoam(src) // 5 tc + // MONKESTATION EDIT END new /obj/item/assembly/signaler(src) // 0 tc new /obj/item/assembly/signaler(src) // 0 tc new /obj/item/assembly/signaler(src) // 0 tc diff --git a/monkestation/code/modules/assault_ops/code/armaments/explosives.dm b/monkestation/code/modules/assault_ops/code/armaments/explosives.dm index 7763e5af3746..b65db326dce3 100644 --- a/monkestation/code/modules/assault_ops/code/armaments/explosives.dm +++ b/monkestation/code/modules/assault_ops/code/armaments/explosives.dm @@ -8,7 +8,10 @@ cost = 3 /datum/armament_entry/assault_operatives/explosives/bioterror - item_type = /obj/item/grenade/chem_grenade/bioterrorfoam + // MONKESTATION EDIT START + // MONKESTATION EDIT ORIGINAL item_type = /obj/item/grenade/chem_grenade/bioterrorfoam + item_type = /obj/item/grenade/chem_grenade/large/bioterrorfoam + // MONKESTATION EDIT END cost = 1 /datum/armament_entry/assault_operatives/explosives/minibomb From c9e6241f742cd0c56b8b9e671aef0dbda1cce471 Mon Sep 17 00:00:00 2001 From: MrBagHead Date: Tue, 17 Sep 2024 20:26:23 -0400 Subject: [PATCH 2/3] Added --- code/game/objects/items/grenades/chem_grenade.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index c355f2e2c155..87698f30ca92 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -625,7 +625,10 @@ desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin." stage = GRENADE_READY +// MONKESTATION EDIT START +// MONKESTATION EDIT ORIGINAL /obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload) /obj/item/grenade/chem_grenade/large/bioterrorfoam/Initialize(mapload) +// MONKESTATION EDIT END . = ..() var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_one = new(src) var/obj/item/reagent_containers/cup/beaker/bluespace/beaker_two = new(src) From aedc5e5a81318dce487e4c7fbb7024359c41c716 Mon Sep 17 00:00:00 2001 From: MrBagHead Date: Tue, 15 Oct 2024 00:04:09 -0400 Subject: [PATCH 3/3] carbon/human --- .../code/modules/assault_ops/code/armaments/explosives.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/monkestation/code/modules/assault_ops/code/armaments/explosives.dm b/monkestation/code/modules/assault_ops/code/armaments/explosives.dm index b65db326dce3..cfa86d0d4362 100644 --- a/monkestation/code/modules/assault_ops/code/armaments/explosives.dm +++ b/monkestation/code/modules/assault_ops/code/armaments/explosives.dm @@ -8,10 +8,7 @@ cost = 3 /datum/armament_entry/assault_operatives/explosives/bioterror - // MONKESTATION EDIT START - // MONKESTATION EDIT ORIGINAL item_type = /obj/item/grenade/chem_grenade/bioterrorfoam item_type = /obj/item/grenade/chem_grenade/large/bioterrorfoam - // MONKESTATION EDIT END cost = 1 /datum/armament_entry/assault_operatives/explosives/minibomb