shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928

Browse Source 
[MIRROR] Removes @
This commit is contained in:
deathride58
2018-04-04 21:12:45 +00:00
committed by GitHub
parent ef7b79eea7 41a4708677
commit 8ad42c519a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/brain_damage/phobia.dm
View File

@@ -71,7 +71,7 @@
if(!owner.can_hear() || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
return message
for(var/word in trigger_words)
var/reg = regex(@"[^\l][REGEX_QUOTE(word)]*s[^\l]")
var/reg = regex("\[^\\l\][REGEX_QUOTE(word)]*s\[^\\l\]")
if(findtext(raw_message, reg))
addtimer(CALLBACK(src, .proc/freak_out, null, word), 10) //to react AFTER the chat message
break
@@ -79,7 +79,7 @@
/datum/brain_trauma/mild/phobia/on_say(message)
for(var/word in trigger_words)
var/reg = regex(@"[^\l][REGEX_QUOTE(word)]*s[^\l]")
var/reg = regex("\[^\\l\][REGEX_QUOTE(word)]*s\[^\\l\]")
if(findtext(message, reg))
to_chat(owner, "<span class='warning'>You can't bring yourself to say the word \"[word]\"!</span>")
return ""