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

Brings back the pyro extinguisher for flamer #144

Merged
merged 2 commits into from
Mar 12, 2024
Merged

Brings back the pyro extinguisher for flamer #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e05e701
Shameless Flamer Buff
private-tristan Mar 12, 2024
f178103
Merge branch 'master' into flamer-buff
private-tristan Mar 12, 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
11 changes: 10 additions & 1 deletion code/modules/cm_marines/equipment/guncases.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,23 @@
/obj/item/storage/box/guncase/flamer
name = "\improper M240 incinerator case"
desc = "A gun case containing the M240A1 incinerator unit. It does come loaded, but you'll still have to find extra tanks as you go."
storage_slots = 3
storage_slots = 4
can_hold = list(/obj/item/weapon/gun/flamer, /obj/item/ammo_magazine/flamer_tank, /obj/item/attachable/attached_gun/extinguisher)

/obj/item/storage/box/guncase/flamer/fill_preset_inventory()
new /obj/item/weapon/gun/flamer(src)
new /obj/item/ammo_magazine/flamer_tank(src)
new /obj/item/ammo_magazine/flamer_tank(src)
new /obj/item/attachable/attached_gun/extinguisher(src)

/obj/item/storage/box/guncase/flamer/special
storage_slots = 3

/obj/item/storage/box/guncase/flamer/special/fill_preset_inventory()
new /obj/item/weapon/gun/flamer(src)
new /obj/item/ammo_magazine/flamer_tank(src)
new /obj/item/attachable/attached_gun/extinguisher/pyro(src)

//------------
/obj/item/storage/box/guncase/m56d
name = "\improper M56D heavy machine gun case"
Expand Down
4 changes: 2 additions & 2 deletions maps/map_files/golden_arrow/golden_arrow.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4789,7 +4789,7 @@
/area/golden_arrow/prep_hallway)
"CC" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/box/guncase/flamer,
/obj/item/storage/box/guncase/flamer/special,
/obj/item/explosive/grenade/smokebomb{
pixel_y = 14;
pixel_x = -5
Expand Down Expand Up @@ -5031,7 +5031,7 @@
/area/golden_arrow/briefing)
"Ei" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/box/guncase/flamer,
/obj/item/storage/box/guncase/flamer/special,
/obj/item/trash/cigbutt/cigarbutt{
pixel_y = 18
},
Expand Down
Loading