From b39c990843129eecdd0ef8a5ab6bfb7e5701572c Mon Sep 17 00:00:00 2001
From: Llywelwyn <82828093+Llywelwyn@users.noreply.github.com>
Date: Thu, 28 Apr 2022 20:31:11 +0100
Subject: [PATCH] Adds notification to those with psionics when someone
enters/exits Srom + animation for Srom exit (#13600)
---
code/modules/shareddream/dream_entry.dm | 13 ++++++++++---
.../llywelwyn-srom-enterexit-announce.yml | 7 +++++++
2 files changed, 17 insertions(+), 3 deletions(-)
create mode 100644 html/changelogs/llywelwyn-srom-enterexit-announce.yml
diff --git a/code/modules/shareddream/dream_entry.dm b/code/modules/shareddream/dream_entry.dm
index 87ced599c5f..13294282582 100644
--- a/code/modules/shareddream/dream_entry.dm
+++ b/code/modules/shareddream/dream_entry.dm
@@ -19,6 +19,10 @@ var/list/dream_entries = list()
to_chat(bg, "Whilst in shared dreaming, you find it difficult to hide your secrets.")
if(willfully_sleeping)
to_chat(bg, "To wake up, use the \"Awaken\" verb in the IC tab.")
+ for(var/thing in SSpsi.processing)
+ var/datum/psi_complexus/psi = thing
+ to_chat(psi.owner, SPAN_CULT("You sense an increase in the activity of Srom..."))
+ sound_to(psi.owner, sound('sound/effects/psi/power_used.ogg'))
log_and_message_admins("has entered the shared dream", bg)
// Does NOT
else
@@ -27,7 +31,10 @@ var/list/dream_entries = list()
if(willfully_sleeping && sleeping && stat == UNCONSCIOUS)
sleeping = 5
return
- log_and_message_admins("has left the shared dream",bg)
+ for(var/thing in SSpsi.processing)
+ var/datum/psi_complexus/psi = thing
+ to_chat(psi.owner, SPAN_CULT("You feel the activity of Srom decrease."))
+ log_and_message_admins("has left the shared dream", bg)
var/mob/living/brain_ghost/old_bg = bg
bg = null
vr_mob = null
@@ -40,7 +47,7 @@ var/list/dream_entries = list()
return_text = "You are ripped from the Srom as you return to the captivity of your own mind."
return_mob.ckey = old_bg.ckey
- old_bg.show_message("[bg] fades as their connection is severed.")
- animate(old_bg, alpha=0, time = 200)
+ old_bg.visible_message("[old_bg] begins to fade as they depart from the dream...")
+ animate(old_bg, alpha=0, time = 20)
QDEL_IN(old_bg, 20)
to_chat(return_mob, SPAN_WARNING("[return_text]"))
\ No newline at end of file
diff --git a/html/changelogs/llywelwyn-srom-enterexit-announce.yml b/html/changelogs/llywelwyn-srom-enterexit-announce.yml
new file mode 100644
index 00000000000..a94b8ed5724
--- /dev/null
+++ b/html/changelogs/llywelwyn-srom-enterexit-announce.yml
@@ -0,0 +1,7 @@
+author: Llywelwyn
+
+delete-after: True
+
+changes:
+ - rscadd: "Added notifications for Skrell/antags with psionics when someone enters or exits the dream."
+ - bugfix: "Now correctly displays a chat message and fading out animation for people exiting the dream."
\ No newline at end of file