From 568480f190e9bbc7b0cf5fe41d6ee257930015a3 Mon Sep 17 00:00:00 2001
From: ariaworld <143797359+ariaworld@users.noreply.github.com>
Date: Sun, 15 Sep 2024 02:04:30 +0200
Subject: [PATCH] Merge remote-tracking branch

---
 .gitmodules                        | 0
 code/modules/client/preferences.dm | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .gitmodules

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index ad20381a1e..d83286aa9d 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -4073,7 +4073,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