cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps

Browse Source
This commit is contained in:
tigercat2000
2018-04-19 15:08:59 -08:00
parent c03621c508
commit 2364b0332b
25 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/time.dm
+6 -3
View File
@@ -42,9 +42,12 @@
/proc/worldtime2text()
return gameTimestamp("hh:mm:ss", world.time)
/proc/time_stamp(format = "hh:mm:ss", show_ds)
var/time_string = time2text(world.timeofday, format)
return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string
// This is ISO-8601
// If anything that uses this proc shouldn't be ISO-8601, change that thing, not this proc. This is important for logging.
/proc/time_stamp()
var/date_portion = time2text(world.timeofday, "YYYY-MM-DD")
var/time_portion = time2text(world.timeofday, "hh:mm:ss")
return "[date_portion]T[time_portion]"
/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
if(!wtime)
code/datums/spell.dm
+1 -1
View File
@@ -218,7 +218,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
before_cast(targets)
invocation()
if(user && user.ckey)
user.create_attack_log("<font color='red'>[user.real_name] ([user.ckey]) cast the spell [name].</font>")
user.create_attack_log("<font color='red'>[key_name(user)] cast the spell [name].</font>")
spawn(0)
if(charge_type == "recharge" && recharge)
start_recharge()
code/defines/procs/admin.dm
+6
View File
@@ -19,6 +19,12 @@
M = whom
C = M.client
key = M.key
else if(istype(whom, /datum/mind))
var/datum/mind/D = whom
key = D.key
M = D.current
if(D.current)
C = D.current.client
else if(istype(whom, /datum))
var/datum/D = whom
return "INVALID/([D.type])"
code/game/gamemodes/blob/blob.dm
+2 -2
View File
@@ -44,7 +44,7 @@ var/list/blob_nodes = list()
infected_crew += blob
blob.special_role = SPECIAL_ROLE_BLOB
blob.restricted_roles = restricted_jobs
log_game("[blob.key] (ckey) has been selected as a Blob")
log_game("[key_name(blob)] has been selected as a Blob")
possible_blobs -= blob
if(!infected_crew.len)
@@ -66,7 +66,7 @@ var/list/blob_nodes = list()
return 0
infected_crew += blobmind
blobmind.special_role = SPECIAL_ROLE_BLOB
log_game("[blob.key] (ckey) has been selected as a Blob")
log_game("[key_name(blob)] has been selected as a Blob")
greet_blob(blobmind)
to_chat(blob, "<span class='userdanger'>You feel very tired and bloated! You don't have long before you burst!</span>")
spawn(600)
code/game/gamemodes/cult/runes.dm
+7 -7
View File
@@ -536,15 +536,15 @@ var/list/teleport_runes = list()
/obj/effect/rune/narsie/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal.
if((istype(I, /obj/item/tome) && iscultist(user)))
user.visible_message("<span class='warning'>[user.name] begins erasing the [src]...</span>", "<span class='notice'>You begin erasing the [src]...</span>")
user.visible_message("<span class='warning'>[user] begins erasing the [src]...</span>", "<span class='notice'>You begin erasing the [src]...</span>")
if(do_after(user, 50, target = src)) //Prevents accidental erasures.
log_game("Summon Narsie rune erased by [user.mind.key] (ckey) with a tome")
log_game("Summon Narsie rune erased by [key_name(user)] with a tome")
message_admins("[key_name_admin(user)] erased a Narsie rune with a tome")
..()
return
else
if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me.
log_game("Summon Narsie rune erased by [user.mind.key] (ckey) using a null rod")
log_game("Summon Narsie rune erased by [key_name(user)] using a null rod")
message_admins("[key_name_admin(user)] erased a Narsie rune with a null rod")
..()
return
@@ -576,13 +576,13 @@ var/list/teleport_runes = list()
if((istype(I, /obj/item/tome) && iscultist(user)))
user.visible_message("<span class='warning'>[user.name] begins erasing the [src]...</span>", "<span class='notice'>You begin erasing the [src]...</span>")
if(do_after(user, 50, target = src)) //Prevents accidental erasures.
log_game("Summon demon rune erased by [user.mind.key] (ckey) with a tome")
log_game("Summon demon rune erased by [key_name(user)] with a tome")
message_admins("[key_name_admin(user)] erased a demon rune with a tome")
..()
return
else
if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me.
log_game("Summon demon rune erased by [user.mind.key] (ckey) using a null rod")
log_game("Summon demon rune erased by [key_name(user)] using a null rod")
message_admins("[key_name_admin(user)] erased a demon rune with a null rod")
..()
return
@@ -594,12 +594,12 @@ var/list/teleport_runes = list()
var/mob/living/user = invokers[1]
var/datum/game_mode/cult/cult_mode = ticker.mode
if(!(CULT_SLAUGHTER in cult_mode.objectives))
message_admins("[usr.real_name]([user.ckey]) tried to summon demons when the objective was wrong")
message_admins("[key_name_admin(user)] tried to summon demons when the objective was wrong")
burn_invokers(invokers)
log_game("Summon Demons rune failed - improper objective")
return
if(!is_station_level(user.z))
message_admins("[user.real_name]([user.ckey]) tried to summon demons off station")
message_admins("[key_name_admin(user)] tried to summon demons off station")
burn_invokers(invokers)
log_game("Summon demons rune failed - off station Z level")
return
code/game/gamemodes/miniantags/abduction/abduction.dm
+2 -2
View File
@@ -76,11 +76,11 @@
scientist.assigned_role = "MODE"
scientist.special_role = SPECIAL_ROLE_ABDUCTOR_SCIENTIST
log_game("[scientist.key] (ckey) has been selected as an abductor team [team_number] scientist.")
log_game("[key_name(scientist)] has been selected as an abductor team [team_number] scientist.")
agent.assigned_role = "MODE"
agent.special_role = SPECIAL_ROLE_ABDUCTOR_AGENT
log_game("[agent.key] (ckey) has been selected as an abductor team [team_number] agent.")
log_game("[key_name(agent)] has been selected as an abductor team [team_number] agent.")
abductors |= agent
abductors |= scientist
code/game/gamemodes/miniantags/borer/borer.dm
+1 -1
View File
@@ -436,7 +436,7 @@
to_chat(src, "<span class='userdanger'>You squirt a measure of [R.name] from your reservoirs into [host]'s bloodstream.</span>")
host.reagents.add_reagent(C.chemname, C.quantity)
chemicals -= C.chemuse
log_game("[src]/([src.ckey]) has injected [R.name] into their host [host]/([host.ckey])")
log_game("[key_name(src)] has injected [R.name] into their host [host]/([host.ckey])")
// This is used because we use a static set of datums to determine what chems are available,
// instead of a table or something. Thus, when we instance it, we can safely delete it
code/game/gamemodes/revolution/revolution.dm
+2 -2
View File
@@ -68,7 +68,7 @@
update_rev_icons_removed(trotsky)
for(var/datum/mind/rev_mind in head_revolutionaries)
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")
for(var/datum/mind/head_mind in heads)
mark_for_death(rev_mind, head_mind)
@@ -195,7 +195,7 @@
var/datum/mind/stalin = pick(promotable_revs)
revolutionaries -= stalin
head_revolutionaries += stalin
log_game("[stalin.key] (ckey) has been promoted to a head rev")
log_game("[key_name(stalin)] has been promoted to a head rev")
equip_revolutionary(stalin.current)
forge_revolutionary_objectives(stalin)
greet_revolutionary(stalin)
code/game/gamemodes/shadowling/shadowling.dm
+1 -1
View File
@@ -107,7 +107,7 @@ Made by Xhuis
/datum/game_mode/shadowling/post_setup()
for(var/datum/mind/shadow in shadows)
log_game("[shadow.key] (ckey) has been selected as a Shadowling.")
log_game("[key_name(shadow)] has been selected as a Shadowling.")
sleep(10)
to_chat(shadow.current, "<br>")
to_chat(shadow.current, "<span class='deadsay'><b><font size=3>You are a shadowling!</font></b></span>")
code/game/gamemodes/wizard/spellbook.dm
+1 -1
View File
@@ -703,7 +703,7 @@
else
user.mind.AddSpell(S)
to_chat(user, "<span class='notice'>you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!</span>")
user.create_attack_log("<font color='orange'>[user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).</font>")
user.create_attack_log("<font color='orange'>[key_name(user)] learned the spell [spellname] ([S]).</font>")
onlearned(user)
code/game/gamemodes/wizard/wizard.dm
+1 -1
View File
@@ -44,7 +44,7 @@
/datum/game_mode/wizard/post_setup()
for(var/datum/mind/wizard in wizards)
log_game("[wizard.key] (ckey) has been selected as a Wizard")
log_game("[key_name(wizard)] has been selected as a Wizard")
forge_wizard_objectives(wizard)
//learn_basic_spells(wizard.current)
equip_wizard(wizard.current)
code/game/machinery/atmoalter/canister.dm
+5 -5
View File
@@ -437,14 +437,14 @@ update_flag
var/logmsg
if(valve_open)
if(holding)
logmsg = "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the [holding]<br>"
logmsg = "Valve was <b>closed</b> by [key_name(usr)], stopping the transfer into the [holding]<br>"
else
logmsg = "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the <font color='red'><b>air</b></font><br>"
logmsg = "Valve was <b>closed</b> by [key_name(usr)], stopping the transfer into the <font color='red'><b>air</b></font><br>"
else
if(holding)
logmsg = "Valve was <b>opened</b> by [usr] ([usr.ckey]), starting the transfer into the [holding]<br>"
logmsg = "Valve was <b>opened</b> by [key_name(usr)], starting the transfer into the [holding]<br>"
else
logmsg = "Valve was <b>opened</b> by [usr] ([usr.ckey]), starting the transfer into the <font color='red'><b>air</b></font><br>"
logmsg = "Valve was <b>opened</b> by [key_name(usr)], starting the transfer into the <font color='red'><b>air</b></font><br>"
if(air_contents.toxins > 0)
message_admins("[key_name_admin(usr)] opened a canister that contains plasma in [get_area(src)]! (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
log_admin("[key_name(usr)] opened a canister that contains plasma at [get_area(src)]: [x], [y], [z]")
@@ -460,7 +460,7 @@ update_flag
if(holding)
if(valve_open)
valve_open = 0
release_log += "Valve was <b>closed</b> by [usr] ([usr.ckey]), stopping the transfer into the [holding]<br>"
release_log += "Valve was <b>closed</b> by [key_name(usr)], stopping the transfer into the [holding]<br>"
holding.loc = loc
holding = null
code/game/mecha/equipment/tools/other_tools.dm
+1 -1
View File
@@ -125,7 +125,7 @@
step_away(A,target)
sleep(2)
var/turf/T = get_turf(target)
log_game("[chassis.occupant.ckey]([chassis.occupant]) used a Gravitational Catapult in ([T.x],[T.y],[T.z])")
log_game("[key_name(chassis.occupant)] used a Gravitational Catapult in ([T.x],[T.y],[T.z])")
return 1
code/game/objects/items/devices/laserpointer.dm
+2 -2
View File
@@ -136,8 +136,8 @@
C.emp_act(1)
outmsg = "<span class='notice'>You hit the lens of [C] with [src], temporarily disabling the camera!</span>"
log_admin("\[[time_stamp()]\] [user.name] ([user.ckey]) EMPd a camera with a laser pointer")
user.create_attack_log("[user.name] ([user.ckey]) EMPd a camera with a laser pointer")
log_admin("[key_name(user)] EMPd a camera with a laser pointer")
user.create_attack_log("[key_name(user)] EMPd a camera with a laser pointer")
else
outmsg = "<span class='info'>You missed the lens of [C] with [src].</span>"
code/game/objects/items/weapons/implants/implant_traitor.dm
+1 -1
View File
@@ -74,7 +74,7 @@
slaved.add_serv_hud(user.mind, "master") //handles master servent icons
slaved.add_serv_hud(H.mind, "mindslave")
log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].")
log_admin("[key_name(user)] has mind-slaved [key_name(H)].")
activated = 1
if(jobban_isbanned(M, ROLE_SYNDICATE))
ticker.mode.replace_jobbanned_player(M, ROLE_SYNDICATE)
code/game/objects/items/weapons/tanks/watertank.dm
+1 -1
View File
@@ -286,7 +286,7 @@
nanofrost_cooldown = 1
R.remove_any(50)
var/obj/effect/nanofrost_container/A = new /obj/effect/nanofrost_container(get_turf(src))
log_game("[user.ckey] ([user.name]) used Nanofrost at [get_area(user)] ([user.x], [user.y], [user.z]).")
log_game("[key_name(user)] used Nanofrost at [get_area(user)] ([user.x], [user.y], [user.z]).")
playsound(src,'sound/items/syringeproj.ogg',40,1)
for(var/a=0, a<5, a++)
step_towards(A, target)
code/modules/admin/verbs/freeze.dm
+1 -1
View File
@@ -118,7 +118,7 @@ var/global/list/frozen_mob_list = list()
M.addVerb(/obj/mecha/verb/eject)
to_chat(M.occupant, "<b><font color= red>You have been unfrozen by <a href='?priv_msg=\ref[usr.client]'>[key]</a></b></font>")
message_admins("<span class='notice'>[key_name_admin(usr)] unfroze [key_name(M.occupant)] in a [M.name]</span>")
log_admin("[key_name(usr)] unfroze [M.occupant.name]/[M.occupant.ckey] in a [M.name]")
log_admin("[key_name(usr)] unfroze [key_name(M.occupant)] in a [M.name]")
else
message_admins("<span class='notice'>[key_name_admin(usr)] unfroze an empty [M.name]</span>")
log_admin("[key_name(usr)] unfroze an empty [M.name]")
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+1 -1
View File
@@ -272,7 +272,7 @@
occupant.emote("scream")
playsound(get_turf(src), 'sound/goonstation/effects/gib.ogg', 50, 1)
victims += "\[[time_stamp()]\] [occupant.name] ([occupant.ckey]) killed by [UserOverride ? "Autogibbing" : "[user] ([user.ckey])"]" //have to do this before ghostizing
victims += "\[[time_stamp()]\] [key_name(occupant)] killed by [UserOverride ? "Autogibbing" : "[key_name(user)]"]" //have to do this before ghostizing
occupant.death(1)
occupant.ghostize()
code/modules/hydroponics/hydroponics.dm
+1 -1
View File
@@ -799,7 +799,7 @@
else if(istype(O, /obj/item/seeds) && !istype(O, /obj/item/seeds/sample))
if(!myseed)
if(istype(O, /obj/item/seeds/kudzu))
investigate_log("had Kudzu planted in it by [user.ckey]([user]) at ([x],[y],[z])","kudzu")
investigate_log("had Kudzu planted in it by [key_name(user)] at ([x],[y],[z])","kudzu")
user.unEquip(O)
to_chat(user, "<span class='notice'>You plant [O].</span>")
dead = 0
code/modules/library/computers/checkout.dm
+2 -2
View File
@@ -263,7 +263,7 @@
if(!response)
to_chat(usr, query.ErrorMsg())
return
log_admin("LIBRARY: [usr.name]/[usr.key] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
log_admin("LIBRARY: [key_name(usr)] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
message_admins("[key_name_admin(usr)] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
src.updateUsrDialog()
return
@@ -283,7 +283,7 @@
if(affected==0)
to_chat(usr, "<span class='danger'>Unable to find any matching rows.</span>")
return
log_admin("LIBRARY: [usr.name]/[usr.key] has deleted [affected] books written by [tckey]!")
log_admin("LIBRARY: [key_name(usr)] has deleted [affected] books written by [tckey]!")
message_admins("[key_name_admin(usr)] has deleted [affected] books written by [tckey]!")
src.updateUsrDialog()
return
code/modules/mob/living/carbon/human/death.dm
+1 -1
View File
@@ -111,7 +111,7 @@
if(ishuman(LAssailant))
var/mob/living/carbon/human/H=LAssailant
if(H.mind)
H.mind.kills += "[name] ([ckey])"
H.mind.kills += "[key_name(src)]"
if(!gibbed)
update_canmove()
code/modules/mob/living/carbon/slime/slime.dm
+1 -2
View File
@@ -237,9 +237,8 @@
playsound(loc, M.attack_sound, 50, 1, 1)
visible_message("<span class='danger'>[M] [M.attacktext] [src]!</span>", \
"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
M.create_attack_log("<font color='red'>attacked [src.name] ([src.ckey])</font>")
src.create_attack_log("<font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
add_attack_logs(src, M, "Slime'd for [damage] damage")
attacked += 10
adjustBruteLoss(damage)
updatehealth()
code/modules/mob/living/silicon/pai/pai.dm
+1 -2
View File
@@ -237,9 +237,8 @@
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("<span class='danger'>[M]</span> [M.attacktext] [src]!", 1)
M.create_attack_log("<font color='red'>attacked [name] ([ckey])</font>")
create_attack_log("<font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
add_attack_logs(M, src, "Animal attacked for [damage] damage")
adjustBruteLoss(damage)
updatehealth()
code/modules/projectiles/guns/magic/wand.dm
+1 -1
View File
@@ -50,7 +50,7 @@
/obj/item/gun/magic/wand/proc/zap_self(mob/living/user)
user.visible_message("<span class='danger'>[user] zaps \himself with [src].</span>")
playsound(user, fire_sound, 50, 1)
user.create_attack_log("<b>[user]/[user.ckey]</b> zapped \himself with a <b>[src]</b>")
user.create_attack_log("<b>[key_name(user)]</b> zapped \himself with a <b>[src]</b>")
/////////////////////////////////////
//WAND OF DEATH
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -244,7 +244,7 @@ proc/wabbajack(mob/living/M)
else
return
M.create_attack_log("<font color='orange'>[M.real_name] ([M.ckey]) became [new_mob.real_name].</font>")
M.create_attack_log("<font color='orange'>[key_name(M)] became [new_mob.real_name].</font>")
new_mob.attack_log = M.attack_log
new_mob.a_intent = INTENT_HARM