cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ghost hearing.

Browse Source
This commit is contained in:
Segrain
2014-12-11 08:32:27 +03:00
parent 944800eee4
commit 0fc7177894
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,30 +8,30 @@
//Does the speaker have a client? It's either random stuff that observers won't care about (Experiment 97B says, 'EHEHEHEHEHEHEHE') //Does the speaker have a client? It's either random stuff that observers won't care about (Experiment 97B says, 'EHEHEHEHEHEHEHE')
//Or someone snoring. So we make it where they won't hear it. //Or someone snoring. So we make it where they won't hear it.
return return
//make sure the air can transmit speech - hearer's side //make sure the air can transmit speech - hearer's side
var/turf/T = get_turf(src) var/turf/T = get_turf(src)
if (T) if ((T) && (!(istype(src, /mob/dead/observer)))) //Ghosts can hear even in vacuum.
var/datum/gas_mixture/environment = T.return_air() var/datum/gas_mixture/environment = T.return_air()
var/pressure = (environment)? environment.return_pressure() : 0 var/pressure = (environment)? environment.return_pressure() : 0
if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1) if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1)
return return
if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
italics = 1 italics = 1
sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact
if(sleeping || stat == 1) if(sleeping || stat == 1)
hear_sleep(message) hear_sleep(message)
return return
var/style = "body" var/style = "body"
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet. //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 (language && (language.flags & NONVERBAL))
if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src))) if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
message = stars(message) message = stars(message)
if(!say_understands(speaker,language)) if(!say_understands(speaker,language))
if(istype(speaker,/mob/living/simple_animal)) if(istype(speaker,/mob/living/simple_animal))
var/mob/living/simple_animal/S = speaker var/mob/living/simple_animal/S = speaker
@@ -89,7 +89,7 @@
if (language && (language.flags & NONVERBAL)) if (language && (language.flags & NONVERBAL))
if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src))) if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
message = stars(message) message = stars(message)
if(!say_understands(speaker,language)) if(!say_understands(speaker,language))
if(istype(speaker,/mob/living/simple_animal)) if(istype(speaker,/mob/living/simple_animal))
var/mob/living/simple_animal/S = speaker var/mob/living/simple_animal/S = speaker
@@ -173,7 +173,7 @@
/mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null) /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null)
if(!client) if(!client)
return return
if(say_understands(speaker, language)) if(say_understands(speaker, language))
message = "<B>[src]</B> [verb], \"[message]\"" message = "<B>[src]</B> [verb], \"[message]\""
else else