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

Pyro spec kit now autolinks tank and flamer #6437

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Pyro spec kit now autolinks tank and flamer #6437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion code/game/objects/items/storage/large_holster.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,16 @@
can_hold = list(/obj/item/weapon/gun/flamer/M240T)
has_gamemode_skin = TRUE

/obj/item/storage/large_holster/fuelpack/Initialize()
/obj/item/storage/large_holster/fuelpack/Initialize(mapload, obj/item/weapon/gun/flamer/M240T/linked_flamer)
. = ..()
fuel = new /obj/item/ammo_magazine/flamer_tank/large()
fuelB = new /obj/item/ammo_magazine/flamer_tank/large/B()
fuelX = new /obj/item/ammo_magazine/flamer_tank/large/X()
active_fuel = fuel
flamer_overlay = overlay_image('icons/obj/items/clothing/backpacks.dmi', "+m240t")
if(linked_flamer)
linked_flamer.fuelpack = src
src.linked_flamer = linked_flamer

/obj/item/storage/large_holster/fuelpack/Destroy()
QDEL_NULL(active_fuel)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/storage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ W is always an item. stop_warning prevents messaging. user may be null.**/
playsound(user.loc, "rustle", 15, TRUE, 6)
return TRUE

/obj/item/storage/Initialize()
/obj/item/storage/Initialize(mapload, ...)
. = ..()
if (!(storage_flags & STORAGE_QUICK_GATHER))
verbs -= /obj/item/storage/verb/toggle_gathering_mode
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cm_marines/equipment/kit_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@
/obj/item/storage/box/spec/pyro/fill_preset_inventory()
new /obj/item/clothing/suit/storage/marine/M35(src)
new /obj/item/clothing/head/helmet/marine/pyro(src)
new /obj/item/storage/large_holster/fuelpack(src)
new /obj/item/weapon/gun/flamer/M240T(src)
var/obj/item/weapon/gun/flamer/M240T/flamer = new(src)
new /obj/item/storage/large_holster/fuelpack(src, flamer)
new /obj/item/ammo_magazine/flamer_tank/large(src)
new /obj/item/storage/pouch/flamertank(src)
new /obj/item/tool/extinguisher(src)
Expand Down
Loading