Revert "12/21 modernizations from TG live"

2016-12-22 22:35:44 -06:00
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
@@ -42,12 +42,15 @@


 /obj/item/device/assembly/timer/proc/timer_end()
-	if(!secured || next_activate > world.time)
-		return FALSE
+	if((!secured)||(cooldown > 0))
+		return 0
 	pulse(0)
 	audible_message("\icon[src] *beep* *beep*", null, 3)
-	if(loop)
-		timing = 1
+	cooldown = 2
+	spawn(10)
+		process_cooldown()
+		if(loop)
+			timing = 1
 	update_icon()