Merge branch 'master' into upstream-merge-5654

This commit is contained in:
Spades
2019-03-01 05:42:07 -05:00
committed by GitHub
736 changed files with 29915 additions and 32830 deletions
+3 -3
View File
@@ -27,16 +27,16 @@
/datum/language/corticalborer/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
var/mob/living/simple_animal/borer/B
var/mob/living/simple_mob/animal/borer/B
if(istype(speaker,/mob/living/carbon))
var/mob/living/carbon/M = speaker
B = M.has_brain_worms()
else if(istype(speaker,/mob/living/simple_animal/borer))
else if(istype(speaker,/mob/living/simple_mob/animal/borer))
B = speaker
if(B)
speaker_mask = B.truename
speaker_mask = B.true_name
..(speaker,message,speaker_mask)
/datum/language/vox