Skip to content

Commit

Permalink
hmm (#500)
Browse files Browse the repository at this point in the history
  • Loading branch information
Helg2 authored Oct 13, 2024
1 parent c9bdd68 commit c7c560e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..()
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion code/game/objects/items/storage/holsters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
. = ..()
Expand Down

0 comments on commit c7c560e

Please sign in to comment.