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

Fix erronous flamer_tank is empty messages and add sfx to empty canister verb #3623

Merged
merged 4 commits into from
Jun 23, 2023
Merged

Fix erronous flamer_tank is empty messages and add sfx to empty canister verb #3623

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c47e869
Fix incorrect empty message when flamer pack isn't empty, but no fuel…
Drulikar Jun 14, 2023
4a1d365
Add sfx to the remove_reagent verb
Drulikar Jun 14, 2023
e132b5e
Refactoring
Drulikar Jun 14, 2023
6101aa4
Apply suggestions from code review
Drulikar Jun 15, 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
21 changes: 11 additions & 10 deletions code/modules/projectiles/magazines/flamer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@

reagents.clear_reagents()

playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3)
to_chat(usr, SPAN_NOTICE("You empty out [src]"))
update_icon()

Expand All @@ -71,22 +72,21 @@
G.update_icon()

/obj/item/ammo_magazine/flamer_tank/afterattack(obj/target, mob/user , flag) //refuel at fueltanks when we run out of ammo.
if(!istype(target, /obj/structure/reagent_dispensers/fueltank) && !istype(target, /obj/item/tool/weldpack) && !istype(target, /obj/item/storage/backpack/marine/engineerpack))
return ..()
if(get_dist(user,target) > 1)
return ..()
if(!istype(target, /obj/structure/reagent_dispensers/fueltank) && !istype(target, /obj/item/tool/weldpack) && !istype(target, /obj/item/storage/backpack/marine/engineerpack))
return ..()

var/obj/O = target
if(!O.reagents || O.reagents.reagent_list.len < 1)
to_chat(user, SPAN_WARNING("[O] is empty!"))
if(!target.reagents || target.reagents.reagent_list.len < 1)
to_chat(user, SPAN_WARNING("\The [target] is empty!"))
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
return

if(!reagents)
create_reagents(max_rounds)

var/datum/reagent/to_add = O.reagents.reagent_list[1]
var/datum/reagent/to_add = target.reagents.reagent_list[1]

if(!istype(to_add) || (length(reagents.reagent_list) && flamer_chem != to_add.id) || length(O.reagents.reagent_list) > 1)
if(!istype(to_add) || (length(reagents.reagent_list) && flamer_chem != to_add.id) || length(target.reagents.reagent_list) > 1)
to_chat(user, SPAN_WARNING("You can't mix fuel mixtures!"))
return

Expand All @@ -96,16 +96,17 @@

var/fuel_amt_to_remove = Clamp(to_add.volume, 0, max_rounds - reagents.get_reagent_amount(to_add.id))
if(!fuel_amt_to_remove)
to_chat(user, SPAN_WARNING("[O] is empty!"))
if(!max_rounds)
to_chat(user, SPAN_WARNING("\The [target] is empty!"))
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
return

O.reagents.remove_reagent(to_add.id, fuel_amt_to_remove)
target.reagents.remove_reagent(to_add.id, fuel_amt_to_remove)
reagents.add_reagent(to_add.id, fuel_amt_to_remove)
playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3)
caliber = to_add.name
flamer_chem = to_add.id

to_chat(user, SPAN_NOTICE("You refill [src] with [caliber]."))
to_chat(user, SPAN_NOTICE("You refill \the [src] with [caliber]."))
Drulikar marked this conversation as resolved.
Show resolved Hide resolved
update_icon()

/obj/item/ammo_magazine/flamer_tank/update_icon()
Expand Down