Merge pull request #17 from Duck-/master

Removes autoheal + fixes tcomms broadcast
This commit is contained in:
SoundScopes
2015-01-22 23:02:11 +00:00
4 changed files with 33 additions and 13 deletions
+9 -5
View File
@@ -71,9 +71,13 @@
return
var/track = null
var/speaker_name
var/style = "body"
if(!language)
language = new /datum/language/common
// if(!speaker)
//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)))
@@ -94,13 +98,13 @@
if(hard_to_hear)
message = stars(message)
var/speaker_name = speaker.name
if(speaker)
speaker_name = speaker.name
if(vname)
speaker_name = vname
if(istype(speaker, /mob/living/carbon/human))
if(speaker && (istype(speaker, /mob/living/carbon/human)))
var/mob/living/carbon/human/H = speaker
if(H.voice)
speaker_name = H.voice
@@ -114,7 +118,7 @@
var/jobname // the mob's "job"
var/mob/living/carbon/human/impersonating //The crewmember being impersonated, if any.
if (ishuman(speaker))
if (speaker && (ishuman(speaker)))
var/mob/living/carbon/human/H = speaker
if((H.wear_id && istype(H.wear_id,/obj/item/weapon/card/id/syndicate)) && (H.wear_mask && istype(H.wear_mask,/obj/item/clothing/mask/gas/voice)))