Skip to content

Commit

Permalink
Fixes nerve gas grenades (#4415)
Browse files Browse the repository at this point in the history
# About the pull request

lol

# Explain why it's good for the game

How did this get through code review

# Changelog
:cl:
fix: Fixed CN20-X canister grenades
/:cl:
  • Loading branch information
BeagleGaming1 authored Sep 16, 2023
1 parent 45de005 commit cf1a2da
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions code/game/objects/items/explosives/grenades/marines.dm
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()
..()
nerve_gas = new /datum/effect_system/smoke_spread/cn20
/obj/item/explosive/grenade/nerve_gas/Initialize(mapload, ...)
. = ..()
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

0 comments on commit cf1a2da

Please sign in to comment.