cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 02:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous Fixes (#1868)

Browse Source 
changes:

Engineering now actually gets engineering-type alert consoles instead of the non-functional base type.
Lighting is no longer broken by shuttles.
The ERT shuttle autoannouncer should no longer cause lighting runtimes.
Fixed some bad newlines in some character setup help texts.
Custom loadout tweaks now properly write to SQL.
Custom loadout is now saved as JSON.
Players are now shown a notice when the server was unable to load their custom loadout.
Drowsyness is now clamped to zero.
Added some new tips to the example.
Tweaked some tips' grammar.
Removed some tips that do not apply to our code base.
Probably fixes embraced vampire thralls not getting vampire verbs.
Fixes #1844.
Fixes #1835.
Probably fixes #1687.
Probably fixes #1824.
Fixes #1839
This commit is contained in:
Lohikar
2017-03-05 07:14:28 -06:00
committed by skull132
parent 3080c20428
commit 73c29bd5a7
17 changed files with 103 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -34,6 +34,7 @@ var/list/gear_datums = list()
name = "Loadout"
sort_order = 1
var/current_tab = "General"
var/gear_reset = FALSE
/datum/category_item/player_setup_item/loadout/load_character(var/savefile/S)
S["gear"] >> pref.gear
@@ -51,7 +52,7 @@ var/list/gear_datums = list()
return list("ss13_characters" = list("gear", "id" = 1, "ckey" = 1))
/datum/category_item/player_setup_item/loadout/gather_save_parameters()
return list(":gear" = list2params(pref.gear), ":id" = pref.current_character, ":ckey" = pref.client.ckey)
return list(":gear" = json_encode(pref.gear), ":id" = pref.current_character, ":ckey" = pref.client.ckey)
/datum/category_item/player_setup_item/loadout/proc/valid_gear_choices(var/max_cost)
. = list()
@@ -66,9 +67,18 @@ var/list/gear_datums = list()
. += gear_name
/datum/category_item/player_setup_item/loadout/sanitize_character(var/sql_load = 0)
if (sql_load)
pref.gear = params2list(pref.gear)
gear_reset = FALSE
if (pref.gear && istext(pref.gear))
try
pref.gear = json_decode(pref.gear)
catch
log_debug("SQL_CHAR: Unable to load preferences for client [pref.client ? pref.client.ckey : "UNKNOWN"].")
pref.gear = list()
gear_reset = TRUE
else
pref.gear = list()
gear_reset = TRUE
var/mob/preference_mob = preference_mob()
if(!islist(pref.gear))
@@ -106,6 +116,8 @@ var/list/gear_datums = list()
fcolor = "#E67300"
. = list()
. += "<table align = 'center' width = 100%>"
if (gear_reset)
. += "<tr><td colspan=3><center><i>Your loadout failed to load and will be reset if you save this slot.</i></center></td></tr>"
. += "<tr><td colspan=3><center><b><font color = '[fcolor]'>[total_cost]/[MAX_GEAR_COST]</font> loadout points spent.</b> \[<a href='?src=\ref[src];clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
. += "<tr><td colspan=3><center><b>"