From 9e94e40db6fa1088c612d9b16dc21eb08335fbdd Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 2 Jul 2015 02:26:47 -0400 Subject: [PATCH] PDA --- code/game/objects/items/devices/PDA/PDA.dm | 71 +++++----------------- 1 file changed, 15 insertions(+), 56 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index bc161a5d70e..c0a5bce63b2 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1178,62 +1178,21 @@ var/global/list/obj/item/device/pda/PDAs = list() if(5) JFLOG("[user] used the air analysis scanner on [A]") - if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics))) - var/obj/icon = A - for (var/mob/O in viewers(user, null)) - O << "\red [user] has used [src] on \icon[icon] [A]" - var/pressure = A:air_contents.return_pressure() - - var/total_moles = A:air_contents.total_moles() - - user << "\blue Results of analysis of \icon[icon]" - if (total_moles>0) - var/o2_concentration = A:air_contents.oxygen/total_moles - var/n2_concentration = A:air_contents.nitrogen/total_moles - var/co2_concentration = A:air_contents.carbon_dioxide/total_moles - var/plasma_concentration = A:air_contents.toxins/total_moles - - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) - - user << "\blue Pressure: [round(pressure,0.1)] kPa" - user << "\blue Nitrogen: [round(n2_concentration*100)]%" - user << "\blue Oxygen: [round(o2_concentration*100)]%" - user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" - if(unknown_concentration>0.01) - user << "\red Unknown: [round(unknown_concentration*100)]%" - user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C" - else - user << "\blue Tank is empty!" - - if (istype(A, /obj/machinery/atmospherics/pipe/tank)) - var/obj/icon = A - var/obj/machinery/atmospherics/pipe/tank/T = A - for (var/mob/O in viewers(user, null)) - O << "\red [user] has used [src] on \icon[icon] [T]" - - var/pressure = T.parent.air.return_pressure() - var/total_moles = T.parent.air.total_moles() - - user << "\blue Results of analysis of \icon[icon]" - if (total_moles>0) - var/o2_concentration = T.parent.air.oxygen/total_moles - var/n2_concentration = T.parent.air.nitrogen/total_moles - var/co2_concentration = T.parent.air.carbon_dioxide/total_moles - var/plasma_concentration = T.parent.air.toxins/total_moles - - var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) - - user << "\blue Pressure: [round(pressure,0.1)] kPa" - user << "\blue Nitrogen: [round(n2_concentration*100)]%" - user << "\blue Oxygen: [round(o2_concentration*100)]%" - user << "\blue CO2: [round(co2_concentration*100)]%" - user << "\blue Plasma: [round(plasma_concentration*100)]%" - if(unknown_concentration>0.01) - user << "\red Unknown: [round(unknown_concentration*100)]%" - user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]°C" - else - user << "\blue Tank is empty!" + if (istype(A, /obj/item/weapon/tank)) + var/obj/item/weapon/tank/T = A + atmosanalyzer_scan(T.air_contents, user, T) + else if (istype(A, /obj/machinery/portable_atmospherics)) + var/obj/machinery/portable_atmospherics/T = A + atmosanalyzer_scan(T.air_contents, user, T) + else if (istype(A, /obj/machinery/atmospherics/pipe)) + var/obj/machinery/atmospherics/pipe/T = A + atmosanalyzer_scan(T.parent.air, user, T) + else if (istype(A, /obj/machinery/power/rad_collector)) + var/obj/machinery/power/rad_collector/T = A + if(T.P) atmosanalyzer_scan(T.P.air_contents, user, T) + else if (istype(A, /obj/item/weapon/flamethrower)) + var/obj/item/weapon/flamethrower/T = A + if(T.ptank) atmosanalyzer_scan(T.ptank.air_contents, user, T) if (!scanmode && istype(A, /obj/item/weapon/paper) && owner) JFLOG("[user] used the document scanner on [A]")