Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2

code/game/objects/effects/landmarks.dm

@@ -102,19 +102,6 @@
 	..()
 	return QDEL_HINT_HARDDEL_NOW
 
-/obj/effect/landmark/nations
-	name = "nations"
-	icon = 'icons/mob/screen1.dmi'
-	icon_state = "x"
-	anchored = 1.0
-
-/obj/effect/landmark/nations/New()
-	..()
-	tag = "nations*[name]"
-	invisibility = 101
-
-	return 1
-
 /obj/effect/landmark/start
 	name = "start"
 	icon = 'icons/mob/screen1.dmi'

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/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)
 

code/game/objects/items/flag.dm

@@ -156,7 +156,7 @@
 	desc = "A flag proudly proclaiming the superior heritage of Unathi."
 	icon_state = "unathiflag"
 
-//Nation Flags (Able to spawn outside Nations gamemode)
+//Department Flags
 
 /obj/item/flag/cargo
 	name = "Cargonia flag"

code/game/objects/items/weapons/flamethrower.dm

@@ -25,10 +25,13 @@
 /obj/item/weapon/flamethrower/Destroy()
 	if(weldtool)
 		qdel(weldtool)
+		weldtool = null
 	if(igniter)
 		qdel(igniter)
+		igniter = null
 	if(ptank)
 		qdel(ptank)
+		ptank = null
 	return ..()
 
 

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -15,6 +15,7 @@
 
 	Destroy()
 		qdel(smoke)
+		smoke = null
 		return ..()
 
 	prime()

code/game/objects/items/weapons/storage/bags.dm

@@ -37,7 +37,7 @@
 	max_w_class = 2
 	storage_slots = 30
 	can_hold = list() // any
-	cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
+	cant_hold = list("/obj/item/weapon/disk/nuclear")
 
 /obj/item/weapon/storage/bag/trash/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] puts the [src.name] over their head and starts chomping at the insides! Disgusting!</span>")
@@ -88,7 +88,7 @@
 	storage_slots = 7
 	display_contents_with_number = 0 //or else this will lead to stupid behavior.
 	can_hold = list() // any
-	cant_hold = list("/obj/item/weapon/disk/nuclear","/obj/item/flag/nation")
+	cant_hold = list("/obj/item/weapon/disk/nuclear")
 	var/head = 0
 
 /obj/item/weapon/storage/bag/plasticbag/mob_can_equip(M as mob, slot)

code/game/objects/objs.dm

@@ -1,6 +1,5 @@
 /obj
 	//var/datum/module/mod		//not used
-	var/w_amt = 0	// waster amounts
 	var/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
 	var/reliability = 100	//Used by SOME devices to determine how reliable they are.
 	var/crit_fail = 0

code/game/objects/structures/morgue.dm

@@ -318,9 +318,6 @@
 			return
 
 	else
-		if(!isemptylist(search_contents_for(/obj/item/flag/nation)))
-			usr << "You get the feeling that you shouldn't cremate one of the items in the cremator."
-			return
 		for (var/mob/M in viewers(src))
 			M.show_message("\red You hear a roar as the crematorium activates.", 1)
 
@@ -417,7 +414,7 @@
 		usr << "\red Access denied."
 	return
 
-/hook/Login/proc/update_morgue(var/client/client, var/mob/L)	
+/hook/Login/proc/update_morgue(var/client/client, var/mob/L)
 	//Update morgues on login/logout
 	if (L.stat == DEAD)
 		var/obj/structure/morgue/Morgue = null
@@ -440,8 +437,8 @@
 					Morgue = B.loc
 			if (Morgue)
 				Morgue.update()
-				
-/hook/Logout/proc/update_morgue(var/client/client, var/mob/L)					
+
+/hook/Logout/proc/update_morgue(var/client/client, var/mob/L)
 	//Update morgues on login/logout
 	if (L.stat == DEAD)
 		var/obj/structure/morgue/Morgue = null