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
+3 -7
View File
@@ -29,13 +29,6 @@
copy_overlays(bombassembly)
add_overlay("bomb_assembly")
/obj/item/onetankbomb/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/analyzer))
bombtank.attackby(W, user)
return
add_fingerprint(user)
..()
/obj/item/onetankbomb/wrench_act(mob/living/user, obj/item/I)
to_chat(user, "<span class='notice'>You disassemble [src]!</span>")
if(bombassembly)
@@ -65,6 +58,9 @@
return TRUE
/obj/item/onetankbomb/analyzer_act(mob/living/user, obj/item/I)
bombtank.analyzer_act(user, I)
/obj/item/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
bombassembly.attack_self(user, TRUE)
add_fingerprint(user)