From c7c560e9777bebe3644770cdbc246d09cda3c298 Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Sun, 13 Oct 2024 14:51:22 +0300 Subject: [PATCH] hmm (#500) --- code/game/objects/items/storage/backpack.dm | 3 +-- code/game/objects/items/storage/holsters.dm | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index efc571f13d8..b460360eed7 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -762,7 +762,6 @@ else if(istype(I, /obj/item/ammo_magazine/flamer_tank)) var/obj/item/ammo_magazine/flamer_tank/FT = I if(FT.default_ammo != /datum/ammo/flamethrower) - to_chat(user, span_warning("Not the right kind of fuel!")) return ..() if(FT.current_rounds == FT.max_rounds || !reagents.total_volume) return ..() @@ -806,7 +805,7 @@ /obj/item/storage/backpack/marine/engineerpack/examine(mob/user) . = ..() - . += "[reagents.total_volume] units of fuel left!" + . += span_notice("[reagents.total_volume] units of fuel left!") /obj/item/storage/backpack/lightpack name = "\improper lightweight combat pack" diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index d35e9087a5e..e5f6027560a 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -335,6 +335,8 @@ return if(get_dist(user, flamer_tank) > 1) return + if(flamer_tank.default_ammo != /datum/ammo/flamethrower) // hardcoded check for right fuel type + return if(flamer_tank.current_rounds >= flamer_tank.max_rounds) to_chat(user, span_warning("[flamer_tank] is already full.")) return @@ -350,7 +352,7 @@ /obj/item/storage/holster/backholster/flamer/examine(mob/user) . = ..() - . += "[tank.current_rounds] units of fuel left!" + . += span_notice("[tank.current_rounds] units of fuel left!") /obj/item/storage/holster/backholster/flamer/full/Initialize(mapload) . = ..()