From a6f732c680338377264064772d575053ee1df842 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Fri, 26 Jan 2024 15:01:12 -0500
Subject: [PATCH] Deadchat no longer gets notified about tutorial facehuggers
(#5546)
# About the pull request
Deadchat will no longer get notified about any facehugs inside a
tutorial area.
This is the best solution I can think to this problem, an alternative
being checking the hive of the facehugger and canceling based on that.
Recommendations are welcome.
# Explain why it's good for the game
Tutorials are irrelevent to the main game, and players shouldnt be
notified that someone is using the tutorial system.
# Testing Photographs and Procedure
Screenshots & Videos
![image](https://github.com/cmss13-devs/cmss13/assets/91113370/755baecd-b727-4105-ae4b-32c17aa510ff)
No dchat message.
# Changelog
:cl:
fix: Dchat is no longer notified of hugs from tutorials
/:cl:
---
.../mob/living/carbon/xenomorph/Facehuggers.dm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
index c23b320618f5..df272387f001 100644
--- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
@@ -283,12 +283,14 @@
var/area/hug_area = get_area(src)
var/name = hugger ? "[hugger]" : "\a [src]"
- if(hug_area)
- notify_ghosts(header = "Hugged", message = "[human] has been hugged by [name] at [hug_area]!", source = human, action = NOTIFY_ORBIT)
- to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [name] at \the [hug_area]"))
- else
- notify_ghosts(header = "Hugged", message = "[human] has been hugged by [name]!", source = human, action = NOTIFY_ORBIT)
- to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [name]"))
+ if(hivenumber != XENO_HIVE_TUTORIAL) // prevent hugs from any tutorial huggers from showing up in dchat
+ if(hug_area)
+ notify_ghosts(header = "Hugged", message = "[human] has been hugged by [name] at [hug_area]!", source = human, action = NOTIFY_ORBIT)
+ to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [name] at \the [hug_area]"))
+ else
+ notify_ghosts(header = "Hugged", message = "[human] has been hugged by [name]!", source = human, action = NOTIFY_ORBIT)
+ to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [name]"))
+
if(hug_area)
xeno_message(SPAN_XENOMINORWARNING("We sense that [name] has facehugged a host at \the [hug_area]!"), 1, hivenumber)
else