Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'
This commit is contained in:
@@ -8,7 +8,7 @@ var/list/preferences_datums = list()
|
|||||||
//doohickeys for savefiles
|
//doohickeys for savefiles
|
||||||
var/path
|
var/path
|
||||||
var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
|
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
|
//non-preference stuff
|
||||||
var/muted = 0
|
var/muted = 0
|
||||||
@@ -119,7 +119,7 @@ var/list/preferences_datums = list()
|
|||||||
load_path(C.ckey)
|
load_path(C.ckey)
|
||||||
unlock_content = C.IsByondMember()
|
unlock_content = C.IsByondMember()
|
||||||
if(unlock_content)
|
if(unlock_content)
|
||||||
max_save_slots = 8
|
max_save_slots = 15
|
||||||
var/loaded_preferences_successfully = load_preferences()
|
var/loaded_preferences_successfully = load_preferences()
|
||||||
if(loaded_preferences_successfully)
|
if(loaded_preferences_successfully)
|
||||||
if(load_character())
|
if(load_character())
|
||||||
|
|||||||
Reference in New Issue
Block a user