From 4383065e3d5feb3d73fbebed20fd2e71e92b527b Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:15:51 +0200 Subject: [PATCH] Pyro spec kit now autolinks tank and flamer (#6437) # About the pull request Spawning the pyro spec kit now links the flamer automatically without needing to shove it in the tank first. # Explain why it's good for the game Fixes some consistency issues that one wouldn't expect while playing pyro spec. # Changelog :cl: fix: Pyro spec flamer should be linked to its tank more consistently. /:cl: Co-authored-by: John Doe --- code/game/objects/items/storage/large_holster.dm | 5 ++++- code/game/objects/items/storage/storage.dm | 2 +- code/modules/cm_marines/equipment/kit_boxes.dm | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 220bf4e86d1e..8bcd471277bd 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -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) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 7b616b275793..75fb2ab2b377 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -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 diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index e0220d017d42..ebd9ca9dcbd9 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -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)