Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360

[MIRROR] Cleans up some logging
2018-06-12 07:41:10 -05:00
parent b70ed7cd11 c684042f05
commit 87cc0e6c6f
48 changed files with 82 additions and 82 deletions
@@ -43,7 +43,7 @@
 			team.add_member(bro)
 			bro.special_role = "brother"
 			bro.restricted_roles = restricted_jobs
-			log_game("[bro.key] (ckey) has been selected as a Brother")
+			log_game("[key_name(bro)] has been selected as a Brother")
 		pre_brother_teams += team
 	return ..()

@@ -69,7 +69,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 		GLOB.changeling_team_objective_type = pick(possible_team_objectives)

 	for(var/datum/mind/changeling in changelings)
-		log_game("[changeling.key] (ckey) has been selected as a changeling")
+		log_game("[key_name(changeling)] has been selected as a changeling")
 		var/datum/antagonist/changeling/new_antag = new()
 		new_antag.team_mode = TRUE
 		changeling.add_antag_datum(new_antag)
@@ -174,7 +174,7 @@ Credit where due:
 /datum/game_mode/clockwork_cult/post_setup()
 	for(var/S in servants_to_serve)
 		var/datum/mind/servant = S
-		log_game("[servant.key] was made an initial servant of Ratvar")
+		log_game("[key_name(servant)] was made an initial servant of Ratvar")
 		var/mob/living/L = servant.current
 		var/turf/T = pick(GLOB.servant_spawns)
 		L.forceMove(T)
@@ -79,7 +79,7 @@
 		cultists_to_cult += cultist
 		cultist.special_role = ROLE_CULTIST
 		cultist.restricted_roles = restricted_jobs
-		log_game("[cultist.key] (ckey) has been selected as a cultist")
+		log_game("[key_name(cultist)] has been selected as a cultist")


 	return (cultists_to_cult.len>=required_enemies)
@@ -41,7 +41,7 @@
 		devil.special_role = traitor_name
 		devil.restricted_roles = restricted_jobs

-		log_game("[devil.key] (ckey) has been selected as a [traitor_name]")
+		log_game("[key_name(devil)] has been selected as a [traitor_name]")
 		antag_candidates.Remove(devil)

 	if(devils.len < required_enemies)
@@ -36,7 +36,7 @@
 		carriers += carrier
 		carrier.special_role = "Monkey Leader"
 		carrier.restricted_roles = restricted_jobs
-		log_game("[carrier.key] (ckey) has been selected as a Jungle Fever carrier")
+		log_game("[key_name(carrier)] has been selected as a Jungle Fever carrier")
 		antag_candidates -= carrier

 	if(!carriers.len)
@@ -30,7 +30,7 @@
 			pre_nukeops += new_op
 			new_op.assigned_role = "Nuclear Operative"
 			new_op.special_role = "Nuclear Operative"
-			log_game("[new_op.key] (ckey) has been selected as a nuclear operative")
+			log_game("[key_name(new_op)] has been selected as a nuclear operative")
 		return TRUE
 	else
 		return FALSE
@@ -96,7 +96,7 @@
 	revolution = new()

 	for(var/datum/mind/rev_mind in headrev_candidates)
-		log_game("[rev_mind.key] (ckey) has been selected as a head rev")
+		log_game("[key_name(rev_mind)] has been selected as a head rev")
 		var/datum/antagonist/rev/head/new_head = new()
 		new_head.give_flash = TRUE
 		new_head.give_hud = TRUE
@@ -53,7 +53,7 @@
 		pre_traitors += traitor
 		traitor.special_role = traitor_name
 		traitor.restricted_roles = restricted_jobs
-		log_game("[traitor.key] (ckey) has been selected as a [traitor_name]")
+		log_game("[key_name(traitor)] has been selected as a [traitor_name]")
 		antag_candidates.Remove(traitor)

 	return !traitors_required || pre_traitors.len > 0
@@ -23,7 +23,7 @@
 	wizards += wizard
 	wizard.assigned_role = ROLE_WIZARD
 	wizard.special_role = ROLE_WIZARD
-	log_game("[wizard.key] (ckey) has been selected as a Wizard") //TODO: Move these to base antag datum
+	log_game("[key_name(wizard)] has been selected as a Wizard") //TODO: Move these to base antag datum
 	if(GLOB.wizardstart.len == 0)
 		to_chat(wizard.current, "<span class='boldannounce'>A starting location for you could not be found, please report this bug!</span>")
 		return 0
@@ -148,7 +148,7 @@
 		id_goal_not_set = TRUE
 		id.goal = default_goal
 		say("[id]'s ID card goal defaulting to [id.goal] points.")
-	log_game("[user]([user.ckey] teleported [prisoner]([prisoner.ckey]) to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][id.goal] points.")
+	log_game("[key_name(user)] teleported [key_name(prisoner)] to the Labor Camp [COORD(beacon)] for [id_goal_not_set ? "default goal of ":""][id.goal] points.")
 	teleporter.handle_prisoner(id, temporary_record)
 	playsound(src, 'sound/weapons/emitter.ogg', 50, 1)
 	prisoner.forceMove(get_turf(beacon))
@@ -283,7 +283,7 @@
 				src.temp = "Are you sure you wish to delete all records?<br>\n\t<A href='?src=[REF(src)];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=[REF(src)];temp=1'>No</A><br>"

 			else if(href_list["del_all2"])
-				investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", INVESTIGATE_RECORDS)
+				investigate_log("[key_name(usr)] has deleted all medical records.", INVESTIGATE_RECORDS)
 				GLOB.data_core.medical.Cut()
 				src.temp = "All records deleted."

@@ -449,7 +449,7 @@
 					src.temp = "Are you sure you wish to delete the record (Medical Portion Only)?<br>\n\t<A href='?src=[REF(src)];temp=1;del_r2=1'>Yes</A><br>\n\t<A href='?src=[REF(src)];temp=1'>No</A><br>"

 			else if(href_list["del_r2"])
-				investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS)
+				investigate_log("[key_name(usr)] has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS)
 				if(active2)
 					qdel(active2)
 					active2 = null
@@ -133,7 +133,7 @@
 		if((istype(S) && S.hack_software) || IsAdminGhost(usr))
 			var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs
 			if(istype(R) && !R.emagged && (R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
-				log_game("[key_name(usr)] emagged [R.name] using robotic console!")
+				log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!")
 				message_admins("[ADMIN_LOOKUPFLW(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
 				R.SetEmagged(1)

@@ -141,7 +141,7 @@
 		if(isAI(usr) && is_servant_of_ratvar(usr))
 			var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs
 			if(istype(R) && !is_servant_of_ratvar(R) && R.connected_ai == usr)
-				log_game("[key_name(usr)] converted [R.name] using robotic console!")
+				log_game("[key_name(usr)] converted [key_name(R)] using robotic console!")
 				message_admins("[ADMIN_LOOKUPFLW(usr)] converted cyborg [key_name_admin(R)] using robotic console!")
 				add_servant_of_ratvar(R)

@@ -457,7 +457,7 @@ What a mess.*/
 				temp += "<a href='?src=[REF(src)];choice=Clear Screen'>No</a>"

 			if("Purge All Records")
-				investigate_log("[usr.name] ([usr.key]) has purged all the security records.", INVESTIGATE_RECORDS)
+				investigate_log("[key_name(usr)] has purged all the security records.", INVESTIGATE_RECORDS)
 				for(var/datum/data/record/R in GLOB.data_core.security)
 					qdel(R)
 				GLOB.data_core.security.Cut()
@@ -187,7 +187,7 @@
 	log_message("Honked from [src.name]. HONK!")
 	var/turf/T = get_turf(src)
 	message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] used a Mecha Honker in [ADMIN_VERBOSEJMP(T)]")
-	log_game("[chassis.occupant.ckey]([chassis.occupant]) used a Mecha Honker in [AREACOORD(T)]")
+	log_game("[key_name(chassis.occupant)] used a Mecha Honker in [AREACOORD(T)]")
 	return 1


@@ -32,7 +32,7 @@

 	var/time = time2text(world.realtime,"hh:mm:ss")
 	var/turf/T = get_turf(src)
-	GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) <B>:</B> [format_frequency(frequency)]/[code]")
+	GLOB.lastsignalers.Add("[time] <B>:</B> [usr.key] used [src] @ location [AREACOORD(T)] <B>:</B> [format_frequency(frequency)]/[code]")

 	var/datum/signal/signal = new(list("code" = code))
 	radio_connection.post_signal(src, signal, filter = RADIO_SIGNALER)
@@ -140,7 +140,7 @@
 	START_PROCESSING(SSfastprocess, src)
 	var/turf/T = get_turf(src)
 	message_admins("[user? "[ADMIN_LOOKUPFLW(user)] has primed [src]" : "A [src] has been primed"] (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range]) for detonation at [ADMIN_VERBOSEJMP(T)]")
-	log_game("[user? "[user] has primed [src]" : "A [src] has been primed"] ([detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range]) for detonation at [AREACOORD(T)]")
+	log_game("[user ? "[key_name(user)] has primed [src]" : "A [src] has been primed"] ([detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range]) for detonation at [AREACOORD(T)]")
 	active = TRUE

 /obj/item/hot_potato/proc/deactivate()
@@ -312,7 +312,7 @@
 		audible_message("<font color='red' size='7'>HUMAN HARM</font>")
 		playsound(get_turf(src), 'sound/ai/harmalarm.ogg', 70, 3)
 		cooldown = world.time + 200
-		log_game("[user.ckey]([user]) used a Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
+		log_game("[key_name(user)] used a Cyborg Harm Alarm in [AREACOORD(user)]")
 		if(iscyborg(user))
 			var/mob/living/silicon/robot/R = user
 			to_chat(R.connected_ai, "<br><span class='notice'>NOTICE - Peacekeeping 'HARM ALARM' used by: [user]</span><br>")
@@ -335,7 +335,7 @@
 					C.Jitter(25)
 		playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
 		cooldown = world.time + 600
-		log_game("[user.ckey]([user]) used an emagged Cyborg Harm Alarm in ([user.x],[user.y],[user.z])")
+		log_game("[key_name(user)] used an emagged Cyborg Harm Alarm in [AREACOORD(user)]")

 #define DISPENSE_LOLLIPOP_MODE 1
 #define THROW_LOLLIPOP_MODE 2
@@ -170,7 +170,7 @@
 			return
 		if(QDELETED(src) || uses <= 0)
 			return
-		log_game("[user.ckey] golem-swapped into [src]")
+		log_game("[key_name(user)] golem-swapped into [src]")
 		user.visible_message("<span class='notice'>A faint light leaves [user], moving to [src] and animating it!</span>","<span class='notice'>You leave your old body behind, and transfer into [src]!</span>")
 		show_flavour = FALSE
 		create(ckey = user.ckey,name = user.real_name)