Renamed Cargo radio to Supply radio

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5266 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/communications.dm

@@ -106,11 +106,10 @@ var/list/radiochannels = list(
 	"Security" = 1359,
 	"Deathsquad" = 1441,
 	"Syndicate" = 1213,
-	"Mining" = 1349,
-	"Cargo" = 1347,
+	"Supply" = 1347,
 )
 //depenging helpers
-var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1349,1347)
+var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1347)
 var/const/COMM_FREQ = 1353 //command, colored gold in chat window
 var/const/SYND_FREQ = 1213
 

code/game/machinery/telecomms/broadcaster.dm

@@ -344,7 +344,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 //			if(1349)
 //				freq_text = "Mining"
 			if(1347)
-				freq_text = "Cargo"
+				freq_text = "Supply"
 		//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
 
 
@@ -616,7 +616,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 //			if(1349)
 //				freq_text = "Mining"
 			if(1347)
-				freq_text = "Cargo"
+				freq_text = "Supply"
 		//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
 
 

code/game/machinery/telecomms/presets.dm

@@ -30,7 +30,7 @@
 	id = "Hub"
 	network = "tcommsat"
 	autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical",
-	"cargo", "common", "command", "engineering", "security",
+	"supply", "common", "command", "engineering", "security",
 	"receiverA", "receiverB", "broadcasterA", "broadcasterB")
 
 //Receivers
@@ -41,7 +41,7 @@
 	id = "Receiver A"
 	network = "tcommsat"
 	autolinkers = list("receiverA") // link to relay
-	freq_listening = list(1351, 1355, 1347) // science, medical, cargo
+	freq_listening = list(1351, 1355, 1347) // science, medical, supply
 
 
 //--PRESET RIGHT--//
@@ -71,7 +71,7 @@
 	id = "Bus 2"
 	network = "tcommsat"
 	freq_listening = list(1347)
-	autolinkers = list("processor2", "cargo")
+	autolinkers = list("processor2", "supply")
 
 /obj/machinery/telecomms/bus/preset_three
 	id = "Bus 3"
@@ -128,10 +128,10 @@
 	freq_listening = list(1355)
 	autolinkers = list("medical")
 
-/obj/machinery/telecomms/server/presets/cargo
-	id = "Cargo Server"
+/obj/machinery/telecomms/server/presets/supply
+	id = "Supply Server"
 	freq_listening = list(1347)
-	autolinkers = list("cargo")
+	autolinkers = list("supply")
 /*
 /obj/machinery/telecomms/server/presets/mining
 	id = "Mining Server"

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -72,7 +72,7 @@
 	name = "Captain's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cap_cypherkey"
-	channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Cargo" = 0)
+	channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Supply" = 0)
 
 /obj/item/device/encryptionkey/heads/rd
 	name = "Research Director's Encryption Key"
@@ -102,7 +102,7 @@
 	name = "Head of Personnel's Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "hop_cypherkey"
-	channels = list("Command" = 1, "Security" = 0, "Cargo" = 1)
+	channels = list("Command" = 1, "Supply" = 1, "Security" = 0)
 /*
 /obj/item/device/encryptionkey/headset_mine
 	name = "Mining Radio Encryption Key"
@@ -120,4 +120,4 @@
 	name = "Cargo Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "cargo_cypherkey"
-	channels = list("Cargo" = 1)
+	channels = list("Supply" = 1)

code/game/objects/items/devices/radio/radio.dm

@@ -477,10 +477,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 					freq_text = "Engineering"
 				if(1359)
 					freq_text = "Security"
-				if(1349)
-					freq_text = "Mining"
+//				if(1349)
+//					freq_text = "Mining"
 				if(1347)
-					freq_text = "Cargo"
+					freq_text = "Supply"
 			//There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
 
 			if(!freq_text)

code/modules/mob/living/say.dm

@@ -13,8 +13,7 @@ var/list/department_radio_keys = list(
 	  ":b" = "binary",
 	  ":a" = "alientalk",
 	  ":t" = "Syndicate",
-	  ":d" = "Mining",
-	  ":q" = "Cargo",
+	  ":u" = "Supply",
 	  ":g" = "changeling",
 
 	  ":R" = "right hand",
@@ -30,8 +29,7 @@ var/list/department_radio_keys = list(
 	  ":B" = "binary",
 	  ":A" = "alientalk",
 	  ":T" = "Syndicate",
-	  ":D" = "Mining",
-	  ":Q" = "Cargo",
+	  ":U" = "Supply",
 	  ":G" = "changeling",
 
 	  //kinda localization -- rastaf0
@@ -49,8 +47,7 @@ var/list/department_radio_keys = list(
 	  ":<3A>" = "binary",
 	  ":<3A>" = "alientalk",
 	  ":<3A>" = "Syndicate",
-	  ":<3A>" = "Mining",
-	  ":<3A>" = "Cargo",
+	  ":<3A>" = "Supply",
 	  ":<3A>" = "changeling"
 )
 

code/modules/scripting/Implementations/Telecomms.dm

@@ -69,7 +69,7 @@
 		interpreter.SetVar("$engineering",1357)
 		interpreter.SetVar("$security",	1359)
 		interpreter.SetVar("$mining",	1349)
-		interpreter.SetVar("$cargo",	1347)
+		interpreter.SetVar("$supply",	1347)
 
 		// Signal data
 

html/changelog.html

@@ -56,7 +56,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	</ul>
 	<h3 class="author">Ikarrus updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscdel">Removed mining department radios. Miners and Cargo techs will all be under the Cargo radio instead.</li>
+		<li class="rscdel">Removed mining department radios. Miners and Cargo techs will all be under the Supply radio instead.</li>
 		<li class="tweak">Mining Dock remapped to be more compact and closer to cargo.</li>
 	</ul>
 </div>

maps/tgstation.2.0.9.dmm

@@ -7387,7 +7387,7 @@
 "cMc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/turret_protected/tcomsat)
 "cMd" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 6; icon_state = "intact-b-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/turret_protected/tcomsat)
 "cMe" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 9; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/lattice,/turf/space,/area/turret_protected/tcomsat)
-"cMf" = (/obj/machinery/telecomms/server/presets/cargo,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; tag = "icon-vault (NORTH)"; temperature = 80},/area/tcommsat/chamber)
+"cMf" = (/obj/machinery/telecomms/server/presets/supply,/turf/simulated/floor{dir = 1; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; tag = "icon-vault (NORTH)"; temperature = 80},/area/tcommsat/chamber)
 "cMg" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/chamber)
 "cMh" = (/obj/machinery/telecomms/server/presets/common,/turf/simulated/floor{dir = 4; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; tag = "icon-vault (EAST)"; temperature = 80},/area/tcommsat/chamber)
 "cMi" = (/obj/machinery/telecomms/server/presets/engineering,/turf/simulated/floor{dir = 4; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; tag = "icon-vault (EAST)"; temperature = 80},/area/tcommsat/chamber)