Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix

Grey Update

code/modules/mob/language.dm

@@ -276,6 +276,24 @@
 	flags = RESTRICTED | WHITELISTED
 	syllables = list("blob","plop","pop","bop","boop")
 
+/datum/language/grey
+	name = "Psionic Communication"
+	desc = "The grey's psionic communication, less potent version of their distant cousin's telepathy. Talk to other greys within a limited radius."
+	speech_verb = "expresses"
+	ask_verb = "inquires"
+	exclaim_verb = "imparts"
+	colour = "abductor"
+	key = "^"
+	flags = RESTRICTED | HIVEMIND
+
+/datum/language/grey/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+	..(speaker,message,speaker.real_name)
+
+/datum/language/grey/check_special_condition(var/mob/living/carbon/human/other, var/mob/living/carbon/human/speaker)
+	if(other in range(7, speaker))
+		return 1
+	return 0
+
 /datum/language/drask
 	name = "Orluum"
 	desc = "The droning, vibrous language of the Drask. It sounds somewhat like whalesong."

code/modules/mob/living/carbon/human/species/station.dm

@@ -692,7 +692,7 @@
 	icobase = 'icons/mob/human_races/r_grey.dmi'
 	deform = 'icons/mob/human_races/r_def_grey.dmi'
 	default_language = "Galactic Common"
-	//language = "Grey" // Perhaps if they ever get a hivemind
+	language = "Psionic Communication"
 	unarmed_type = /datum/unarmed_attack/punch
 	darksight = 5 // BOOSTED from 2
 	eyes = "grey_eyes_s"
@@ -703,7 +703,7 @@
 		"lungs" =    /obj/item/organ/internal/lungs,
 		"liver" =    /obj/item/organ/internal/liver/grey,
 		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"brain" =    /obj/item/organ/internal/brain/grey,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes,
 		)
@@ -728,8 +728,6 @@
 		C.dna.SetSEState(REMOTETALKBLOCK,0,1)
 		C.mutations -= REMOTE_TALK
 		genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
-	C.mutations.Add(GREY)
-	C.update_mutations()
 	..()
 
 /datum/species/diona

code/modules/mob/living/say.dm

@@ -94,10 +94,7 @@ proc/get_radio_key_from_channel(var/channel)
 		verb = "stammers"
 		speech_problem_flag = 1
 
-	if(GREY in mutations)
-		message = "<span class='grey'>[message]</span>"
-
-	else if(COMIC in mutations)
+	if(COMIC in mutations)
 		message = "<span class='sans'>[message]</span>"
 
 	if(!IsVocal())