cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
timothyteakettle
2020-12-06 15:50:33 +00:00
parent cbbcc0c386
commit a478da678e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/subsystem/job.dm
View File

@@ -675,7 +675,8 @@ SUBSYSTEM_DEF(job)
if(!ishuman(M))//no silicons allowed if(!ishuman(M))//no silicons allowed
return return
for(var/i in chosen_gear) for(var/i in chosen_gear)
var/datum/gear/G = i[LOADOUT_ITEM] var/datum/gear/G = text2path(i[LOADOUT_ITEM])
message_admins("category [initial(G.category)] and subcategory [initial(G.subcategory)] and name [initial(G.name)]")
G = GLOB.loadout_items[initial(G.category)][initial(G.subcategory)][initial(G.name)] G = GLOB.loadout_items[initial(G.category)][initial(G.subcategory)][initial(G.name)]
if(!G) if(!G)
continue continue

1
code/modules/client/preferences_savefile.dm
View File

@@ -239,6 +239,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
continue continue
loadout_data["SAVE_1"] += list(list(LOADOUT_ITEM = some_gear_item)) //for the migration we put their old save into the first save slot, which is loaded by default! loadout_data["SAVE_1"] += list(list(LOADOUT_ITEM = some_gear_item)) //for the migration we put their old save into the first save slot, which is loaded by default!
//it's double packed into a list because += will union the two lists contents //it's double packed into a list because += will union the two lists contents
S["loadout"] = safe_json_encode(loadout_data)
/datum/preferences/proc/load_path(ckey,filename="preferences.sav") /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey) if(!ckey)