Skip to content

Commit

Permalink
Revert "Pyro spec kit now autolinks tank and flamer (#6437)"
Browse files Browse the repository at this point in the history
This reverts commit 4383065.
  • Loading branch information
Zonespace27 authored Jun 18, 2024
1 parent 43a38ff commit 83d8022
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 1 addition & 4 deletions code/game/objects/items/storage/large_holster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/storage.dm
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(mapload, ...)
/obj/item/storage/Initialize()
. = ..()
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
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)
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)
Expand Down

0 comments on commit 83d8022

Please sign in to comment.