Emag works properly, removed radio key from earmuff headset

code/game/communications.dm

@@ -135,10 +135,12 @@ var/list/radiochannels = list(
 	"Service" = 1349,
 	"Supply" = 1347,
 	"Response Team" = 1345,
-	"Syndicate" = 1213
+	"Syndicate" = 1213,
+	"DJ" = 1201
 )
 
 var/list/radiochannelsreverse = list(
+	"1201" = "DJ",
 	"1213" = "Syndicate",
 	"1345" = "Response Team",
 	"1347" = "Supply",
@@ -160,7 +162,7 @@ var/const/SERV_FREQ = 1349 //service, coloured green in chat window
 var/const/DSQUAD_FREQ = 1441 //death squad frequency, coloured grey in chat window
 var/const/RESTEAM_FREQ = 1345 //response team frequency, uses the deathsquad color at the moment.
 var/const/AIPRIV_FREQ = 1447 //AI private, colored magenta in chat window
-
+var/const/DJ_FREQ = 1201 //Media
 
 // central command channels, i.e deathsquid & response teams
 var/list/CENT_FREQS = list(1345, 1441)

code/game/machinery/telecomms/broadcaster.dm

@@ -428,6 +428,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 //				freq_text = "Mining"
 			if(1347)
 				freq_text = "Supply"
+			if(DJ_FREQ)
+				freq_text = "DJ"
 		//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
 
 
@@ -470,6 +472,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 			part_a = "<span class='dsquadradio'><span class='name'>"
 		else if (display_freq==AIPRIV_FREQ)
 			part_a = "<span class='aiprivradio'><span class='name'>"
+		else if (display_freq==DJ_FREQ)
+			part_a = "<span class='djradio'><span class='name'>"
 
 		// --- This following recording is intended for research and feedback in the use of department radio channels ---
 

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

@@ -233,7 +233,7 @@
 	item_state = "earmuffs"
 
 	New()
-		keyslot2 = new /obj/item/device/encryptionkey/headset_serveng
+		//keyslot2 = new /obj/item/device/encryptionkey/headset_serveng
 		..()
 
 /obj/item/device/radio/headset/deathsquad

code/modules/media/jukebox.dm

@@ -438,6 +438,7 @@ var/global/list/loopModeNames=list(
 	if(!emagged)
 		user.visible_message("<span class='warning'>[user.name] slides something into the [src.name]'s card-reader.</span>","<span class='warning'>You short out the [src.name].</span>")
 		wires.CutWireIndex(JUKE_CONFIG)
+		short()
 	return
 
 /obj/machinery/media/jukebox/proc/short()

code/stylesheet.dm

@@ -31,6 +31,7 @@ em						{font-style: normal;	font-weight: bold;}
 .sciradio				{color: #993399;}
 .supradio				{color: #5F4519;}
 .serradio				{color: #3399CC;}
+.djradio				{color: #663300;}
 .mommi					{color: navy;}
 .alert					{color: #ff0000;}
 h1.alert, h2.alert		{color: #000000;}