Skip to content

Commit

Permalink
Brings back the pyro extinguisher for flamer (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
private-tristan committed Mar 12, 2024
1 parent 40ae227 commit 333b7a7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 10 additions & 1 deletion code/modules/cm_marines/equipment/guncases.dm
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
Original file line number Diff line number Diff line change
Expand Up @@ -4853,7 +4853,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 @@ -5105,7 +5105,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

0 comments on commit 333b7a7

Please sign in to comment.