cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate results from analyzing some objects (#7660)

Browse Source
This commit is contained in:
Meghan-Rossi
2020-09-20 12:17:40 +01:00
committed by VirgoBot
parent e700936b20
commit cbfd4789d7
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/power/singularity/particle_accelerator/particle_smasher.dm
View File

@@ -43,9 +43,12 @@
for(var/obj/item/I in contents)
. += "<span class='notice'>\the [I]</span>"
/obj/machinery/particle_smasher/atmosanalyze(var/mob/user)
return list("<span class='notice'>\The [src] reads an energy level of [energy].</span>")
/obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob)
if(W.type == /obj/item/device/analyzer)
to_chat(user, "<span class='notice'>\The [src] reads an energy level of [energy].</span>")
return
else if(istype(W, /obj/item/stack/material))
var/obj/item/stack/material/M = W
if(M.uses_charge)