diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index ed70858673..6280fb3210 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -13,7 +13,7 @@ var/showadminmessages = 1
/proc/toggle_adminmsg()
set name = "Toggle Admin Messages"
set category = "Server"
- showadminmessages = !showadminmessages
+ //showadminmessages = !showadminmessages
/obj/admins/Topic(href, href_list)
..()
@@ -1352,33 +1352,75 @@ var/showadminmessages = 1
/obj/admins/proc/player()
var/dat = "
Player Menu"
- dat += "| Name | Real Name | Key | Options | PM | Traitor? |
"
+ dat += "| Name | Real Name | Key | Options | PM | Traitor? | Karma |
"
//add IP: | to this if wanting to add back in IP checking
//add (IP: [M.lastKnownIP]) | if you want to know their ip to the lists below
var/list/mobs = sortmobs()
+ var/DBConnection/dbcon = new()
+ dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
+ if(!dbcon.IsConnected())
+ usr << "\red Unable to connect to karma database. This error can occur if your host has failed to set up an SQL database or improperly configured its login credentials.
"
- for(var/mob/M in mobs)
- if(M.ckey)
- dat += "| [M.name] | "
- if(istype(M, /mob/living/silicon/ai))
- dat += "AI | "
- if(istype(M, /mob/living/silicon/robot))
- dat += "Cyborg | "
- if(istype(M, /mob/living/carbon/human))
- dat += "[M.real_name] | "
- if(istype(M, /mob/new_player))
- dat += "New Player | "
- if(istype(M, /mob/dead/observer))
- dat += "Ghost | "
- if(istype(M, /mob/living/carbon/monkey))
- dat += "Monkey | "
- if(istype(M, /mob/living/carbon/alien))
- dat += "Alien | "
- dat += {"[(M.client ? "[(M.client.goon ? "" : "")][M.client]" : "No client")] |
- X |
- PM |
- [checktraitor(M) ? "" : ""]Traitor? |
- "}
+ for(var/mob/M in mobs)
+ if(M.ckey)
+ dat += "| [M.name] | "
+ if(istype(M, /mob/living/silicon/ai))
+ dat += "AI | "
+ if(istype(M, /mob/living/silicon/robot))
+ dat += "Cyborg | "
+ if(istype(M, /mob/living/carbon/human))
+ dat += "[M.real_name] | "
+ if(istype(M, /mob/new_player))
+ dat += "New Player | "
+ if(istype(M, /mob/dead/observer))
+ dat += "Ghost | "
+ if(istype(M, /mob/living/carbon/monkey))
+ dat += "Monkey | "
+ if(istype(M, /mob/living/carbon/alien))
+ dat += "Alien | "
+ dat += {"[(M.client ? "[(M.client.goon ? "" : "")][M.client]" : "No client")] |
+ X |
+ PM |
+ [checktraitor(M) ? "" : ""]Traitor? |
+ "}
+ dat += "NOT CONNECTED |
"
+
+ else
+
+ for(var/mob/M in mobs)
+ if(M.ckey)
+
+ var/DBQuery/query = dbcon.NewQuery("SELECT karma FROM karmatotals WHERE byondkey='[M.ckey]'")
+ query.Execute()
+
+ var/currentkarma
+ while(query.NextRow())
+ currentkarma = query.item[1]
+
+ dat += "| [M.name] | "
+ if(istype(M, /mob/living/silicon/ai))
+ dat += "AI | "
+ if(istype(M, /mob/living/silicon/robot))
+ dat += "Cyborg | "
+ if(istype(M, /mob/living/carbon/human))
+ dat += "[M.real_name] | "
+ if(istype(M, /mob/new_player))
+ dat += "New Player | "
+ if(istype(M, /mob/dead/observer))
+ dat += "Ghost | "
+ if(istype(M, /mob/living/carbon/monkey))
+ dat += "Monkey | "
+ if(istype(M, /mob/living/carbon/alien))
+ dat += "Alien | "
+ dat += {"[(M.client ? "[(M.client.goon ? "" : "")][M.client]" : "No client")] |
+ X |
+ PM |
+ [checktraitor(M) ? "" : ""]Traitor? |
+ "}
+ if(currentkarma)
+ dat += "[currentkarma] |
"
+ else
+ dat += "0 | "
dat += "
"