diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 8bcd471277bd..220bf4e86d1e 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -195,16 +195,13 @@ can_hold = list(/obj/item/weapon/gun/flamer/M240T) has_gamemode_skin = TRUE -/obj/item/storage/large_holster/fuelpack/Initialize(mapload, obj/item/weapon/gun/flamer/M240T/linked_flamer) +/obj/item/storage/large_holster/fuelpack/Initialize() . = ..() 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 75fb2ab2b377..7b616b275793 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(mapload, ...) +/obj/item/storage/Initialize() . = ..() 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 149c68f2abda..cbc7deffcd07 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) - var/obj/item/weapon/gun/flamer/M240T/flamer = new(src) - new /obj/item/storage/large_holster/fuelpack(src, flamer) + new /obj/item/storage/large_holster/fuelpack(src) + new /obj/item/weapon/gun/flamer/M240T(src) new /obj/item/ammo_magazine/flamer_tank/large(src) new /obj/item/storage/pouch/flamertank(src) new /obj/item/tool/extinguisher(src)