From 17b162d3baa1847e8a70eda8bd330c0bec5acca4 Mon Sep 17 00:00:00 2001
From: "johnsonmt88@gmail.com"
 <johnsonmt88@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Wed, 19 Dec 2012 23:24:57 +0000
Subject: [PATCH] You can now use # to speak over department channels. (#e
 Hello now works just like :e Hello) # was the most voted for symbol, despite
 it being in different places on british keyboard layouts and every other
 layout. The old : symbol still works with department channels.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5361 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/modules/mob/living/say.dm | 90 +++++++++++++++++-----------------
 html/changelog.html            |  7 +++
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index f0cc2eb21d6..4dbd95b2b1e 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -1,54 +1,54 @@
 
 var/list/department_radio_keys = list(
-	  ":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",
-	  ":u" = "Supply",
-	  ":g" = "changeling",
+	  ":r" = "right hand",	"#r" = "right hand",
+	  ":l" = "left hand",	"#l" = "left hand",
+	  ":i" = "intercom",	"#i" = "intercom",
+	  ":h" = "department",	"#h" = "department",
+	  ":c" = "Command",		"#c" = "Command",
+	  ":n" = "Science",		"#n" = "Science",
+	  ":m" = "Medical",		"#m" = "Medical",
+	  ":e" = "Engineering", "#e" = "Engineering",
+	  ":s" = "Security",	"#s" = "Security",
+	  ":w" = "whisper",		"#w" = "whisper",
+	  ":b" = "binary",		"#b" = "binary",
+	  ":a" = "alientalk",	"#a" = "alientalk",
+	  ":t" = "Syndicate",	"#t" = "Syndicate",
+	  ":u" = "Supply",		"#u" = "Supply",
+	  ":g" = "changeling",	"#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",
-	  ":U" = "Supply",
-	  ":G" = "changeling",
+	  ":R" = "right hand",	"#R" = "right hand",
+	  ":L" = "left hand",	"#L" = "left hand",
+	  ":I" = "intercom",	"#I" = "intercom",
+	  ":H" = "department",	"#H" = "department",
+	  ":C" = "Command",		"#C" = "Command",
+	  ":N" = "Science",		"#N" = "Science",
+	  ":M" = "Medical",		"#M" = "Medical",
+	  ":E" = "Engineering",	"#E" = "Engineering",
+	  ":S" = "Security",	"#S" = "Security",
+	  ":W" = "whisper",		"#W" = "whisper",
+	  ":B" = "binary",		"#B" = "binary",
+	  ":A" = "alientalk",	"#A" = "alientalk",
+	  ":T" = "Syndicate",	"#T" = "Syndicate",
+	  ":U" = "Supply",		"#U" = "Supply",
+	  ":G" = "changeling",	"#G" = "changeling",
 
 	  //kinda localization -- rastaf0
 	  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
-	  ":ê" = "right hand",
-	  ":ä" = "left hand",
-	  ":ø" = "intercom",
-	  ":ð" = "department",
-	  ":ñ" = "Command",
-	  ":ò" = "Science",
-	  ":ü" = "Medical",
-	  ":ó" = "Engineering",
-	  ":û" = "Security",
-	  ":ö" = "whisper",
-	  ":è" = "binary",
-	  ":ô" = "alientalk",
-	  ":å" = "Syndicate",
-	  ":é" = "Supply",
-	  ":ï" = "changeling"
+	  ":ê" = "right hand",	"#ê" = "right hand",
+	  ":ä" = "left hand",	"#ä" = "left hand",
+	  ":ø" = "intercom",	"#ø" = "intercom",
+	  ":ð" = "department",	"#ð" = "department",
+	  ":ñ" = "Command",		"#ñ" = "Command",
+	  ":ò" = "Science",		"#ò" = "Science",
+	  ":ü" = "Medical",		"#ü" = "Medical",
+	  ":ó" = "Engineering",	"#ó" = "Engineering",
+	  ":û" = "Security",	"#û" = "Security",
+	  ":ö" = "whisper",		"#ö" = "whisper",
+	  ":è" = "binary",		"#è" = "binary",
+	  ":ô" = "alientalk",	"#ô" = "alientalk",
+	  ":å" = "Syndicate",	"#å" = "Syndicate",
+	  ":é" = "Supply",		"#é" = "Supply",
+	  ":ï" = "changeling",	"#ï" = "changeling"
 )
 
 /mob/living/proc/binarycheck()
diff --git a/html/changelog.html b/html/changelog.html
index dde78695fbb..095741ccc02 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -48,6 +48,13 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">19 December 2012</h2>
+	<h3 class="author">Nodrak updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">You can now use # to speak over headset department channels. For example say "#e Hello" will say "Hello" over the engineering channel. say ":e Hello" will still work as it always has.</li>
+	</ul>
+	
 <div class="commit sansserif">
 	<h2 class="date">16 December 2012</h2>
 	<h3 class="author">Giacom updated:</h3>