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

More Conflict Resolution

Browse Source
This commit is contained in:
KasparoVy
2016-09-03 21:29:10 -04:00
parent c684a1b8fe b18c280afe
commit 1373070b98
158 changed files with 1724 additions and 1497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences_mysql.dm
+1 -1
View File
@@ -61,7 +61,7 @@
// Might as well scrub out any malformed be_special list entries while we're here
for(var/role in be_special)
if(!(role in special_roles))
log_to_dd("[C.key] had a malformed role entry: '[role]'. Removing!")
log_runtime(EXCEPTION("[C.key] had a malformed role entry: '[role]'. Removing!"), src)
be_special -= role
var/DBQuery/query = dbcon.NewQuery({"UPDATE [format_table_name("player")]