Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.

code/game/objects/items/devices/PDA/PDA.dm

@@ -62,6 +62,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	var/ownrank = null // this one is rank, never alt title
 
 	var/obj/item/device/paicard/pai = null	// A slot for a personal AI device
+	var/retro_mode = 0
 
 /obj/item/device/pda/medical
 	default_cartridge = /obj/item/weapon/cartridge/medical
@@ -401,6 +402,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	data["idInserted"] = (id ? 1 : 0)
 	data["idLink"] = (id ? text("[id.registered_name], [id.assignment]") : "--------")
 
+	data["useRetro"] = retro_mode
+
 	data["cart_loaded"] = cartridge ? 1:0
 	if(cartridge)
 		var/cartdata[0]
@@ -574,6 +577,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					mode = 0
 				else if(mode >= 40 && mode <= 49)//Fix for cartridges. Redirects to refresh the menu.
 					cartridge.mode = mode
+		if("Retro")
+			retro_mode = !retro_mode
+			ui_interact(user)
 		if ("Authenticate")//Checks for ID
 			id_check(U, 1)
 		if("UpdateInfo")
@@ -1138,7 +1144,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				if(T.ptank) atmosanalyzer_scan(T.ptank.air_contents, user, T)
 			else if (istype(A, /obj/machinery/portable_atmospherics/scrubber/huge))
 				var/obj/machinery/portable_atmospherics/scrubber/huge/T = A
-				atmosanalyzer_scan(T.air_contents, user, T)	
+				atmosanalyzer_scan(T.air_contents, user, T)
 			else if (istype(A, /obj/machinery/atmospherics/unary/tank))
 				var/obj/machinery/atmospherics/unary/tank/T = A
 				atmosanalyzer_scan(T.air_contents, user, T)
@@ -1276,4 +1282,3 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda/emp_act(severity)
 	for(var/atom/A in src)
 		A.emp_act(severity)
-		

code/game/objects/items/devices/PDA/cart.dm

@@ -114,6 +114,10 @@
 	radio = new /obj/item/radio/integrated/signal(src)
 	..()
 
+/obj/item/weapon/cartridge/signal/Destroy()
+	qdel(radio)
+	return ..()
+
 /obj/item/weapon/cartridge/quartermaster
 	name = "Space Parts & Space Vendors Cartridge"
 	desc = "Perfect for the Quartermaster on the go!"

code/game/objects/items/devices/radio/radio.dm

@@ -144,7 +144,7 @@ var/global/list/default_medbay_channels = list(
 		var/chan_stat = channels[ch_name]
 		var/listening = !!(chan_stat & FREQ_LISTENING) != 0
 
-		dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening)))
+		dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening, "chan_span" = frequency_span_class(radiochannels[ch_name]))))
 
 	return dat
 
@@ -152,7 +152,7 @@ var/global/list/default_medbay_channels = list(
 	var/dat[0]
 	for(var/internal_chan in internal_channels)
 		if(has_channel_access(user, internal_chan))
-			dat.Add(list(list("chan" = internal_chan, "display_name" = get_frequency_name(text2num(internal_chan)))))
+			dat.Add(list(list("chan" = internal_chan, "display_name" = get_frequency_name(text2num(internal_chan)), "chan_span" = frequency_span_class(text2num(internal_chan)))))
 
 	return dat
 

code/game/objects/items/devices/scanners.dm

@@ -162,7 +162,7 @@ REAGENT SCANNER
 	user.show_message("\t Damage Specifics: <font color='blue'>[OX]</font> - <font color='green'>[TX]</font> - <font color='#FFA500'>[BU]</font> - <font color='red'>[BR]</font>")
 	user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)", 1)
 	if(M.timeofdeath && (M.stat == DEAD || (M.status_flags & FAKEDEATH)))
-		user.show_message("\blue Time of Death: [M.timeofdeath]")
+		user.show_message("\blue Time of Death: [worldtime2text(M.timeofdeath)]")
 	if(istype(M, /mob/living/carbon/human) && mode == 1)
 		var/mob/living/carbon/human/H = M
 		var/list/damaged = H.get_damaged_organs(1,1)

code/game/objects/items/devices/sensor_device.dm

@@ -1,5 +1,5 @@
 /obj/item/device/sensor_device
-	name = "handheld crew monitor" 
+	name = "handheld crew monitor"
 	desc = "A miniature machine that tracks suit sensors across the station."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "scanner"
@@ -7,10 +7,15 @@
 	slot_flags = SLOT_BELT
 	origin_tech = "biotech=3;materials=3;magnets=3"
 	var/datum/nano_module/crew_monitor/crew_monitor
-	
+
 /obj/item/device/sensor_device/New()
 	crew_monitor = new(src)
 
+/obj/item/device/sensor_device/Destroy()
+	qdel(crew_monitor)
+	crew_monitor = null
+	return ..()
+
 /obj/item/device/sensor_device/attack_self(mob/user as mob)
 	ui_interact(user)