Sayu grenade and assembly update

code/modules/assembly/timer.dm

@@ -4,25 +4,28 @@
 	icon_state = "timer"
 	m_amt = 500
 	g_amt = 50
-	w_amt = 10
 	origin_tech = "magnets=1"
 
-	wires = WIRE_PULSE
-
 	secured = 0
 
+	bomb_name = "time bomb"
+
 	var/timing = 0
 	var/time = 10
+	var/repeat = 0
+	var/set_time = 10
 
 	proc
 		timer_end()
 
+	describe()
+		if(timing)
+			return "The timer is counting down from [time]!"
+		return "The timer is set for [time] seconds."
 
 	activate()
 		if(!..())	return 0//Cooldown check
-		
 		timing = !timing
-
 		update_icon()
 		return 0
 
@@ -39,10 +42,9 @@
 
 
 	timer_end()
-		if(!secured)	return 0
+		if((!secured)||(cooldown > 0))	return 0
 		pulse(0)
-		if(!holder)
-			visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
+		loc.visible_message("\icon[src] *beep* *beep*", "*beep* *beep*")
 		cooldown = 2
 		spawn(10)
 			process_cooldown()
@@ -53,9 +55,9 @@
 		if(timing && (time > 0))
 			time--
 		if(timing && time <= 0)
-			timing = 0
+			timing = repeat
 			timer_end()
-			time = 10
+			time = set_time
 		return
 
 
@@ -76,9 +78,24 @@
 			return 0
 		var/second = time % 60
 		var/minute = (time - second) / 60
-		var/dat = text("<TT><B>Timing Unit</B>\n[] []:[]\n<A href='?src=\ref[];tp=-30'>-</A> <A href='?src=\ref[];tp=-1'>-</A> <A href='?src=\ref[];tp=1'>+</A> <A href='?src=\ref[];tp=30'>+</A>\n</TT>", (timing ? text("<A href='?src=\ref[];time=0'>Timing</A>", src) : text("<A href='?src=\ref[];time=1'>Not Timing</A>", src)), minute, second, src, src, src, src)
-		dat += "<BR><BR><A href='?src=\ref[src];refresh=1'>Refresh</A>"
-		dat += "<BR><BR><A href='?src=\ref[src];close=1'>Close</A>"
+		var/set_second = set_time % 60
+		var/set_minute = (set_time - set_second) / 60
+		if(second < 10) second = "0[second]"
+		if(set_second < 10) set_second = "0[set_second]"
+
+		var/dat = {"
+		<TT>
+			<center><h2>Timing Unit</h2>
+			[minute]:[second] <a href='?src=\ref[src];time=1'>[timing?"Stop":"Start"]</a> <a href='?src=\ref[src];reset=1'>Reset</a><br>
+			Repeat: <a href='?src=\ref[src];repeat=1'>[repeat?"On":"Off"]</a><br>
+			Timer set for
+			<A href='?src=\ref[src];tp=-30'>-</A> <A href='?src=\ref[src];tp=-1'>-</A> [set_minute]:[set_second] <A href='?src=\ref[src];tp=1'>+</A> <A href='?src=\ref[src];tp=30'>+</A>
+			</center>
+		</TT>
+		<BR><BR>
+		<A href='?src=\ref[src];refresh=1'>Refresh</A>
+		<BR><BR>
+		<A href='?src=\ref[src];close=1'>Close</A>"}
 		user << browse(dat, "window=timer")
 		onclose(user, "timer")
 		return
@@ -92,13 +109,20 @@
 			return
 
 		if(href_list["time"])
-			timing = text2num(href_list["time"])
+			timing = !timing
 			update_icon()
+		if(href_list["reset"])
+			time = set_time
+
+		if(href_list["repeat"])
+			repeat = !repeat
 
 		if(href_list["tp"])
 			var/tp = text2num(href_list["tp"])
-			time += tp
-			time = min(max(round(time), 0), 600)
+			set_time += tp
+			set_time = min(max(round(set_time), 5), 600)
+			if(!timing)
+				time = set_time
 
 		if(href_list["close"])
 			usr << browse(null, "window=timer")