From ead98c299abd7c4fec517ffcff39a8238d076c7c Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Tue, 9 Dec 2025 03:50:17 +0100
Subject: [PATCH] Fixes a bunch of bugs with chemical flamethrower canisters
(#31177)
* Finally got around to this
* Killing the linters
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---
.../chemical_flamethrower.dm | 28 ++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
index 5ba5930c553..7d6fee1e4c3 100644
--- a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
+++ b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
@@ -230,14 +230,14 @@
var/fire_applications = 1
/// The currently stored reagent ID
var/current_reagent_id
+ /// What chemical do we have? This will be the chemical ID, so a string
+ var/current_reagent_name
/// How many units of the reagent do we need to have it's effects kick in?
var/required_volume = 10
/// Do we have a locked in reagent type?
var/has_filled_reagent = FALSE
/// Are we silent on the first change of reagents?
var/first_time_silent = FALSE // The reason for this is so we can have canisters that spawn with reagents but don't announce it on `Initialize()`
- /// What chemical do we have? This will be the chemical ID, so a string
- var/stored_chemical
/// What color will our fire burn
var/chem_color
@@ -248,28 +248,36 @@
/obj/item/chemical_canister/examine(mob/user)
. = ..()
. += "[src] has [ammo] out of [initial(ammo)] units left!"
- if(stored_chemical && ammo != 0)
- . += "[src] is currently filled with [stored_chemical]"
+ if(current_reagent_name && ammo != 0)
+ . += "[src] is currently filled with [current_reagent_name]"
/obj/item/chemical_canister/on_reagent_change()
if(!length(reagents.reagent_list))
// Nothing to check. Has to be here because we call `clear_reagents` at the end of this proc.
return
- if(has_filled_reagent && ammo != 0)
- audible_message("[src]'s speaker beeps: no new chemicals are accepted!")
- return
+ if(has_filled_reagent && (reagents.get_master_reagent_id() != current_reagent_id))
+ audible_message("[src]'s speaker beeps: chemical override started!")
- if(!reagents.get_master_reagent_id() || !(reagents.get_master_reagent_id() in accepted_chemicals))
+ if(!(reagents.get_master_reagent_id() in accepted_chemicals))
reagents.clear_reagents()
audible_message("[src]'s speaker beeps: the most present chemical isn't accepted!")
return
+ var/old_chem_id = current_reagent_id
current_reagent_id = reagents.get_master_reagent_id()
- stored_chemical = current_reagent_id
+ current_reagent_name = reagents.get_master_reagent_name()
reagents.isolate_reagent(current_reagent_id)
var/has_enough_reagents = reagents.total_volume >= required_volume
+ if(old_chem_id == reagents.get_master_reagent_id())
+ audible_message("[src]'s speaker beeps: Refill started. Need [max(required_volume - reagents.total_volume, 0)] units before refill is started.")
+ if(has_enough_reagents)
+ ammo = initial(ammo)
+ reagents.clear_reagents()
+ has_filled_reagent = TRUE
+ return
+
if(!first_time_silent)
audible_message("[src]'s speaker beeps: \
The reservoir has [reagents.total_volume] out of [required_volume] units. \
@@ -306,7 +314,7 @@
reagents.add_reagent("napalm", 30) // Overload it with napalm!
/obj/item/chemical_canister/pyrotechnics
- name = "extended capacity chemical canister"
+ name = "pyrotechnical chemical canister"
desc = "A specialized canister designed to accept certain pyrotechnics."
icon_state = "pyro"
ammo = 150