From d241cbd900d63d13bce028142b99f58533ec7a75 Mon Sep 17 00:00:00 2001 From: iloveloopers Date: Sun, 23 Jun 2024 15:49:05 -0400 Subject: [PATCH 1/3] this says a lot about society --- code/game/objects/items/devices/scanners.dm | 14 ++++++++++++++ code/modules/projectiles/magazines/flamer.dm | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 778082fc46a4..c273ddf1f8a6 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -340,6 +340,20 @@ 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(tank.reagents.reagent_list.len < 1) + 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("
Intensity: [min(chem.intensityfire, tank.max_intensity)]") + result += SPAN_BLUE("
Duration: [min(chem.durationfire, tank.max_duration)]") + result += SPAN_BLUE("
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) diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index 8a453beb90b4..fa12089b8682 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -244,7 +244,7 @@ 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 @@ -252,7 +252,7 @@ //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 @@ -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 From 77bd28b01bf57478d7aa9cdd6e603af5c0ea38ac Mon Sep 17 00:00:00 2001 From: iloveloopers Date: Mon, 24 Jun 2024 01:57:20 -0400 Subject: [PATCH 2/3] so cringe --- code/game/objects/items/devices/scanners.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c273ddf1f8a6..57656a9e9cd3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -343,7 +343,7 @@ FORENSIC SCANNER if(istype(O, /obj/item/ammo_magazine/flamer_tank)) var/obj/item/ammo_magazine/flamer_tank/tank = O - if(tank.reagents.reagent_list.len < 1) + if(!length(tank.reagents.reagent_list)) to_chat(user, SPAN_NOTICE("No fuel detected in [O]")) return var/result From 059aebb47d8d087a9ef49399c50a288f8b7b1cb0 Mon Sep 17 00:00:00 2001 From: iloveloopers Date: Mon, 24 Jun 2024 02:06:58 -0400 Subject: [PATCH 3/3] this is cool too --- code/game/objects/items/devices/scanners.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 57656a9e9cd3..f399af92d4b3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -348,6 +348,7 @@ FORENSIC SCANNER return var/result var/datum/reagent/chem = tank.reagents.reagent_list[1] + result += SPAN_BLUE("Fuel Statistics:") result += SPAN_BLUE("
Intensity: [min(chem.intensityfire, tank.max_intensity)]") result += SPAN_BLUE("
Duration: [min(chem.durationfire, tank.max_duration)]") result += SPAN_BLUE("
Range: [min(chem.rangefire, tank.max_range)]")