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

[MIRROR] Fixes some more trauma bugs (#6039)

Browse Source 
* Fixes some more trauma bugs (#36487)

* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm

* Fixes some more trauma bugs
This commit is contained in:
CitadelStationBot
2018-03-21 12:50:22 -05:00
committed by Poojawa
parent 962311ff0d
commit 4ad2b2975a
3 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/phobia.dm
+3 -3
View File
@@ -31,7 +31,7 @@
/datum/brain_trauma/mild/phobia/on_life()
..()
if(owner.eye_blind)
if(is_blind(owner))
return
if(world.time > next_check && world.time > next_scare)
next_check = world.time + 50
@@ -68,10 +68,10 @@
return
/datum/brain_trauma/mild/phobia/on_hear(message, speaker, message_language, raw_message, radio_freq)
if(owner.has_trait(TRAIT_DEAF) || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
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)
if(findtext(message, word))
if(findtext(raw_message, word))
addtimer(CALLBACK(src, .proc/freak_out, null, word), 10) //to react AFTER the chat message
break
return message