cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes the test-merge only code from the combat mode commit (#3064)

Browse Source 
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-02-05 21:05:21 +00:00
committed by GitHub
co-authored by Qustinnus Gandalf2k15
parent c94689e020
commit dd4a146f90
5 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
-1
View File
@@ -6,7 +6,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/client/parent
//doohickeys for savefiles
var/path
var/save_path
var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
var/max_save_slots = 3
code/modules/client/preferences_savefile.dm
+2 -6
View File
@@ -139,11 +139,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
if(fexists("data/player_saves/combat_test/[ckey[1]]/[ckey]/[filename]"))
path = "data/player_saves/combat_test/[ckey[1]]/[ckey]/[filename]"
return
path = "data/player_saves/[ckey[1]]/[ckey]/[filename]"
save_path = "data/player_saves/combat_test/[ckey[1]]/[ckey]/[filename]"
/datum/preferences/proc/load_preferences()
if(!path)
@@ -283,7 +279,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
/datum/preferences/proc/save_preferences()
if(!path)
return FALSE
var/savefile/S = new /savefile()
var/savefile/S = new /savefile(path)
if(!S)
return FALSE
S.cd = "/"
@@ -505,7 +501,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
/datum/preferences/proc/save_character()
if(!path)
return FALSE
var/savefile/S = new /savefile(save_path)
var/savefile/S = new /savefile(path)
if(!S)
return FALSE
S.cd = "/character[default_slot]"