mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-25 13:09:11 +01:00
soulcatcher patches and tgui core updaste (#17685)
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user