Makes camera alarms work properly on reactivation.

TheTypoMaster · Jun 11, 2015 · 3a759c8 · 3a759c8
1 parent 77334d7
commit 3a759c8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
@@ -81,6 +81,8 @@
 							cameranet.addCamera(src)
 						emped = 0 //Resets the consecutive EMP count
 						triggerCameraAlarm()
+						spawn(100)
+							cancelCameraAlarm()
 			for(var/mob/O in mob_list)
 				if (O.client && O.client.eye == src)
 					O.unset_machine()
@@ -249,7 +251,10 @@
 				add_hiddenprint(user)
 			else
 				visible_message("<span class='danger'>\The [src] reactivates!</span>")
+			triggerCameraAlarm()
 			icon_state = initial(icon_state)
+			spawn(100)
+				cancelCameraAlarm()
 		playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
 
 	// now disconnect anyone using the camera