Adds a blue overlay to scrying orb users. Spirit realm and scrying orb users now have a special description instead of being catatonic (#18366)

* holy shit blue ghosts

* lets fix that

* you cant see it if its not in ya hand

* Their glowing red eyes are glazed over

* farie review

* farie review pt 2
This commit is contained in:
Contrabang
2022-07-23 08:50:00 -07:00
committed by GitHub
parent 18ef75f687
commit fd5580307e
4 changed files with 43 additions and 9 deletions
+1
View File
@@ -222,6 +222,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define CHANGELING_DRAIN "drain"
#define TRAIT_HULK "hulk"
#define STASIS_MUTE "stasis"
#define SCRYING "scrying" // for mobs that have ghosted, but their ghosts are allowed to return to their body outside of aghosting (spirit rune, scrying orb, etc)
#define SCRYING_ORB "scrying-orb"
#define CULT_EYES "cult_eyes"
#define DOGGO_SPACESUIT "doggo_spacesuit"
+2
View File
@@ -947,6 +947,7 @@ structure_check() searches for nearby cultist structures required for the invoca
new_human.dust()
/obj/effect/rune/manifest/proc/ghostify(mob/living/user, turf/T)
ADD_TRAIT(user, SCRYING, CULT_TRAIT)
user.add_atom_colour(RUNE_COLOR_DARKRED, ADMIN_COLOUR_PRIORITY)
user.visible_message("<span class='warning'>[user] freezes statue-still, glowing an unearthly red.</span>",
"<span class='cult'>You see what lies beyond. All is revealed. In this form you find that your voice booms above all others.</span>")
@@ -977,6 +978,7 @@ structure_check() searches for nearby cultist structures required for the invoca
CM.Remove(ghost)
V.Remove(ghost)
//GM.Remove(ghost)
REMOVE_TRAIT(user, SCRYING, CULT_TRAIT)
user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
user = null
rune_in_use = FALSE
+27 -3
View File
@@ -213,6 +213,7 @@
force = 15
hitsound = 'sound/items/welder2.ogg'
var/mob/current_owner
var/mob/dead/observer/ghost // owners ghost when active
/obj/item/scrying/Initialize(mapload)
. = ..()
@@ -245,9 +246,32 @@
current_owner.update_icons()
/obj/item/scrying/attack_self(mob/user as mob)
to_chat(user, "<span class='notice'> You can see...everything!</span>")
visible_message("<span class='danger'>[user] stares into [src], [user.p_their()] eyes glazing over.</span>")
user.ghostize(1)
if(in_use)
return
in_use = TRUE
ADD_TRAIT(user, SCRYING, SCRYING_ORB)
user.add_atom_colour(COLOR_BLUE, ADMIN_COLOUR_PRIORITY) // stolen spirit rune code
user.visible_message("<span class='notice'>[user] stares into [src], [user.p_their()] eyes glazing over.</span>",
"<span class='danger'> You stare into [src], you can see the entire universe!</span>")
ghost = user.ghostize(TRUE)
ghost.name = "Magic Spirit of [ghost.name]"
ghost.color = COLOR_BLUE
while(!QDELETED(user))
if(user.key || QDELETED(src))
user.visible_message("<span class='notice'>[user] blinks, returning to the world around [user.p_them()].</span>",
"<span class='danger'>You look away from [src].</span>")
break
if(user.get_active_hand() != src)
user.grab_ghost()
user.visible_message("<span class='notice'>[user]'s focus is forced away from [src].</span>",
"<span class='userdanger'>Your vision is ripped away from [src].</span>")
break
sleep(5)
in_use = FALSE
if(QDELETED(user))
return
user.remove_atom_colour(ADMIN_COLOUR_PRIORITY, COLOR_BLUE)
REMOVE_TRAIT(user, SCRYING, SCRYING_ORB)
/////////////////////Multiverse Blade////////////////////
GLOBAL_LIST_EMPTY(multiverse)
@@ -95,8 +95,14 @@
if(blood_DNA)
msg += "<span class='warning'>[p_they(TRUE)] [p_have()] [hand_blood_color != "#030303" ? "blood-stained":"oil-stained"] hands!</span>\n"
if("eyes")
if(iscultist(src) && HAS_TRAIT(src, CULT_EYES))
msg += "<span class='boldwarning'>[p_their(TRUE)] eyes are glowing an unnatural red!</span>\n"
if(HAS_TRAIT(src, SCRYING))
if(iscultist(src) && HAS_TRAIT(src, CULT_EYES))
msg += "<span class='boldwarning'>[p_their(TRUE)] glowing red eyes are glazed over!</span>\n"
else
msg += "<span class='boldwarning'>[p_their(TRUE)] eyes are glazed over.</span>\n"
else
if(iscultist(src) && HAS_TRAIT(src, CULT_EYES))
msg += "<span class='boldwarning'>[p_their(TRUE)] eyes are glowing an unnatural red!</span>\n"
continue
//handcuffed?
@@ -269,10 +275,11 @@
if(get_int_organ(/obj/item/organ/internal/brain))
if(dna.species.show_ssd)
if(!key)
msg += "<span class='deadsay'>[p_they(TRUE)] [p_are()] totally catatonic. The stresses of life in deep-space must have been too much for [p_them()]. Any recovery is unlikely.</span>\n"
else if(!client)
msg += "[p_they(TRUE)] [p_have()] suddenly fallen asleep, suffering from Space Sleep Disorder. [p_they(TRUE)] may wake up soon.\n"
if(!HAS_TRAIT(src, SCRYING))
if(!key)
msg += "<span class='deadsay'>[p_they(TRUE)] [p_are()] totally catatonic. The stresses of life in deep-space must have been too much for [p_them()]. Any recovery is unlikely.</span>\n"
else if(!client)
msg += "[p_they(TRUE)] [p_have()] suddenly fallen asleep, suffering from Space Sleep Disorder. [p_they(TRUE)] may wake up soon.\n"
if(decaylevel == 1)
msg += "[p_they(TRUE)] [p_are()] starting to smell.\n"