diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm index 805726ba748..cd5f5dcdbd9 100644 --- a/code/defines/procs/dbcore.dm +++ b/code/defines/procs/dbcore.dm @@ -181,6 +181,7 @@ DBQuery/proc/SetConversion(column,conversion) */ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, var/pass_not_found = 0) if (!query_to_parse || !argument_list || !argument_list.len) + log_debug("parseArguments() failed! Improper arguments sent!") return 0 for (var/placeholder in argument_list) @@ -188,6 +189,7 @@ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, v if (pass_not_found) continue else + log_debug("parseArguments() failed! Key not found: [placeholder].") return 0 var/argument = argument_list[placeholder] @@ -199,6 +201,7 @@ DBQuery/proc/parseArguments(var/query_to_parse = null, var/list/argument_list, v else if (isnum(argument)) argument = "'[argument]'" else + log_debug("parseArguments() failed! Cannot identify argument!") return 0 query_to_parse = replacetextEx(query_to_parse, placeholder, argument) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 508edb03fd2..099256ac43a 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1081,7 +1081,7 @@ proc/admin_notice(var/message, var/rights) set desc = "(atom path) Spawn an atom" set name = "Spawn" - if(!check_rights(R_SPAWN)) return + if(!check_rights(R_SPAWN|R_DEV)) return var/list/types = typesof(/atom) var/list/matches = new() diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm index 588abca9e6c..44416a11a82 100644 --- a/code/modules/admin/player_notes_sql.dm +++ b/code/modules/admin/player_notes_sql.dm @@ -79,7 +79,7 @@ usr << "Cancelled" return var/DBQuery/editquery = dbcon.NewQuery("UPDATE ss13_notes SET content = :new_content, lasteditor = :a_ckey, lasteditdate = Now(), edited = 1 WHERE id = :note_id") - editquery.Execute(list(":new_conent" = new_content, ":a_ckey" = usr.client.ckey, ":note_id" = note_id)) + editquery.Execute(list(":new_content" = new_content, ":a_ckey" = usr.client.ckey, ":note_id" = note_id)) /datum/admins/proc/show_notes_sql(var/player_ckey = null, var/admin_ckey = null) if (!check_rights(R_ADMIN|R_MOD)) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index e579ca15444..6d45b622910 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -8,7 +8,7 @@ set name = "Jump to Area" set desc = "Area to jump to" set category = "Admin" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV)) return if(config.allow_admin_jump) @@ -24,7 +24,7 @@ /client/proc/jumptoturf(var/turf/T in world) set name = "Jump to Turf" set category = "Admin" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV)) return if(config.allow_admin_jump) log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]") @@ -40,7 +40,7 @@ set category = "Admin" set name = "Jump to Mob" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV)) return if(config.allow_admin_jump) @@ -62,7 +62,7 @@ set category = "Admin" set name = "Jump to Coordinate" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV)) return if (config.allow_admin_jump) @@ -82,7 +82,7 @@ set category = "Admin" set name = "Jump to Key" - if(!check_rights(R_ADMIN|R_MOD|R_DEBUG)) + if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV)) return if(config.allow_admin_jump) diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm index e7476221079..192d8fc4ede 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -375,7 +375,7 @@ if ("delete") if(alert("Delete this warning?", "Delete?", "Yes", "No") == "Yes") var/DBQuery/deleteQuery = dbcon.NewQuery("UPDATE ss13_warnings SET visible = 0 WHERE id = :warning_id") - deleteQuery.Execute(query_details) + deleteQuery.Execute(query_details, 1) message_admins("\blue [key_name_admin(usr)] deleted one of [ckey]'s warnings.") log_admin("[key_name(usr)] deleted one of [ckey]'s warnings.") diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index d47c438443c..578902d9c04 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -67,6 +67,13 @@ if("prefs") return prefs.process_link(usr,href_list) if("vars") return view_var_Topic(href,href_list,hsrc) + if(href_list["warnacknowledge"]) + var/queryid = text2num(href_list["warnacknowledge"]) + warnings_acknowledge(queryid) + + if(href_list["warnview"]) + warnings_check() + ..() //redirect to hsrc.Topic() /client/proc/handle_spam_prevention(var/message, var/mute_type) diff --git a/html/changelog.html b/html/changelog.html index 3b3bb449ae9..e50f75e62f7 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,62 @@ -->
+

15 February 2016

+

Lord Lag updated:

+ + +

12 February 2016

+

Ryan784 updated:

+ + +

01 February 2016

+

Lady of Ravens updated:

+ +

Lord Lag updated:

+ +

Mahzel updated:

+ +

Ryan784 updated:

+ +

Skull132 updated:

+ +

06 December 2015

Hubblenaut updated: