cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 23:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
This commit is contained in:
PsiOmegaDelta
2015-07-14 08:21:12 +02:00
parent 6ce1ffee9a c20efa9a4c
commit 34fdc4712e
84 changed files with 408 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/nano/modules/alarm_monitor.dm
+1 -2
View File
@@ -44,13 +44,12 @@
return all_alarms
/datum/nano_module/alarm_monitor/ai/Topic(ref, href_list)
/datum/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)