cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

spells don't trigger spam (#19477)

Browse Source
This commit is contained in:
ynot01
2023-07-01 22:08:14 -04:00
committed by GitHub
parent 337c2e7686
commit 5a9c73b233
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/antagonists/clockcult/clock_helpers/ratvarian_language.dm
View File

@@ -104,8 +104,8 @@ List of nuances:
if(isliving(AM)) if(isliving(AM))
var/mob/living/L = AM var/mob/living/L = AM
if(!whisper) if(!whisper)
L.say(message, "clock", spans, language=/datum/language/common, ignore_spam = TRUE) L.say(message, "clock", spans, language=/datum/language/common, ignore_spam = TRUE, forced="clockwork_say")
else else
L.whisper(message, "clock", spans, language=/datum/language/common) L.whisper(message, "clock", spans, language=/datum/language/common, ignore_spam = TRUE, forced="clockwork_say")
else else
AM.say(message, language=/datum/language/common) AM.say(message, language=/datum/language/common, ignore_spam = TRUE, forced="clockwork_say")

2
code/modules/clothing/suits/wiz_robe.dm
View File

@@ -176,7 +176,7 @@
to_chat(usr, span_warning("\The [src]'s internal magic supply is still recharging!")) // Yogs -- text macro fix to_chat(usr, span_warning("\The [src]'s internal magic supply is still recharging!")) // Yogs -- text macro fix
return return
usr.say("Rise, my creation! Off your page into this realm!", forced = "stickman summoning") usr.say("Rise, my creation! Off your page into this realm!", ignore_spam = TRUE, forced = "stickman summoning")
playsound(src.loc, 'sound/magic/summon_magic.ogg', 50, 1, 1) playsound(src.loc, 'sound/magic/summon_magic.ogg', 50, 1, 1)
var/mob/living/M = new /mob/living/simple_animal/hostile/stickman(get_turf(usr)) var/mob/living/M = new /mob/living/simple_animal/hostile/stickman(get_turf(usr))
var/list/factions = usr.faction var/list/factions = usr.faction

8
code/modules/spells/spell.dm
View File

@@ -344,15 +344,15 @@
switch(invocation_type) switch(invocation_type)
if(INVOCATION_SHOUT) if(INVOCATION_SHOUT)
if(prob(50)) if(prob(50))
owner.say(invocation, forced = "spell ([src])") owner.say(invocation, ignore_spam = TRUE, forced = "spell ([src])")
else else
owner.say(replacetext(invocation," ","`"), forced = "spell ([src])") owner.say(replacetext(invocation," ","`"), ignore_spam = TRUE, forced = "spell ([src])")
if(INVOCATION_WHISPER) if(INVOCATION_WHISPER)
if(prob(50)) if(prob(50))
owner.whisper(invocation, forced = "spell ([src])") owner.whisper(invocation, ignore_spam = TRUE, forced = "spell ([src])")
else else
owner.whisper(replacetext(invocation," ","`"), forced = "spell ([src])") owner.whisper(replacetext(invocation," ","`"), ignore_spam = TRUE, forced = "spell ([src])")
if(INVOCATION_EMOTE) if(INVOCATION_EMOTE)
owner.visible_message(invocation, invocation_self_message) owner.visible_message(invocation, invocation_self_message)