From 3a5908ca1d831ef70ea7623c058ec8d5a19f6cd0 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Thu, 8 May 2025 21:52:11 +0200
Subject: [PATCH] soulcatcher patches and tgui core updaste (#17685)

---
 code/modules/mob/dead/observer/observer_vr.dm    |  4 ++--
 code/modules/mob/mob.dm                          |  2 +-
 code/modules/nifsoft/software/13_soulcatcher.dm  |  3 ++-
 code/modules/vore/eating/soulcatcher.dm          |  2 +-
 code/modules/vore/eating/soulcatcher_mob.dm      |  2 +-
 tgui/packages/tgui-bench/package.json            |  2 +-
 tgui/packages/tgui-panel/package.json            |  2 +-
 .../settings/SettingTabs/SettingsGeneral.tsx     |  3 +--
 .../SettingTabs/TextHighlightSettings.tsx        |  9 +++------
 .../tgui-panel/styles/tgchat/chat-dark.scss      |  4 ++++
 .../tgui-panel/styles/tgchat/chat-light.scss     |  4 ++++
 tgui/packages/tgui-say/package.json              |  2 +-
 .../interfaces/ColorMate/ColorMateMatrix.tsx     |  3 +--
 tgui/packages/tgui/interfaces/EntityNarrate.tsx  |  3 +--
 tgui/packages/tgui/interfaces/LawManager.tsx     | 14 ++++----------
 .../MessageMonitor/MessageMonitorLogin.tsx       |  3 +--
 .../MessageMonitor/MessageMonitorTabs.tsx        |  9 +++------
 tgui/packages/tgui/interfaces/MobSpawner.tsx     |  6 ++----
 .../Newscaster/NewscasterNewChannel.tsx          |  3 +--
 .../Newscaster/NewscasterNewWanted.tsx           |  6 ++----
 tgui/packages/tgui/package.json                  |  2 +-
 tgui/yarn.lock                                   | 16 ++++++++--------
 22 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm
index 5e78750f7d6..11da02c4d7c 100644
--- a/code/modules/mob/dead/observer/observer_vr.dm
+++ b/code/modules/mob/dead/observer/observer_vr.dm
@@ -36,13 +36,13 @@
 	var/req_time = world.time
 	nif.notify("Transient mindstate detected, analyzing...")
 	sleep(15) //So if they are typing they get interrupted by sound and message, and don't type over the box
-	var/response = tgui_alert(H,"[src] ([src.key]) wants to join into your Soulcatcher.","Soulcatcher Request",list("Deny","Allow"))
+	var/response = tgui_alert(H,"[src] ([src.key]) wants to join into your Soulcatcher.","Soulcatcher Request",list("Deny","Allow"), timeout = 1 MINUTE)
 
 	if(!response || response == "Deny")
 		to_chat(src,span_warning("[H] denied your request."))
 		return
 
-	if((world.time - req_time) > 1 MINUTES)
+	if((world.time - req_time) > 1 MINUTE)
 		to_chat(H,span_warning("The request had already expired. (1 minute waiting max)"))
 		return
 
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 633c024fb6b..702ef243b89 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -14,7 +14,7 @@
 	if(mind && mind.current == src)
 		spellremove(src)
 	if(!istype(src,/mob/observer))
-		ghostize()
+		ghostize(FALSE)
 	QDEL_NULL(soulgem) //Soulcatcher
 	QDEL_NULL(dna)
 	QDEL_NULL(plane_holder)
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index d89ef0d789e..64bd0dc5c75 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -228,7 +228,7 @@
 //Complex version for catching in-round characters
 /datum/nifsoft/soulcatcher/proc/catch_mob(var/mob/M)
 	if(!M.mind)	return
-	if(!(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_CAPTURE)) return
+	if(!(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_CAPTURE) && !isobserver(M)) return // Bypass pref check for observer join
 
 	//Create a new brain mob
 	var/mob/living/carbon/brain/caught_soul/brainmob = new(nif)
@@ -425,6 +425,7 @@
 ///////////////////
 //A projected AR soul thing
 /mob/observer/eye/ar_soul
+	invisibility = 0
 	plane = PLANE_AUGMENTED
 	icon = 'icons/obj/machines/ar_elements.dmi'
 	icon_state = "beacon"
diff --git a/code/modules/vore/eating/soulcatcher.dm b/code/modules/vore/eating/soulcatcher.dm
index 9fe9cdb5e84..f81c9a29ffb 100644
--- a/code/modules/vore/eating/soulcatcher.dm
+++ b/code/modules/vore/eating/soulcatcher.dm
@@ -35,7 +35,6 @@
 	. = ..()
 	if(ismob(loc))
 		owner = loc
-		owner.recalculate_vis()
 
 // Store the vars_to_save into the save file
 /obj/soulgem/deserialize(list/data)
@@ -43,6 +42,7 @@
 	if(apply_stored_belly(data["linked_belly"], TRUE))
 		return
 	linked_belly = null
+	owner.recalculate_vis()
 
 /obj/soulgem/proc/apply_stored_belly(var/belly_string, var/skip_unreg = FALSE)
 	for(var/obj/belly in owner.vore_organs)
diff --git a/code/modules/vore/eating/soulcatcher_mob.dm b/code/modules/vore/eating/soulcatcher_mob.dm
index 5929192c0b2..116680a92fa 100644
--- a/code/modules/vore/eating/soulcatcher_mob.dm
+++ b/code/modules/vore/eating/soulcatcher_mob.dm
@@ -156,7 +156,7 @@
 		return
 
 	if(!(gem.setting_flags & NIF_SC_PROJECTING))
-		to_chat(src, span_warning("Projecting from this NIF has been disabled!"))
+		to_chat(src, span_warning("Projecting from this soulcatcher has been disabled!"))
 		return
 
 	if(!client || !client.prefs)
diff --git a/tgui/packages/tgui-bench/package.json b/tgui/packages/tgui-bench/package.json
index b4cf4e9e654..8e5eadcbe99 100644
--- a/tgui/packages/tgui-bench/package.json
+++ b/tgui/packages/tgui-bench/package.json
@@ -11,7 +11,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "tgui": "workspace:*",
-    "tgui-core": "^3.1.3"
+    "tgui-core": "^3.1.4"
   },
   "devDependencies": {
     "@types/react": "^19.1.0",
diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json
index 8ac289002a9..d014f0a2b3d 100644
--- a/tgui/packages/tgui-panel/package.json
+++ b/tgui/packages/tgui-panel/package.json
@@ -8,7 +8,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "tgui": "workspace:*",
-    "tgui-core": "^3.1.3",
+    "tgui-core": "^3.1.4",
     "tgui-dev-server": "workspace:*"
   },
   "devDependencies": {
diff --git a/tgui/packages/tgui-panel/settings/SettingTabs/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingTabs/SettingsGeneral.tsx
index 30876e73c89..91e547aad65 100644
--- a/tgui/packages/tgui-panel/settings/SettingTabs/SettingsGeneral.tsx
+++ b/tgui/packages/tgui-panel/settings/SettingTabs/SettingsGeneral.tsx
@@ -183,12 +183,11 @@ export const SettingsGeneral = (props) => {
           <Box inline>
             <ColorBox mr={1} color={interleaveColor} />
             <Input
-              expensive
               width="5em"
               monospace
               placeholder="#ffffff"
               value={interleaveColor}
-              onChange={(value) =>
+              onBlur={(value) =>
                 dispatch(
                   updateSettings({
                     interleaveColor: value,
diff --git a/tgui/packages/tgui-panel/settings/SettingTabs/TextHighlightSettings.tsx b/tgui/packages/tgui-panel/settings/SettingTabs/TextHighlightSettings.tsx
index 51e21634521..9c90f80c8a5 100644
--- a/tgui/packages/tgui-panel/settings/SettingTabs/TextHighlightSettings.tsx
+++ b/tgui/packages/tgui-panel/settings/SettingTabs/TextHighlightSettings.tsx
@@ -165,12 +165,11 @@ const TextHighlightSetting = (props) => {
         <Stack.Item shrink={0}>
           <ColorBox mr={1} color={highlightColor} />
           <Input
-            expensive
             width="5em"
             monospace
             placeholder="#ffffff"
             value={highlightColor}
-            onChange={(value) =>
+            onBlur={(value) =>
               dispatch(
                 updateHighlightSetting({
                   id: id,
@@ -183,11 +182,10 @@ const TextHighlightSetting = (props) => {
       </Stack>
       <TextArea
         fluid
-        expensive
         height="3em"
         value={highlightText}
         placeholder="Put words to highlight here. Separate terms with commas, i.e. (term1, term2, term3)"
-        onChange={(value) =>
+        onBlur={(value) =>
           dispatch(
             updateHighlightSetting({
               id: id,
@@ -199,11 +197,10 @@ const TextHighlightSetting = (props) => {
       {!!highlightBlacklist && (
         <TextArea
           fluid
-          expensive
           height="3em"
           value={blacklistText}
           placeholder="Put names of senders you don't want highlighted here. Separate names with commas, i.e. (name1, name2, name3)"
-          onChange={(value) =>
+          onBlur={(value) =>
             dispatch(
               updateHighlightSetting({
                 id: id,
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 37551beddf9..73386ab9b45 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -1482,3 +1482,7 @@ $border-width-px: $border-width * 1px;
   background-color: inherit;
   color: inherit;
 }
+
+.nif {
+  color: hsla(180, 100%, 50%, 0.801);
+}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index 5b729ea0063..0da8dcfbebb 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -1504,3 +1504,7 @@ $border-width-px: $border-width * 1px;
   background-color: inherit;
   color: inherit;
 }
+
+.nif {
+  color: hsl(180, 100%, 27%);
+}
diff --git a/tgui/packages/tgui-say/package.json b/tgui/packages/tgui-say/package.json
index 934c11621aa..1570d22290a 100644
--- a/tgui/packages/tgui-say/package.json
+++ b/tgui/packages/tgui-say/package.json
@@ -7,7 +7,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "tgui": "workspace:*",
-    "tgui-core": "^3.1.3"
+    "tgui-core": "^3.1.4"
   },
   "devDependencies": {
     "@types/react": "^19.1.0",
diff --git a/tgui/packages/tgui/interfaces/ColorMate/ColorMateMatrix.tsx b/tgui/packages/tgui/interfaces/ColorMate/ColorMateMatrix.tsx
index 5b7829b8f5b..c6fcf25ac24 100644
--- a/tgui/packages/tgui/interfaces/ColorMate/ColorMateMatrix.tsx
+++ b/tgui/packages/tgui/interfaces/ColorMate/ColorMateMatrix.tsx
@@ -243,10 +243,9 @@ export const ColorMateMatrix = (props) => {
         <LabeledList>
           <LabeledList.Item label="Config">
             <Input
-              expensive
               fluid
               value={Object.values(matrixcolors).toString()}
-              onChange={(value: string) => act('set_matrix_string', { value })}
+              onBlur={(value: string) => act('set_matrix_string', { value })}
             />
           </LabeledList.Item>
         </LabeledList>
diff --git a/tgui/packages/tgui/interfaces/EntityNarrate.tsx b/tgui/packages/tgui/interfaces/EntityNarrate.tsx
index 0d0f6330a34..fdad6fbd6d5 100644
--- a/tgui/packages/tgui/interfaces/EntityNarrate.tsx
+++ b/tgui/packages/tgui/interfaces/EntityNarrate.tsx
@@ -184,9 +184,8 @@ export const NarrationInput = (props) => {
       <Stack>
         <Stack.Item width="85%">
           <TextArea
-            expensive
             height={'18rem'}
-            onChange={(val) => setNarration(val)}
+            onBlur={(val) => setNarration(val)}
             value={narration || ''}
           />
         </Stack.Item>
diff --git a/tgui/packages/tgui/interfaces/LawManager.tsx b/tgui/packages/tgui/interfaces/LawManager.tsx
index 5df57de9945..3cc81dfe44b 100644
--- a/tgui/packages/tgui/interfaces/LawManager.tsx
+++ b/tgui/packages/tgui/interfaces/LawManager.tsx
@@ -294,10 +294,9 @@ export const LawManagerLaws = (props: {
                 <Table.Cell collapsing>Zero</Table.Cell>
                 <Table.Cell>
                   <Input
-                    expensive
                     value={zeroth_law}
                     fluid
-                    onChange={(val: string) =>
+                    onBlur={(val: string) =>
                       act('change_zeroth_law', { val: val })
                     }
                   />
@@ -316,12 +315,9 @@ export const LawManagerLaws = (props: {
               <Table.Cell collapsing>Ion</Table.Cell>
               <Table.Cell>
                 <Input
-                  expensive
                   value={ion_law}
                   fluid
-                  onChange={(val: string) =>
-                    act('change_ion_law', { val: val })
-                  }
+                  onBlur={(val: string) => act('change_ion_law', { val: val })}
                 />
               </Table.Cell>
               <Table.Cell>N/A</Table.Cell>
@@ -335,10 +331,9 @@ export const LawManagerLaws = (props: {
               <Table.Cell>Inherent</Table.Cell>
               <Table.Cell>
                 <Input
-                  expensive
                   value={inherent_law}
                   fluid
-                  onChange={(val: string) =>
+                  onBlur={(val: string) =>
                     act('change_inherent_law', { val: val })
                   }
                 />
@@ -354,10 +349,9 @@ export const LawManagerLaws = (props: {
               <Table.Cell>Supplied</Table.Cell>
               <Table.Cell>
                 <Input
-                  expensive
                   value={supplied_law}
                   fluid
-                  onChange={(val: string) =>
+                  onBlur={(val: string) =>
                     act('change_supplied_law', { val: val })
                   }
                 />
diff --git a/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorLogin.tsx b/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorLogin.tsx
index d1ef5968c2b..cece1fafb0a 100644
--- a/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorLogin.tsx
+++ b/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorLogin.tsx
@@ -23,10 +23,9 @@ export const MessageMonitorLogin = (props) => {
       <Box color="label" my="1rem">
         Decryption Key:
         <Input
-          expensive
           placeholder="Decryption Key"
           ml="0.5rem"
-          onChange={(val) => act('auth', { key: val })}
+          onBlur={(val) => act('auth', { key: val })}
         />
       </Box>
       {!!isMalfAI && (
diff --git a/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorTabs.tsx b/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorTabs.tsx
index fa33c354932..3f91f009b7b 100644
--- a/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorTabs.tsx
+++ b/tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorTabs.tsx
@@ -160,17 +160,15 @@ export const MessageMonitorAdmin = (props) => {
         <LabeledList.Item label="Sender">
           <Input
             fluid
-            expensive
             value={customsender}
-            onChange={(val) => act('set_sender', { val: val })}
+            onBlur={(val) => act('set_sender', { val: val })}
           />
         </LabeledList.Item>
         <LabeledList.Item label="Sender's Job">
           <Input
             fluid
-            expensive
             value={customjob}
-            onChange={(val) => act('set_sender_job', { val: val })}
+            onBlur={(val) => act('set_sender_job', { val: val })}
           />
         </LabeledList.Item>
         <LabeledList.Item label="Recipient">
@@ -191,9 +189,8 @@ export const MessageMonitorAdmin = (props) => {
           <Input
             fluid
             mb={0.5}
-            expensive
             value={custommessage}
-            onChange={(val: string) => act('set_message', { val: val })}
+            onBlur={(val: string) => act('set_message', { val: val })}
           />
         </LabeledList.Item>
       </LabeledList>
diff --git a/tgui/packages/tgui/interfaces/MobSpawner.tsx b/tgui/packages/tgui/interfaces/MobSpawner.tsx
index 7fb53170323..da011add285 100644
--- a/tgui/packages/tgui/interfaces/MobSpawner.tsx
+++ b/tgui/packages/tgui/interfaces/MobSpawner.tsx
@@ -365,8 +365,7 @@ const GeneralMobSettings = (props: {
             <TextArea
               fluid
               height={'18rem'}
-              expensive
-              onChange={(val: string) => props.onDesc(val)}
+              onBlur={(val: string) => props.onDesc(val)}
               value={data.desc}
             />
           </Stack.Item>
@@ -376,9 +375,8 @@ const GeneralMobSettings = (props: {
             <TextArea
               fluid
               height={'18rem'}
-              expensive
               value={data.flavor_text}
-              onChange={(val: string) => props.onFlavor(val)}
+              onBlur={(val: string) => props.onFlavor(val)}
             />
           </Stack.Item>
         </Stack>
diff --git a/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewChannel.tsx b/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewChannel.tsx
index e53b7221816..976a8cd5707 100644
--- a/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewChannel.tsx
+++ b/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewChannel.tsx
@@ -25,9 +25,8 @@ export const NewscasterNewChannel = (props: { setScreen: Function }) => {
         <LabeledList.Item label="Channel Name">
           <Input
             fluid
-            expensive
             value={decodeHtmlEntities(channel_name)}
-            onChange={(val: string) => act('set_channel_name', { val: val })}
+            onBlur={(val: string) => act('set_channel_name', { val: val })}
           />
         </LabeledList.Item>
         <LabeledList.Item label="Channel Author" color="good">
diff --git a/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewWanted.tsx b/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewWanted.tsx
index 82095664a29..83c3bd47b54 100644
--- a/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewWanted.tsx
+++ b/tgui/packages/tgui/interfaces/Newscaster/NewscasterNewWanted.tsx
@@ -31,17 +31,15 @@ export const NewscasterNewWanted = (props: { setScreen: Function }) => {
         <LabeledList.Item label="Criminal Name">
           <Input
             fluid
-            expensive
             value={decodeHtmlEntities(channel_name)}
-            onChange={(val) => act('set_channel_name', { val: val })}
+            onBlur={(val) => act('set_channel_name', { val: val })}
           />
         </LabeledList.Item>
         <LabeledList.Item label="Description">
           <Input
             fluid
-            expensive
             value={decodeHtmlEntities(msg)}
-            onChange={(val) => act('set_wanted_desc', { val: val })}
+            onBlur={(val) => act('set_wanted_desc', { val: val })}
           />
         </LabeledList.Item>
         <LabeledList.Item label="Attach Photo">
diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index 2741c1ed88b..890a601690c 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -14,7 +14,7 @@
     "marked": "^4.3.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "tgui-core": "^3.1.3",
+    "tgui-core": "^3.1.4",
     "tgui-dev-server": "workspace:*"
   },
   "devDependencies": {
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index 2746afb9874..f1baa8a35e4 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -19904,19 +19904,19 @@ __metadata:
     react: "npm:^19.1.0"
     react-dom: "npm:^19.1.0"
     tgui: "workspace:*"
-    tgui-core: "npm:^3.1.3"
+    tgui-core: "npm:^3.1.4"
   languageName: unknown
   linkType: soft
 
-"tgui-core@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "tgui-core@npm:3.1.3"
+"tgui-core@npm:^3.1.4":
+  version: 3.1.4
+  resolution: "tgui-core@npm:3.1.4"
   dependencies:
     "@floating-ui/react": "npm:^0.27.6"
   peerDependencies:
     react: ^19.1.0
     react-dom: ^19.1.0
-  checksum: 10c0/97113ac453bb1f41aaca55bcebef3f73398f1e8cf7381fe3e8e47b57e71fb750c74784bf8d2d65b39636692eff98efff3eb7f89cab4bcd3aa19e2031a6a7b376
+  checksum: 10c0/1f0caef121de74275c08dceef926d4d1e6260eaee32cbe1ee5614456d339de4c887ce13b7b2774674feba37b56bd99204519d3eadcc57b0df3f172aa37644704
   languageName: node
   linkType: hard
 
@@ -19944,7 +19944,7 @@ __metadata:
     react: "npm:^19.1.0"
     react-dom: "npm:^19.1.0"
     tgui: "workspace:*"
-    tgui-core: "npm:^3.1.3"
+    tgui-core: "npm:^3.1.4"
     tgui-dev-server: "workspace:*"
   languageName: unknown
   linkType: soft
@@ -19959,7 +19959,7 @@ __metadata:
     react: "npm:^19.1.0"
     react-dom: "npm:^19.1.0"
     tgui: "workspace:*"
-    tgui-core: "npm:^3.1.3"
+    tgui-core: "npm:^3.1.4"
     vitest: "npm:^3.1.1"
   languageName: unknown
   linkType: soft
@@ -20021,7 +20021,7 @@ __metadata:
     marked: "npm:^4.3.0"
     react: "npm:^19.1.0"
     react-dom: "npm:^19.1.0"
-    tgui-core: "npm:^3.1.3"
+    tgui-core: "npm:^3.1.4"
     tgui-dev-server: "workspace:*"
     vitest: "npm:^3.1.1"
   languageName: unknown