Removed mining department radio frequency. Miners and Cargo techs will all be under the Cargo radio instead.

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

code/game/jobs/job/civilian.dm

@@ -96,7 +96,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/qm(H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo(H), slot_ears)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/quartermaster(H), slot_belt)
@@ -142,7 +142,7 @@
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_mine (H), slot_ears)
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cargo (H), slot_ears)
 		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/industrial (H), slot_back)
 		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_eng(H), slot_back)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/miner(H), slot_w_uniform)

code/game/machinery/telecomms/broadcaster.dm

@@ -341,8 +341,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 				freq_text = "Engineering"
 			if(1359)
 				freq_text = "Security"
-			if(1349)
-				freq_text = "Mining"
+//			if(1349)
+//				freq_text = "Mining"
 			if(1347)
 				freq_text = "Cargo"
 		//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
@@ -398,8 +398,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_deathsquad += blackbox_msg
 				if(1213)
 					blackbox.msg_syndicate += blackbox_msg
-				if(1349)
-					blackbox.msg_mining += blackbox_msg
+//				if(1349)
+//					blackbox.msg_mining += blackbox_msg
 				if(1347)
 					blackbox.msg_cargo += blackbox_msg
 				else
@@ -613,8 +613,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 				freq_text = "Engineering"
 			if(1359)
 				freq_text = "Security"
-			if(1349)
-				freq_text = "Mining"
+//			if(1349)
+//				freq_text = "Mining"
 			if(1347)
 				freq_text = "Cargo"
 		//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
@@ -669,8 +669,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 					blackbox.msg_deathsquad += blackbox_msg
 				if(1213)
 					blackbox.msg_syndicate += blackbox_msg
-				if(1349)
-					blackbox.msg_mining += blackbox_msg
+//				if(1349)
+//					blackbox.msg_mining += blackbox_msg
 				if(1347)
 					blackbox.msg_cargo += blackbox_msg
 				else

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", "mining", "common", "command", "engineering", "security",
+	"cargo", "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, 1349) // science, medical, cargo, mining
+	freq_listening = list(1351, 1355, 1347) // science, medical, cargo
 
 
 //--PRESET RIGHT--//
@@ -70,8 +70,8 @@
 /obj/machinery/telecomms/bus/preset_two
 	id = "Bus 2"
 	network = "tcommsat"
-	freq_listening = list(1347, 1349)
-	autolinkers = list("processor2", "cargo", "mining")
+	freq_listening = list(1347)
+	autolinkers = list("processor2", "cargo")
 
 /obj/machinery/telecomms/bus/preset_three
 	id = "Bus 3"
@@ -132,12 +132,12 @@
 	id = "Cargo Server"
 	freq_listening = list(1347)
 	autolinkers = list("cargo")
-
+/*
 /obj/machinery/telecomms/server/presets/mining
 	id = "Mining Server"
 	freq_listening = list(1349)
 	autolinkers = list("mining")
-
+*/
 /obj/machinery/telecomms/server/presets/common
 	id = "Common Server"
 	freq_listening = list()

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, "Mining" = 0, "Cargo" = 0)
+	channels = list("Command" = 1, "Science" = 0, "Medical" = 0, "Security" = 1, "Engineering" = 0, "Cargo" = 0)
 
 /obj/item/device/encryptionkey/heads/rd
 	name = "Research Director's Encryption Key"
@@ -102,8 +102,8 @@
 	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, "Mining" = 0)
-
+	channels = list("Command" = 1, "Security" = 0, "Cargo" = 1)
+/*
 /obj/item/device/encryptionkey/headset_mine
 	name = "Mining Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
@@ -115,7 +115,7 @@
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."
 	icon_state = "qm_cypherkey"
 	channels = list("Cargo" = 1, "Mining" = 1)
-
+*/
 /obj/item/device/encryptionkey/headset_cargo
 	name = "Cargo Radio Encryption Key"
 	desc = "An encyption key for a radio headset.  Contains cypherkeys."

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

@@ -134,7 +134,7 @@
 	icon_state = "com_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/hop
-
+/*
 /obj/item/device/radio/headset/headset_mine
 	name = "mining radio headset"
 	desc = "Headset used by miners. How useless. To access the mining channel, use :d."
@@ -148,10 +148,10 @@
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/heads/qm
-
+*/
 /obj/item/device/radio/headset/headset_cargo
 	name = "cargo radio headset"
-	desc = "Headset used by the QM's slaves. To access the cargo channel, use :q."
+	desc = "A headset used by the QM and his slaves. To access the cargo channel, use :q."
 	icon_state = "cargo_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_cargo

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -34,7 +34,7 @@
 		sleep(2)
 		new /obj/item/clothing/under/rank/cargo(src)
 		new /obj/item/clothing/shoes/brown(src)
-		new /obj/item/device/radio/headset/heads/qm(src)
+		new /obj/item/device/radio/headset/headset_cargo(src)
 		new /obj/item/clothing/gloves/black(src)
 //		new /obj/item/weapon/cartridge/quartermaster(src)
 		new /obj/item/clothing/suit/fire/firefighter(src)

code/modules/awaymissions/corpse.dm

@@ -178,7 +178,7 @@
 	corpseidaccess = "Scientist"
 
 /obj/effect/landmark/corpse/miner
-	corpseradio = /obj/item/device/radio/headset/headset_mine
+	corpseradio = /obj/item/device/radio/headset/headset_cargo
 	corpseuniform = /obj/item/clothing/under/rank/miner
 	corpsegloves = /obj/item/clothing/gloves/black
 	corpseback = /obj/item/weapon/storage/backpack/industrial

code/modules/mining/mine_items.dm

@@ -26,7 +26,7 @@
 		new /obj/item/weapon/storage/backpack/industrial(src)
 	else
 		new /obj/item/weapon/storage/backpack/satchel_eng(src)
-	new /obj/item/device/radio/headset/headset_mine(src)
+	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/under/rank/miner(src)
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/shoes/black(src)

code/modules/mob/living/simple_animal/parrot.dm

@@ -89,7 +89,7 @@
 						/obj/item/device/radio/headset/headset_eng, \
 						/obj/item/device/radio/headset/headset_med, \
 						/obj/item/device/radio/headset/headset_sci, \
-						/obj/item/device/radio/headset/heads/qm)
+						/obj/item/device/radio/headset/headset_cargo)
 		ears = new headset(src)
 
 	parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var

html/changelog.html

@@ -33,7 +33,7 @@
 <table align='center' class="top">
 	<tr>
 		<td valign='top'>
-			<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom, trubble_bass.<br></font>
+			<font size='2'><b>Coders:</b> TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie, Sieve, Giacom, Ikarrus, trubble_bass.<br></font>
 			<font size='2'><b>Spriters:</b> Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut, Pewtershmitz, Firecage<br></font>
 			<font size='2'><b>Sounds:</b> Skie, Lasty/Vinyl<br></font>
 			<font size='2'><b>Thanks to:</b> Baystation 12, CDK Station devs, GoonStation devs, the original SpaceStation developers and Invisty for the title image<br></font>
@@ -54,6 +54,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<ul class="changes bgimages16">
 		<li class="rscadd">Agent cards have been upgraded with microscanners, allowing operatives in the field to copy access levels off of other ID cards.</li>
 	</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="tweak">Mining Dock remapped to be more compact and closer to cargo.</li>
+	</ul>
 </div>
 
 <div class="commit sansserif">