Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes nerve gas grenades #4415

Merged
merged 3 commits into from
Sep 16, 2023
Merged

Fixes nerve gas grenades #4415

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7214b9
Update marines.dm
BeagleGaming1 Sep 15, 2023
9c2dd60
Update marines.dm
BeagleGaming1 Sep 15, 2023
15b0c4a
Update marines.dm
BeagleGaming1 Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions code/game/objects/items/explosives/grenades/marines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
BeagleGaming1 marked this conversation as resolved.
Show resolved Hide resolved
..()
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()
Expand All @@ -499,10 +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

/*
//================================================
Expand Down