From 7a31222a7a83d6aa0b86a60894dbd91f5aff3966 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 8 Sep 2024 14:24:36 -0300 Subject: [PATCH 1/4] unbreak exports :) --- code/modules/client/preferences.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index bbe9e9867a..60a61cb6e8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -357,7 +357,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" dat += "
" - var/savefile/client_file = user.client.Import() + var/savefile/client_file = new(user.client.Import()) var/savefile_name if(istype(client_file, /savefile)) if(!client_file["deleted"] || savefile_needs_update(client_file) != -2) @@ -3475,7 +3475,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("import_slot") var/savefile/S = new(user.client.Import()) if(istype(S, /savefile)) - if(istype(load_character(provided = S), /savefile)) + if(load_character(provided = S)) tgui_alert_async(user, "Successfully loaded character slot.") save_character(TRUE) else From bb44b8469f3813fade983feb0fc66edf9f592c27 Mon Sep 17 00:00:00 2001 From: xTheLifex Date: Mon, 9 Sep 2024 21:03:14 -0300 Subject: [PATCH 2/4] Secrets! --- .gitmodules | 3 +++ secrets | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 secrets diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..c6e8d9e068 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "secrets"] + path = secrets + url = https://github.com/Sandstorm-Station/Sandstorm-Station-13 diff --git a/secrets b/secrets new file mode 160000 index 0000000000..2075bb65de --- /dev/null +++ b/secrets @@ -0,0 +1 @@ +Subproject commit 2075bb65dee23a302ba9bea37ec7e1858e1e002f From 507f8805c5a094f5e61db953e3edb7ffc35ae916 Mon Sep 17 00:00:00 2001 From: xTheLifex Date: Mon, 9 Sep 2024 21:08:18 -0300 Subject: [PATCH 3/4] Secrets! --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c6e8d9e068..9e9c01dcb4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "secrets"] path = secrets - url = https://github.com/Sandstorm-Station/Sandstorm-Station-13 + url = https://github.com/Sandstorm-Station/secrets From ada3d2e8f9c8ae7cc76dd15650df8d7196546c83 Mon Sep 17 00:00:00 2001 From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:34:36 -0500 Subject: [PATCH 4/4] no --- .gitmodules | 3 --- secrets | 1 - 2 files changed, 4 deletions(-) delete mode 160000 secrets diff --git a/.gitmodules b/.gitmodules index 9e9c01dcb4..e69de29bb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "secrets"] - path = secrets - url = https://github.com/Sandstorm-Station/secrets diff --git a/secrets b/secrets deleted file mode 160000 index 2075bb65de..0000000000 --- a/secrets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2075bb65dee23a302ba9bea37ec7e1858e1e002f