Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631

[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
This commit is contained in:
LetterJay
2018-05-27 01:32:02 -05:00
committed by GitHub
18 changed files with 102 additions and 94 deletions
+5 -3
View File
@@ -104,9 +104,7 @@
disconnect_from_network()
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/analyzer) && loaded_tank)
atmosanalyzer_scan(loaded_tank.air_contents, user)
else if(istype(W, /obj/item/tank/internals/plasma))
if(istype(W, /obj/item/tank/internals/plasma))
if(!anchored)
to_chat(user, "<span class='warning'>[src] needs to be secured to the floor first!</span>")
return TRUE
@@ -170,6 +168,10 @@
to_chat(user, "<span class='warning'>You [bitcoinmining ? "enable":"disable"] the research point production feature of [src].</span>")
return TRUE
/obj/machinery/power/rad_collector/analyzer_act(mob/living/user, obj/item/I)
if(loaded_tank)
loaded_tank.analyzer_act(user, I)
/obj/machinery/power/rad_collector/examine(mob/user)
. = ..()
if(active)