Teleporter has a cancel button.

Improved the admin player panel.
Disposals now work right with things thrown at them.
Nuke upgraded to use realtime.

code/game/events/Events/PowerOffline.dm

@@ -1,8 +1,10 @@
 /datum/event/power_offline
+	var/list/protected_areas = list(/area/ai_monitored/storage/eva, /area/engine, /area/toxins/xenobiology, /area/turret_protected/ai)
+
 	Announce()
 		for(var/obj/machinery/power/apc/a in world)
 			if(!a.crit && a.z == 1)
-				if(istype(a.area, /area/engine) || istype(a.area, /area/toxins/xenobiology) || istype(a.area, /area/turret_protected/ai))
+				if(a.area in protected_areas)
 					continue
 				a.eventoff = 1
 				a.update()

code/game/gamemodes/nuclear/nuclearbomb.dm

@@ -6,7 +6,8 @@
 	density = 1
 	var/deployable = 0.0
 	var/extended = 0.0
-	var/timeleft = 60.0
+	var/timeleft = 1200
+	var/time_actual = 0
 	var/timing = 0.0
 	var/r_code = "ADMIN"
 	var/code = ""
@@ -22,8 +23,7 @@
 
 /obj/machinery/nuclearbomb/process()
 	if (src.timing)
-		src.timeleft--
-		if (src.timeleft <= 0)
+		if((time_actual <= world.timeofday) && ((world.timeofday + (time_actual - world.timeofday)) <= 864000) )
 			explode()
 		for(var/mob/M in viewers(1, src))
 			if ((M.client && M.machine == src))
@@ -35,18 +35,23 @@
 
 /obj/machinery/nuclearbomb/attack_hand(mob/user as mob)
 	if (src.extended)
+		var/time_left = time2text(time_actual-world.timeofday, "mm:ss")
+		if(world.timeofday + (time_actual - world.timeofday) >= 864000)
+			time_left = time2text(time_actual-(864000 - world.timeofday), "mm:ss")
+		if(!timing)
+			time_left = time2text(timeleft, "mm:ss")
 		user.machine = src
 		var/dat = text("<TT><B>Nuclear Fission Explosive</B><BR>\nAuth. Disk: <A href='?src=\ref[];auth=1'>[]</A><HR>", src, (src.auth ? "++++++++++" : "----------"))
 		if (src.auth)
 			if (src.yes_code)
-				dat += text("\n<B>Status</B>: []-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] <A href='?src=\ref[];timer=1'>Toggle</A><BR>\nTime: <A href='?src=\ref[];time=-10'>-</A> <A href='?src=\ref[];time=-1'>-</A> [] <A href='?src=\ref[];time=1'>+</A> <A href='?src=\ref[];time=10'>+</A><BR>\n<BR>\nSafety: [] <A href='?src=\ref[];safety=1'>Toggle</A><BR>\nAnchor: [] <A href='?src=\ref[];anchor=1'>Toggle</A><BR>\n", (src.timing ? "Func/Set" : "Functional"), (src.safety ? "Safe" : "Engaged"), src.timeleft, (src.timing ? "On" : "Off"), src, src, src, src.timeleft, src, src, (src.safety ? "On" : "Off"), src, (src.anchored ? "Engaged" : "Off"), src)
+				dat += text("\n<B>Status</B>: []-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] <A href='?src=\ref[];timer=1'>Toggle</A><BR>\nTime: <A href='?src=\ref[];time=-60'>-</A><A href='?src=\ref[];time=-10'>-</A><A href='?src=\ref[];time=-1'>-</A> [] <A href='?src=\ref[];time=1'>+</A><A href='?src=\ref[];time=10'>+</A><A href='?src=\ref[];time=60'>+</A><BR>\n<BR>\nSafety: [] <A href='?src=\ref[];safety=1'>Toggle</A><BR>\nAnchor: [] <A href='?src=\ref[];anchor=1'>Toggle</A><BR>\n", (src.timing ? "Func/Set" : "Functional"), (src.safety ? "Safe" : "Engaged"), time_left, (src.timing ? "On" : "Off"), src, src, src, src, time_left, src, src, src, (src.safety ? "On" : "Off"), src, (src.anchored ? "Engaged" : "Off"), src)
 			else
-				dat += text("\n<B>Status</B>: Auth. S2-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] Toggle<BR>\nTime: - - [] + +<BR>\n<BR>\n[] Safety: Toggle<BR>\nAnchor: [] Toggle<BR>\n", (src.safety ? "Safe" : "Engaged"), src.timeleft, (src.timing ? "On" : "Off"), src.timeleft, (src.safety ? "On" : "Off"), (src.anchored ? "Engaged" : "Off"))
+				dat += text("\n<B>Status</B>: Auth. S2-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] Toggle<BR>\nTime: - - [] + +<BR>\n<BR>\n[] Safety: Toggle<BR>\nAnchor: [] Toggle<BR>\n", (src.safety ? "Safe" : "Engaged"), time_left, (src.timing ? "On" : "Off"), time_left, (src.safety ? "On" : "Off"), (src.anchored ? "Engaged" : "Off"))
 		else
 			if (src.timing)
-				dat += text("\n<B>Status</B>: Set-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] Toggle<BR>\nTime: - - [] + +<BR>\n<BR>\nSafety: [] Toggle<BR>\nAnchor: [] Toggle<BR>\n", (src.safety ? "Safe" : "Engaged"), src.timeleft, (src.timing ? "On" : "Off"), src.timeleft, (src.safety ? "On" : "Off"), (src.anchored ? "Engaged" : "Off"))
+				dat += text("\n<B>Status</B>: Set-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] Toggle<BR>\nTime: - - [] + +<BR>\n<BR>\nSafety: [] Toggle<BR>\nAnchor: [] Toggle<BR>\n", (src.safety ? "Safe" : "Engaged"), time_left, (src.timing ? "On" : "Off"), time_left, (src.safety ? "On" : "Off"), (src.anchored ? "Engaged" : "Off"))
 			else
-				dat += text("\n<B>Status</B>: Auth. S1-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] Toggle<BR>\nTime: - - [] + +<BR>\n<BR>\nSafety: [] Toggle<BR>\nAnchor: [] Toggle<BR>\n", (src.safety ? "Safe" : "Engaged"), src.timeleft, (src.timing ? "On" : "Off"), src.timeleft, (src.safety ? "On" : "Off"), (src.anchored ? "Engaged" : "Off"))
+				dat += text("\n<B>Status</B>: Auth. S1-[]<BR>\n<B>Timer</B>: []<BR>\n<BR>\nTimer: [] Toggle<BR>\nTime: - - [] + +<BR>\n<BR>\nSafety: [] Toggle<BR>\nAnchor: [] Toggle<BR>\n", (src.safety ? "Safe" : "Engaged"), time_left, (src.timing ? "On" : "Off"), time_left, (src.safety ? "On" : "Off"), (src.anchored ? "Engaged" : "Off"))
 		var/message = "AUTH"
 		if (src.auth)
 			message = text("[]", src.code)
@@ -111,17 +116,22 @@
 			if (src.yes_code)
 				if (href_list["time"])
 					var/time = text2num(href_list["time"])
-					src.timeleft += time
-					src.timeleft = min(max(round(src.timeleft), 5), 600)
+					timeleft = min(max(time + (timeleft/10), 120), 900) * 10
 				if (href_list["timer"])
-					if (src.timing == -1.0)
+					if (timing == -1.0)
 						return
-					src.timing = !( src.timing )
-					if (src.timing)
+					timing = !( timing )
+					if (timing)
+						time_actual = world.timeofday + timeleft
+						if(time_actual >= 864000)
+							time_actual -= 864000
 						src.icon_state = "nuclearbomb2"
 						if(!src.safety)
 							bomb_set = 1//There can still be issues with this reseting when there are multiple bombs. Not a big deal tho for Nuke/N
 					else
+						timeleft = time_actual - world.timeofday
+						if(timeleft < 0)
+							timeleft += 864000
 						src.icon_state = "nuclearbomb1"
 						bomb_set = 0
 				if (href_list["safety"])
@@ -153,6 +163,7 @@
 /obj/machinery/nuclearbomb/proc/explode()
 	if (src.safety)
 		src.timing = 0
+		timeleft = 0
 		return
 	src.timing = -1.0
 	src.yes_code = 0

code/game/machinery/telecomms/broadcaster.dm

@@ -394,7 +394,7 @@ var
 			var/J = job
 			var/rendered = "[part_a][N][part_b][quotedmsg][part_c]"
 			for (var/mob/R in heard_masked)
-				if(istype(R, /mob/living/silicon/ai))
+				if(istype(R, /mob/living/silicon/ai) && job != "Automated Announcement")
 					R.show_message("[part_a]<a href='byond://?src=\ref[radio];track2=\ref[R];track=\ref[M]'>[N] ([J]) </a>[part_b][quotedmsg][part_c]", 2)
 				else
 					R.show_message(rendered, 2)
@@ -405,7 +405,7 @@ var
 			var/rendered = "[part_a][M.real_name][part_b][quotedmsg][part_c]"
 
 			for (var/mob/R in heard_normal)
-				if(istype(R, /mob/living/silicon/ai))
+				if(istype(R, /mob/living/silicon/ai) && job != "Automated Announcement")
 					R.show_message("[part_a]<a href='byond://?src=\ref[radio];track2=\ref[R];track=\ref[M]'>[realname] ([job]) </a>[part_b][quotedmsg][part_c]", 2)
 				else
 					R.show_message(rendered, 2)
@@ -419,7 +419,7 @@ var
 				rendered = "[part_a][vname][part_b][M.voice_message][part_c]"
 
 			for (var/mob/R in heard_voice)
-				if(istype(R, /mob/living/silicon/ai))
+				if(istype(R, /mob/living/silicon/ai) && job != "Automated Announcement")
 					R.show_message("[part_a]<a href='byond://?src=\ref[radio];track2=\ref[R];track=\ref[M]'>[vname] ([job]) </a>[part_b][vmessage]][part_c]", 2)
 				else
 					R.show_message(rendered, 2)
@@ -435,7 +435,7 @@ var
 			var/rendered = "[part_a][vname][part_b][quotedmsg][part_c]"
 
 			for (var/mob/R in heard_garbled)
-				if(istype(R, /mob/living/silicon/ai))
+				if(istype(R, /mob/living/silicon/ai) && job != "Automated Announcement")
 					R.show_message("[part_a]<a href='byond://?src=\ref[radio];track2=\ref[R];track=\ref[M]'>[vname]</a>[part_b][quotedmsg][part_c]", 2)
 				else
 					R.show_message(rendered, 2)

code/game/machinery/teleporter.dm

@@ -83,10 +83,11 @@
 				areaindex[tmpname] = 1
 			L[tmpname] = I
 
-	var/desc = input("Please select a location to lock in.", "Locking Computer") in L
-	src.locked = L[desc]
-	for(var/mob/O in hearers(src, null))
-		O.show_message("\blue Locked In", 2)
+	var/desc = input("Please select a location to lock in.", "Locking Computer") in L|null
+	if(desc)
+		src.locked = L[desc]
+		for(var/mob/O in hearers(src, null))
+			O.show_message("\blue Locked In", 2)
 	src.add_fingerprint(usr)
 	return
 

code/game/specops_shuttle.dm

@@ -232,7 +232,7 @@ var/specops_shuttle_timeleft = 0
 	if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom)
 		return 0
 	for(var/obj/machinery/computer/specops_shuttle/S in world)
-		if(world.time <= S.specops_shuttle_timereset)
+		if(world.timeofday <= S.specops_shuttle_timereset)
 			return 0
 	return 1
 
@@ -286,10 +286,10 @@ var/specops_shuttle_timeleft = 0
 
 		if (!specops_can_move())
 			usr << "\blue Central Command will not allow the Special Operations shuttle to return yet."
-			if(world.time <= specops_shuttle_timereset)
-				if (((world.time - specops_shuttle_timereset)/10) > 60)
-					usr << "\blue [-((world.time - specops_shuttle_timereset)/10)/60] minutes remain!"
-				usr << "\blue [-(world.time - specops_shuttle_timereset)/10] seconds remain!"
+			if(world.timeofday <= specops_shuttle_timereset)
+				if (((world.timeofday - specops_shuttle_timereset)/10) > 60)
+					usr << "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!"
+				usr << "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!"
 			return
 
 		usr << "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds."