coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #48708 from ExcessiveUseOfCobblestone/im-not-new-ok

Browse Source 
Waypoint Finders now properly pull living playtime
This commit is contained in:
skoglol
2020-01-11 05:41:03 +01:00
committed by GitHub
parent 36799b50a2 fe40dfea6e
commit 03b4540cbc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+1 -1
View File
@@ -31,7 +31,7 @@
body += " played by <b>[M.client]</b> "
body += "\[<A href='?_src_=holder;[HrefToken()];editrights=[(GLOB.admin_datums[M.client.ckey] || GLOB.deadmins[M.client.ckey]) ? "rank" : "add"];key=[M.key]'>[M.client.holder ? M.client.holder.rank : "Player"]</A>\]"
if(CONFIG_GET(flag/use_exp_tracking))
body += "\[<A href='?_src_=holder;[HrefToken()];getplaytimewindow=[REF(M)]'>" + M.client.get_exp_living() + "</a>\]"
body += "\[<A href='?_src_=holder;[HrefToken()];getplaytimewindow=[REF(M)]'>" + M.client.get_exp_living(FALSE) + "</a>\]"
if(isnewplayer(M))
body += " <B>Hasn't Entered Game</B> "
code/modules/jobs/job_exp.dm
+2 -2
View File
@@ -122,11 +122,11 @@ GLOBAL_PROTECT(exp_to_update)
return return_text
/client/proc/get_exp_living()
/client/proc/get_exp_living(pure_numeric = FALSE)
if(!prefs.exp)
return "No data"
var/exp_living = text2num(prefs.exp[EXP_TYPE_LIVING])
return get_exp_format(exp_living)
return pure_numeric ? exp_living : get_exp_format(exp_living)
/proc/get_exp_format(expnum)
if(expnum > 60)