Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'

This commit is contained in:
TalkingCactus
2016-08-31 20:02:24 -04:00
+2 -2
View File
@@ -8,7 +8,7 @@ var/list/preferences_datums = list()
//doohickeys for savefiles
var/path
var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
var/max_save_slots = 3
var/max_save_slots = 10
//non-preference stuff
var/muted = 0
@@ -119,7 +119,7 @@ var/list/preferences_datums = list()
load_path(C.ckey)
unlock_content = C.IsByondMember()
if(unlock_content)
max_save_slots = 8
max_save_slots = 15
var/loaded_preferences_successfully = load_preferences()
if(loaded_preferences_successfully)
if(load_character())