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

Fixes being able to load a flamer tank with no flamer unit #4825

Merged
merged 7 commits into from
Nov 6, 2023
Merged

Fixes being able to load a flamer tank with no flamer unit #4825

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8aba18
Fixes 4824
Xander3359 Nov 2, 2023
244d5f5
Merge branch 'master' of https://github.com/cmss13-devs/cmss13
Xander3359 Nov 2, 2023
b3f8c6b
Update code/game/objects/items/storage/large_holster.dm
Xander3359 Nov 2, 2023
e1e106c
Update code/game/objects/items/storage/large_holster.dm
Xander3359 Nov 2, 2023
335402c
Update code/game/objects/items/storage/large_holster.dm
Xander3359 Nov 2, 2023
62bd6dd
kills single-letter var
Xander3359 Nov 2, 2023
27e3a1f
better loop
Xander3359 Nov 2, 2023
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
19 changes: 11 additions & 8 deletions 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 @@ -249,9 +249,13 @@
if(!ishuman(user) || user.is_mob_incapacitated())
return FALSE

var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand()
if(!istype(F))
to_chat(usr, "You must be holding the M240-T incinerator unit to use [src]")
if(user.back != src)
to_chat(user, "The [src] must be equipped before you can switch types")
return

var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
if(!istype(flamer))
to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
return

if(!active_fuel)
Expand All @@ -267,14 +271,13 @@
else
active_fuel = fuelB

for(var/X in actions)
var/datum/action/A = X
A.update_button_icon()
for(var/datum/action/action_added as anything in actions)
action_added.update_button_icon()

to_chat(user, "You switch the fuel tank to <b>[active_fuel.caliber]</b>")
playsound(src, 'sound/machines/click.ogg', 25, TRUE)
F.current_mag = active_fuel
F.update_icon()
flamer.current_mag = active_fuel
flamer.update_icon()

return TRUE

Expand Down