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

Atomizes flamethrower and incendiary grenade crates #3494

Merged
merged 5 commits into from
Oct 8, 2024
Merged

Atomizes flamethrower and incendiary grenade crates #3494

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ab81cc
atomizes flamethrowers and incendiary grenades
zimon9 Oct 7, 2024
02e75b9
Merge branch 'master' into flamethrower-crate-atomization
zimon9 Oct 7, 2024
af020b2
increases the cost of incendiary grenades
zimon9 Oct 7, 2024
f320bad
Merge branch 'flamethrower-crate-atomization' of https://github.com/z…
zimon9 Oct 7, 2024
2feea16
grammatical and organizational fixes
zimon9 Oct 8, 2024
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
28 changes: 15 additions & 13 deletions code/modules/cargo/packs/sec_supply.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,21 @@
crate_name = "combat knife crate"
*/

/datum/supply_pack/sec_supply/fire
name = "Incendiary Weapons Crate"
desc = "Burn, baby burn. Contains three incendiary grenades and three prebuilt flamethrowers."
cost = 5000
contains = list(
/obj/item/flamethrower/full,
/obj/item/flamethrower/full,
/obj/item/flamethrower/full,
/obj/item/grenade/chem_grenade/incendiary,
/obj/item/grenade/chem_grenade/incendiary,
/obj/item/grenade/chem_grenade/incendiary,
)
crate_name = "incendiary weapons crate"
/datum/supply_pack/sec_supply/flamethrower
name = "Flamethrower Crate"
desc = "Contains one flamethrower. Point the nozzle away from anything important."
cost = 1250
contains = list(/obj/item/flamethrower/full)
crate_name = "flamethrower crate"
crate_type = /obj/structure/closet/crate/secure/weapon
faction = FACTION_NGR

/datum/supply_pack/sec_supply/incendiary_grenade
name = "Incendiary Grenade Crate"
desc = "Contains one incendiary grenade. Better not let it go off in your hands."
cost = 750
contains = list(/obj/item/grenade/chem_grenade/incendiary)
crate_name = "incendiary grenade crate"
crate_type = /obj/structure/closet/crate/secure/plasma
faction = FACTION_NGR

Expand Down
Loading