Skip to content

Commit

Permalink
demo scanner now properly works for incinerator tanks (#6544)
Browse files Browse the repository at this point in the history
# About the pull request
will now display the stats of the reagent itself instead of the mix of
100 units. Will also display the caps of the tank instead if the reagent
goes above them
also fixes some grammar

# Explain why it's good for the game
bug fix good
grammar fix good

# Testing Photographs and Procedure
scanning a normal flamer fuel tank:
![demo
scanner](https://github.com/cmss13-devs/cmss13/assets/140007537/8d5a746a-cb2b-4040-a658-e3aaf90ea10b)

image is outdated. I added "fuel statistics" above intensity

# Changelog
:cl:
fix: Demolitions scanner now properly works for incinerator tanks.
spellcheck: Fixed some capitalization with custom incinerator tanks.
/:cl:
  • Loading branch information
iloveloopers authored Jul 10, 2024
1 parent da6fb52 commit d9d0998
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
15 changes: 15 additions & 0 deletions code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,21 @@ FORENSIC SCANNER
ex_potential = 0
int_potential = 0
rad_potential = 0

if(istype(O, /obj/item/ammo_magazine/flamer_tank))
var/obj/item/ammo_magazine/flamer_tank/tank = O
if(!length(tank.reagents.reagent_list))
to_chat(user, SPAN_NOTICE("No fuel detected in [O]"))
return
var/result
var/datum/reagent/chem = tank.reagents.reagent_list[1]
result += SPAN_BLUE("Fuel Statistics:")
result += SPAN_BLUE("<br>Intensity: [min(chem.intensityfire, tank.max_intensity)]")
result += SPAN_BLUE("<br>Duration: [min(chem.durationfire, tank.max_duration)]")
result += SPAN_BLUE("<br>Range: [min(chem.rangefire, tank.max_range)]")
to_chat(user, SPAN_NOTICE("[result]"))
return

if(istype(O,/obj/item/explosive))
var/obj/item/explosive/E = O
if(!E.customizable)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/magazines/flamer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@
max_duration = 50

/obj/item/ammo_magazine/flamer_tank/smoke
name = "Custom incinerator smoke tank"
name = "custom incinerator smoke tank"
desc = "A tank holding powdered smoke that expands when exposed to an open flame and carries any chemicals along with it."
matter = list("metal" = 3750)
flamer_chem = null
custom = TRUE

//tanks printable by the research biomass machine
/obj/item/ammo_magazine/flamer_tank/custom/upgraded
name = "Upgraded custom incinerator tank"
name = "upgraded custom incinerator tank"
desc = "A fuel tank used to store fuel for use in the M240 incinerator unit. This one has been modified with a larger and more sophisticated internal propellant tank, allowing for bigger capacity and stronger fuels."
matter = list("metal" = 50) // no free metal
flamer_chem = null
Expand All @@ -264,7 +264,7 @@
custom = TRUE

/obj/item/ammo_magazine/flamer_tank/smoke/upgraded
name = "Large custom incinerator smoke tank"
name = "large custom incinerator smoke tank"
desc = "A tank holding powdered smoke that expands when exposed to an open flame and carries any chemicals along with it. This one has been outfitted with an upgraded internal compressor, allowing for bigger capacity."
matter = list("metal" = 50) //no free metal
flamer_chem = null
Expand Down

0 comments on commit d9d0998

Please sign in to comment.