cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 00:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cuts down on pain and halloss message spam, especially from Xenobio monkeys. (#14078)

Browse Source
This commit is contained in:
Matt Atlas
2022-05-29 12:51:14 +02:00
committed by GitHub
parent e6390cf490
commit f28ada9104
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/emotes/emote_define.dm
+3 -2
View File
@@ -87,10 +87,11 @@
if(ismob(user))
var/mob/M = user
var/check_ghost_hearing = M.client ? GHOSTS_ALL_HEAR : ONLY_GHOSTS_IN_VIEW
if(message_type == AUDIBLE_MESSAGE)
M.audible_message(message = use_3p, self_message = use_1p, deaf_message = emote_message_impaired, hearing_distance = use_range)
M.audible_message(message = use_3p, self_message = use_1p, deaf_message = emote_message_impaired, hearing_distance = use_range, ghost_hearing = check_ghost_hearing)
else
M.visible_message(message = use_3p, self_message = use_1p, blind_message = emote_message_impaired, range = use_range)
M.visible_message(message = use_3p, self_message = use_1p, blind_message = emote_message_impaired, range = use_range, show_observers = FALSE)
do_extra(user, target)
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -757,7 +757,7 @@
handle_hallucinations()
if(get_shock() >= species.total_health)
if(!stat)
if(!stat && !paralysis)
to_chat(src, "<span class='warning'>[species.halloss_message_self]</span>")
src.visible_message("<B>[src]</B> [species.halloss_message]")
Paralyse(10)