shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

Browse Source 
[MIRROR] Standardizes and cleans up some admin messages & logging
This commit is contained in:
deathride58
2018-06-09 05:53:25 +00:00
committed by GitHub
parent 4241ef321e 8dc3d5f70a
commit e279392386
128 changed files with 437 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+1 -3
View File
@@ -169,9 +169,7 @@
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
var/turf/end_T = get_turf(target)
if(start_T && end_T)
var/start_T_descriptor = "tile in [get_area_name(start_T, TRUE)] ([start_T.x],[start_T.y],[start_T.z])"
var/end_T_descriptor = "tile at [get_area_name(end_T, TRUE)] ([end_T.x],[end_T.y],[end_T.z])"
add_logs(src, throwable_mob, "thrown", addition="grab from [start_T_descriptor] towards [end_T_descriptor]")
add_logs(src, throwable_mob, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]")
else if(!(I.flags_1 & (NODROP_1|ABSTRACT_1)))
thrown_thing = I
code/modules/mob/living/silicon/ai/say.dm
+2 -2
View File
@@ -45,10 +45,10 @@
var/turf/padturf = get_turf(T)
var/padloc
if(padturf)
padloc = COORD(padturf)
padloc = AREACOORD(padturf)
else
padloc = "(UNKNOWN)"
log_talk(src,"HOLOPAD [padloc]: [key_name(src)] : [message]", LOGSAY)
log_talk(src,"HOLOPAD in [padloc]: [key_name(src)] : [message]", LOGSAY)
send_speech(message, 7, T, "robot", get_spans(), language)
to_chat(src, "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> <span class='message robot'>\"[message]\"</span></span></i>")
else
code/modules/mob/living/silicon/robot/robot_defense.dm
+1 -1
View File
@@ -130,7 +130,7 @@
SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
lawupdate = 0
connected_ai = null
message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
message_admins("[ADMIN_LOOKUPFLW(user)] emagged cyborg [ADMIN_LOOKUPFLW(src)]. Laws overridden.")
log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
var/time = time2text(world.realtime,"hh:mm:ss")
GLOB.lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])")
code/modules/mob/mob_helpers.dm
+2 -2
View File
@@ -434,7 +434,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
to_chat(M, "Control of your mob has been offered to dead players.")
if(usr)
log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
message_admins("[key_name_admin(usr)] has offered control of ([ADMIN_LOOKUPFLW(M)]) to ghosts")
var/poll_message = "Do you want to play as [M.real_name]?"
if(M.mind && M.mind.assigned_role)
poll_message = "[poll_message] Job:[M.mind.assigned_role]."
@@ -455,7 +455,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return TRUE
else
to_chat(M, "There were no ghosts willing to take control.")
message_admins("No ghosts were willing to take control of [key_name_admin(M)])")
message_admins("No ghosts were willing to take control of [ADMIN_LOOKUPFLW(M)])")
return FALSE
/mob/proc/is_flying(mob/M = src)