Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/machinery/computer/crew.dm
This commit is contained in:
PsiOmega
2014-12-11 08:18:58 +01:00
3 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
//make sure the air can transmit speech - hearer's side
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/pressure = (environment)? environment.return_pressure() : 0
if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1)