Merge branch 'master' into updates_the_nbt

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm

code/datums/observation/equipped.dm

@@ -38,6 +38,7 @@ var/datum/observ/item_equipped/item_equipped_event = new()
 	. = ..()
 	mob_equipped_event.raise_event(user, src, slot)
 	item_equipped_event.raise_event(src, user, slot)
+	SEND_SIGNAL(src, COMSIG_ITEM_REMOVE, src)
 
 /obj/item/proc/check_equipped(var/mob/user, var/slot, var/assisted_equip = FALSE)
 	return TRUE

code/datums/outfits/outfit.dm

@@ -369,7 +369,7 @@
 		var/obj/item/I = new id(H)
 		imprint_idcard(H,I)
 		if(istype(P) && P.card_slot)
-			addtimer(CALLBACK(src, .proc/register_pda, P, I), 1 SECOND)
+			addtimer(CALLBACK(src, .proc/register_pda, P, I), 2 SECOND)
 		else
 			H.equip_or_collect(I, slot_wear_id)
 

code/datums/ruins.dm

@@ -6,13 +6,19 @@
 	It is clearly a mystery."
 
 	var/spawn_weight = 1
-	var/cost = null
+	var/spawn_cost = 0
+	var/player_cost = 0
 	var/list/sectors = list() //This ruin can only spawn in the sectors in this list.
 
 	var/prefix = null
 	var/suffix = null
 	template_flags = 0 // No duplicates by default
 
+	// !! Currently only implemented for away sites
+	var/list/force_ruins // Listed ruins are always spawned unless disallowed by flags.
+	var/list/allow_ruins // Listed ruins are added to the set of available spawns.
+	var/list/ban_ruins   // Listed ruins are removed from the set of available spawns. Beats allowed.
+
 /datum/map_template/ruin/New()
 	if (suffix)
 		mappath += (prefix + suffix)

code/datums/uplink/announcements.dm

@@ -46,18 +46,23 @@
 		random_record = new(user)
 
 	var/datum/record/general/record = random_record.Copy()
-	
+
 	if(I)
 		record.age = I.age
-		record.rank = I.assignment
-		record.real_rank = I.assignment
 		record.name = I.registered_name
 		record.sex = I.sex
+		record.employer = I.employer_faction
+		var/datum/faction/id_faction = SSjobs.name_factions[I.employer_faction]
+		var/faction_abbreviation = id_faction.title_suffix
+		var/assignment = "[I.assignment][ faction_abbreviation ? " ([faction_abbreviation])" : ""]"
+		record.rank = assignment
+		record.real_rank = assignment
 	else
 		var/mob/living/carbon/human/H
 		if(istype(user,/mob/living/carbon/human))
 			H = user
 			record.age = H.age
+			record.employer = H.employer_faction
 		else
 			record.age = initial(H.age)
 		var/assignment = GetAssignment(user)