cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into bay_equipping

Browse Source 
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
This commit is contained in:
Tigercat2000
2016-06-13 20:11:29 -07:00
parent 07e5957645 d9b1739b38
commit d5ae124a92
553 changed files with 13704 additions and 6739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences.dm
+1892 -1
View File
File diff suppressed because it is too large Load Diff
code/modules/client/preference/preferences_mysql.dm
+19 -4
View File
@@ -12,7 +12,8 @@
randomslot,
volume,
nanoui_fancy,
show_ghostitem_attack
show_ghostitem_attack,
lastchangelog
FROM [format_table_name("player")]
WHERE ckey='[C.ckey]'"}
)
@@ -38,10 +39,10 @@
volume = text2num(query.item[10])
nanoui_fancy = text2num(query.item[11])
show_ghostitem_attack = text2num(query.item[12])
lastchangelog = query.item[13]
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
// lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
UI_style = sanitize_inlist(UI_style, list("White", "Midnight"), initial(UI_style))
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, 65535, initial(toggles))
@@ -52,6 +53,7 @@
volume = sanitize_integer(volume, 0, 100, initial(volume))
nanoui_fancy = sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy))
show_ghostitem_attack = sanitize_integer(show_ghostitem_attack, 0, 1, initial(show_ghostitem_attack))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
return 1
/datum/preferences/proc/save_preferences(client/C)
@@ -75,7 +77,8 @@
randomslot='[randomslot]',
volume='[volume]',
nanoui_fancy='[nanoui_fancy]',
show_ghostitem_attack='[show_ghostitem_attack]'
show_ghostitem_attack='[show_ghostitem_attack]',
lastchangelog='[lastchangelog]'
WHERE ckey='[C.ckey]'"}
)
@@ -456,4 +459,16 @@
load_character(C)
return 0
load_character(C,pick(saves))
return 1*/
return 1*/
/datum/preferences/proc/SetChangelog(client/C,hash)
lastchangelog=hash
winset(C, "rpane.changelog", "background-color=none;font-style=")
var/DBQuery/query = dbcon.NewQuery("UPDATE [format_table_name("player")] SET lastchangelog='[lastchangelog]' WHERE ckey='[C.ckey]'")
if(!query.Execute())
var/err = query.ErrorMsg()
log_game("SQL ERROR during lastchangelog updating. Error : \[[err]\]\n")
message_admins("SQL ERROR during lastchangelog updating. Error : \[[err]\]\n")
to_chat(C, "Couldn't update your last seen changelog, please try again later.")
return
return 1