From 68ae666b2193c5d803c5926fc45a304762cbf43a Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sat, 30 Aug 2025 04:38:25 +0200
Subject: [PATCH] cleans up the storage  defines properly (#18373)

* cleans up the storage  defines properly

* fix that shit

* .
---
 code/modules/xenoarcheaology/effect_master.dm       | 10 ++++++----
 tgui/packages/common/storage.ts                     | 13 ++++---------
 .../PreferencesMenu/CharacterPreferenceWindow.tsx   |  8 +++++++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm
index 6554264dac5..7ff08790323 100644
--- a/code/modules/xenoarcheaology/effect_master.dm
+++ b/code/modules/xenoarcheaology/effect_master.dm
@@ -270,8 +270,9 @@ var/list/toxic_reagents = list(TOXIN_PATH)
 	var/atom/bumped = args[2]
 	var/warn = FALSE
 	for(var/datum/artifact_effect/my_effect in my_effects)
-		if(istype(bumped,/obj))
-			if(bumped:throwforce >= 10)
+		if(isitem(bumped))
+			var/obj/item/bumped_item = bumped
+			if(bumped_item.throwforce >= 10)
 				if(my_effect.trigger == TRIGGER_FORCE)
 					my_effect.ToggleActivate()
 
@@ -293,8 +294,9 @@ var/list/toxic_reagents = list(TOXIN_PATH)
 	var/atom/movable/M = args[2]
 	var/warn = FALSE
 	for(var/datum/artifact_effect/my_effect in my_effects)
-		if(istype(M,/obj))
-			if(M:throwforce >= 10)
+		if(isitem(M))
+			var/obj/item/bumped_item = M
+			if(bumped_item.throwforce >= 10)
 				if(my_effect.trigger == TRIGGER_FORCE)
 					my_effect.ToggleActivate()
 
diff --git a/tgui/packages/common/storage.ts b/tgui/packages/common/storage.ts
index ba3e28c08b6..b4d94c9f0ad 100644
--- a/tgui/packages/common/storage.ts
+++ b/tgui/packages/common/storage.ts
@@ -11,12 +11,7 @@ export const IMPL_HUB_STORAGE = 1;
 
 type StorageImplementation = typeof IMPL_MEMORY | typeof IMPL_HUB_STORAGE;
 
-const INDEXED_DB_VERSION = 1;
-const INDEXED_DB_NAME = 'virgo';
-const INDEXED_DB_STORE_NAME = 'storage-v1';
-
-const READ_ONLY = 'readonly';
-const READ_WRITE = 'readwrite';
+const KEY_NAME = 'virgo';
 
 type StorageBackend = {
   impl: StorageImplementation;
@@ -46,7 +41,7 @@ class HubStorageBackend implements StorageBackend {
   }
 
   async get(key: string): Promise<any> {
-    const value = await window.hubStorage.getItem(`virgo-${key}`);
+    const value = await window.hubStorage.getItem(`${KEY_NAME}-${key}`);
     if (typeof value === 'string') {
       return JSON.parse(value);
     }
@@ -54,11 +49,11 @@ class HubStorageBackend implements StorageBackend {
   }
 
   async set(key: string, value: any): Promise<void> {
-    window.hubStorage.setItem(`virgo-${key}`, JSON.stringify(value));
+    window.hubStorage.setItem(`${KEY_NAME}-${key}`, JSON.stringify(value));
   }
 
   async remove(key: string): Promise<void> {
-    window.hubStorage.removeItem(`virgo-${key}`);
+    window.hubStorage.removeItem(`${KEY_NAME}-${key}`);
   }
 
   async clear(): Promise<void> {
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx
index e48bc426799..cb72cf858f9 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferenceWindow.tsx
@@ -78,7 +78,13 @@ export const CharacterPreferenceWindow = (props) => {
                     {category}
                   </Button>
                 ))}
-                <Button onClick={() => act('game_prefs')}>Game Options</Button>
+                <Button.Confirm
+                  onClick={() => act('game_prefs')}
+                  tooltip="Switches to Game Options, make sure your character is saved before switching."
+                  confirmContent="Confirm? (Discard Unsaved)"
+                >
+                  Game Options
+                </Button.Confirm>
               </Box>
               <Box position="absolute" top={0} right={0}>
                 <Button