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

demo scanner now properly works for incinerator tanks #6544

Merged
merged 3 commits into from
Jul 10, 2024
Merged

demo scanner now properly works for incinerator tanks #6544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d241cbd
this says a lot about society
iloveloopers Jun 23, 2024
77bd28b
so cringe
iloveloopers Jun 24, 2024
059aebb
this is cool too
iloveloopers Jun 24, 2024
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
15 changes: 15 additions & 0 deletions code/game/objects/items/devices/scanners.dm
View file
Open in desktop
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
View file
Open in desktop
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
Loading