cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

soulcatcher patches and tgui core updaste (#17685)

Browse Source
This commit is contained in:
Kashargul
2025-05-08 21:52:11 +02:00
committed by GitHub
parent e2b6f05aac
commit 3a5908ca1d
22 changed files with 46 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer_vr.dm
+2 -2
View File
@@ -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
code/modules/mob/mob.dm
+1 -1
View File
@@ -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)
code/modules/nifsoft/software/13_soulcatcher.dm
+2 -1
View File
@@ -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"
code/modules/vore/eating/soulcatcher.dm
+1 -1
View File
@@ -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)
code/modules/vore/eating/soulcatcher_mob.dm
+1 -1
View File
@@ -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)
tgui/packages/tgui-bench/package.json
+1 -1
View File
@@ -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",
tgui/packages/tgui-panel/package.json
+1 -1
View File
@@ -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": {
tgui/packages/tgui-panel/settings/SettingTabs/SettingsGeneral.tsx
+1 -2
View File
@@ -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,
tgui/packages/tgui-panel/settings/SettingTabs/TextHighlightSettings.tsx
+3 -6
View File
@@ -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,
tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+4
View File
@@ -1482,3 +1482,7 @@ $border-width-px: $border-width * 1px;
background-color: inherit;
color: inherit;
}
.nif {
color: hsla(180, 100%, 50%, 0.801);
}
tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+4
View File
@@ -1504,3 +1504,7 @@ $border-width-px: $border-width * 1px;
background-color: inherit;
color: inherit;
}
.nif {
color: hsl(180, 100%, 27%);
}
tgui/packages/tgui-say/package.json
+1 -1
View File
@@ -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",
tgui/packages/tgui/interfaces/ColorMate/ColorMateMatrix.tsx
+1 -2
View File
@@ -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>
tgui/packages/tgui/interfaces/EntityNarrate.tsx
+1 -2
View File
@@ -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>
tgui/packages/tgui/interfaces/LawManager.tsx
+4 -10
View File
@@ -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 })
}
/>
tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorLogin.tsx
+1 -2
View File
@@ -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 && (
tgui/packages/tgui/interfaces/MessageMonitor/MessageMonitorTabs.tsx
+3 -6
View File
@@ -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>
tgui/packages/tgui/interfaces/MobSpawner.tsx
+2 -4
View File
@@ -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>
tgui/packages/tgui/interfaces/Newscaster/NewscasterNewChannel.tsx
+1 -2
View File
@@ -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">
tgui/packages/tgui/interfaces/Newscaster/NewscasterNewWanted.tsx
+2 -4
View File
@@ -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">
tgui/packages/tgui/package.json
+1 -1
View File
@@ -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": {
tgui/yarn.lock
+8 -8
View File
@@ -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