cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-29 07:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from Aurorastation/development

Browse Source 
Development
This commit is contained in:
SoundScopes
2015-02-15 19:18:11 +00:00
parent 4985c705f3 17d46c6933
commit 39ea10683b
48 changed files with 2229 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/DB ban/functions.dm
-2
View File
@@ -316,8 +316,6 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
output += "</form>"
output += "Please note that all jobban bans or unbans are in-effect the following round."
message_admins("Adminckey: [adminckey], playerckey: [playerckey].")
if(adminckey || playerckey)
var/blcolor = "#ffeeee" //banned light
code/modules/admin/admin_verbs.dm
+2
View File
@@ -212,6 +212,8 @@ var/list/admin_verbs_debug = list(
/client/proc/air_report,
/client/proc/reload_admins,
/client/proc/restart_controller,
/client/proc/remake_distribution_map,
/client/proc/show_distribution_map,
/client/proc/enable_debug_verbs,
/client/proc/callproc,
/client/proc/toggledebuglogs,
code/modules/admin/verbs/warning.dm
+6 -5
View File
@@ -108,12 +108,13 @@
ip = C.address
var/a_ckey = sanitizeSQL(ckey)
message_admins("Data to be entered: [severity], [reason], [notes], [sqlkey], [computerid], [ip], [a_ckey].")
var/DBQuery/query_insert = dbcon.NewQuery("INSERT INTO aurora_warnings (id, time, severity, reason, notes, ckey, computerid, ip, a_ckey) VALUES (null, Now(), '[severity]', '[reason]', '[notes]', '[sqlkey]', '[computerid]', '[ip]', '[a_ckey]')")
query_insert.Execute()
notes_add(warned_ckey, "Warning added by [a_ckey], for: [reason]. || Notes regarding the warning: [notes].")
feedback_add_details("admin_verb","WARN-DB")
message_admins("[key_name_admin(src)] has warned [warned_ckey].")
if(C)
C << "<font color='red'><BIG><B>You have been formally warned by an administrator.</B></BIG><br>You can look up your warnings through the OOC panel, with the 'My Warnings' button.</font>"
message_admins("[key_name_admin(src)] has warned [warned_ckey] for: [reason].")
message_mods("[key_name_admin(src)] has warned [warned_ckey].")
/*
@@ -198,7 +199,7 @@
alert("Connection to the SQL database lost. Aborting. Please alert an Administrator or a member of staff.")
return
var/dat = "<div align='center'><h3>Warning Look-up Panel</h3></div><br>"
var/dat = "<div align='center'><h3>Warning Look-up Panel</h3><br>"
//Totally not stealing code from the DB_ban_panel
@@ -207,7 +208,7 @@
dat += "<b>Ckey:</b> <input type='text' name='warnsearchckey' value='[playerckey]'>"
dat += "<b>Admin ckey:</b> <input type='text' name='warnsearchadmin' value='[adminckey]'>"
dat += "<input type='submit' value='search'>"
dat += "</form>"
dat += "</form></div>"
if(adminckey || playerckey)
@@ -261,4 +262,4 @@
dat +="</table>"
usr << browse(dat, "window=lookupwarns;size=900x500")
feedback_add_details("admin_verb","WARN-LKUP")
feedback_add_details("admin_verb","WARN-LKUP")