shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update collector.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-13 22:32:45 -05:00
committed by GitHub
parent 732dc95c14
commit 80eefdd6a0
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
-4
View File
@@ -76,11 +76,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
<<<<<<< HEAD
to_chat(user, "<span class='notice'>The [W.name] detects that [last_power]W were recently produced.</span>")
=======
to_chat(user, "<span class='notice'>[W] detects that [last_power]W is being processed.</span>")
>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe
return TRUE
else if(istype(W, /obj/item/device/analyzer) && loaded_tank)
atmosanalyzer_scan(loaded_tank.air_contents, user)