Merge pull request #3296 from Ikarrus/alarmdelay

Alarm Delay Reduction

code/game/machinery/camera/motion.dm

@@ -3,7 +3,7 @@
 	var/list/motionTargets = list()
 	var/detectTime = 0
 	var/area/ai_monitored/area_motion = null
-	var/alarm_delay = 100 // Don't forget, there's another 10 seconds in queueAlarm()
+	var/alarm_delay = 30 // Don't forget, there's another 3 seconds in queueAlarm()
 
 
 /obj/machinery/camera/process()

code/modules/mob/living/silicon/silicon.dm

@@ -31,7 +31,7 @@
 		alarm_types_clear[type] += 1
 
 	if(!in_cooldown)
-		spawn(10 * 10) // 10 seconds
+		spawn(3 * 10) // 10 seconds
 
 			if(alarms_to_show.len < 5)
 				for(var/msg in alarms_to_show)