cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 18:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gear lists migration and saving (#8900)

Browse Source
This commit is contained in:
Erki
2020-05-17 19:46:39 +03:00
committed by GitHub
parent b0f5d0b7d5
commit 74ba3b615b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,12 +83,11 @@ var/list/gear_datums = list()
pref.gear_slot = text2num(pref.gear_slot)
if (istext(pref.gear))
if (istext(pref.gear_list))
try
pref.gear_list = json_decode(pref.gear_list)
catch
log_debug("SQL CHARACTER LOAD: Unable to load custom loadout for client [pref.client ? pref.client.ckey : "UNKNOWN"].")
gear_reset = TRUE
var/mob/preference_mob = preference_mob()
@@ -108,7 +107,6 @@ var/list/gear_datums = list()
pref.gear = list()
pref.gear_list = list("1" = pref.gear)
pref.gear_slot = 1
gear_reset = TRUE
for(var/gear_name in pref.gear)
if(!(gear_name in gear_datums))
@@ -245,6 +243,7 @@ var/list/gear_datums = list()
if(href_list["next_slot"] || href_list["prev_slot"])
//Set the current slot in the gear list to the currently selected gear
pref.gear_list["[pref.gear_slot]"] = pref.gear
//If we're moving up a slot..
if(href_list["next_slot"])
//change the current slot number