Merge pull request #10163 from PsiOmegaDelta/150713-Fixes

Fixes
This commit is contained in:
Ccomp5950
2015-07-13 09:35:58 -04:00
7 changed files with 48 additions and 48 deletions

View File

@@ -44,13 +44,12 @@
return all_alarms
/obj/nano_module/alarm_monitor/ai/Topic(ref, href_list)
/obj/nano_module/alarm_monitor/Topic(ref, href_list)
if(..())
return 1
if(href_list["switchTo"])
var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras
if(!C)
return
usr.switch_to_camera(C)