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

Properly merge stuff

Browse Source
This commit is contained in:
GinjaNinja32
2014-12-08 15:36:49 +00:00
parent 681a6d21ea
commit 439cbd6255
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/mob/hear_say.dm
View File

@@ -24,19 +24,12 @@
if(sleeping || stat == 1)
hear_sleep(message)
return
<<<<<<< HEAD
=======
var/style = "body"
>>>>>>> upstream/dev
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if (language && (language.flags & NONVERBAL))
if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
message = stars(message)
<<<<<<< HEAD
if(!(language && (language.flags & INNATE))) // skip understanding checks for INNATE languages
if(!say_understands(speaker,language))
if(istype(speaker,/mob/living/simple_animal))
@@ -44,18 +37,6 @@
message = pick(S.speak)
else
message = stars(message)
=======
if(!say_understands(speaker,language))
if(istype(speaker,/mob/living/simple_animal))
var/mob/living/simple_animal/S = speaker
message = pick(S.speak)
else
message = stars(message)
if(language)
style = language.colour
>>>>>>> upstream/dev
var/speaker_name = speaker.name
if(istype(speaker, /mob/living/carbon/human))