Merge pull request #613 from SkyMarshal/master

Map update, CE now knows wire colors, added some old BS12 stuff (AI upload sprite, warning stripes), complete mute can still be adminhelped, removed gooncode in hallucinations, fixed the poweroffline event, fixed Tajspeak, fixed the blob, fixed overdoses

code/WorkInProgress/Cael_Aislinn/Tajara/say.dm

@@ -83,7 +83,7 @@
 		return
 
 	// Mute disability
-	if (sdisabilities & 2)
+	if (disabilities & 64)
 		return
 
 	if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
@@ -116,22 +116,39 @@
 		var/channel_prefix = copytext(message, 1, 3)
 
 		var/list/keys = list(
-			  ":r" = "right ear",
-			  ":l" = "left ear",
-			  ":i" = "intercom",
-			  ":h" = "department",
-			  ":c" = "Command",
-			  ":n" = "Science",
-			  ":m" = "Medical",
-			  ":e" = "Engineering",
-			  ":s" = "Security",
-			  ":w" = "whisper",
-			  ":b" = "binary",
-			  ":a" = "alientalk",
-			  ":t" = "Syndicate",
-			  ":d" = "Mining",
-			  ":q" = "Cargo",
-			  ":g" = "changeling",
+			":r" = "right ear",
+			":l" = "left ear",
+			":i" = "intercom",
+			":h" = "department",
+			":c" = "Command",
+			":n" = "Science",
+			":m" = "Medical",
+			":e" = "Engineering",
+			":s" = "Security",
+			":w" = "whisper",
+			":b" = "binary",
+			":a" = "alientalk",
+			":t" = "Syndicate",
+			":d" = "Mining",
+			":q" = "Cargo",
+			":g" = "changeling",
+
+			":R" = "right hand",
+			":L" = "left hand",
+			":I" = "intercom",
+			":H" = "department",
+			":C" = "Command",
+			":N" = "Science",
+			":M" = "Medical",
+			":E" = "Engineering",
+			":S" = "Security",
+			":W" = "whisper",
+			":B" = "binary",
+			":A" = "alientalk",
+			":T" = "Syndicate",
+			":D" = "Mining",
+			":Q" = "Cargo",
+			":G" = "changeling",
 
 			  //kinda localization -- rastaf0
 			  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
@@ -165,15 +182,15 @@
 
 	//work out if we're speaking tajaran or not
 	var/is_speaking_taj = 0
-	if(copytext(message, 1, 4) == ":j ")
-		message = copytext(message, 4)
+	if(copytext(message, 1, 3) == ":j" || copytext(message, 1, 3) == ":J")
+		message = copytext(message, 3)
 		if(taj_talk_understand)
 			is_speaking_taj = 1
 
 	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
 		message_mode = "whisper"
 
-	if(src.stunned > 0 && (!(traumatic_shock > 61) && prob(50)))
+	if(src.stunned > 0 || (!(traumatic_shock > 61) && prob(50)))
 		message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
 
 
@@ -348,6 +365,10 @@
 			if (M.client && M.client.ghost_ears)
 				listening|=M
 
+	var/list/eavesdroppers = get_mobs_in_view(7, src)
+	for(var/mob/M in listening)
+		eavesdroppers.Remove(M)
+
 	for (var/obj/O in ((W | contents)-used_radios))
 		W |= O
 
@@ -515,3 +536,10 @@
 			sleep(11)
 			del(B)
 		*/
+
+	if (length(eavesdroppers))
+
+		for (var/mob/M in eavesdroppers)
+			M << "\blue [src] speaks into their radio..."
+			M << speech_bubble
+		spawn(30) del(speech_bubble)

code/WorkInProgress/Cael_Aislinn/Tajara/whisper.dm

@@ -22,7 +22,7 @@
 		var/mob/living/carbon/human/H = src
 		alt_name = " (as [H.get_visible_name()])"
 	// Mute disability
-	if (src.sdisabilities & 2)
+	if (src.disabilities & 64)
 		return
 
 	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))