cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9071 from VOREStation/upstream-merge-7660

Browse Source 
[MIRROR] Fix duplicate results from analyzing some objects
This commit is contained in:
Novacat
2020-09-21 16:54:29 -04:00
committed by GitHub
parent b0bfb09486 624617a608
commit 4b83c18fb7
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+4 -1
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)