Merge pull request #2951 from meyar/master

Emergency fix: Nuke shuttle

code/game/communications.dm

@@ -104,15 +104,15 @@ var/list/radiochannels = list(
 	"Medical" = 1355,
 	"Engineering" = 1357,
 	"Security" = 1359,
+	"Response Team" = 1443,
 	"Deathsquad" = 1441,
 	"Syndicate" = 1213,
 	"Supply" = 1347,
 )
 //depenging helpers
-var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213,1441,1347)
+var/list/DEPT_FREQS = list(1351,1355,1357,1359,1213, 1443, 1441,1347)
 var/const/COMM_FREQ = 1353 //command, colored gold in chat window
 var/const/SYND_FREQ = 1213
-var/const/ERT_FREQ = 1439
 
 #define TRANSMISSION_WIRE	0
 #define TRANSMISSION_RADIO	1

code/game/machinery/telecomms/broadcaster.dm

@@ -148,15 +148,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 							  signal.data["radio"], signal.data["message"],
 							  signal.data["name"], signal.data["job"],
 							  signal.data["realname"], signal.data["vname"],, signal.data["compression"], list(0), connection.frequency)
-
-		if(connection.frequency == ERT_FREQ)
-			Broadcast_Message(signal.data["connection"], signal.data["mob"],
-							  signal.data["vmask"], signal.data["vmessage"],
-							  signal.data["radio"], signal.data["message"],
-							  signal.data["name"], signal.data["job"],
-							  signal.data["realname"], signal.data["vname"],, signal.data["compression"], list(0), connection.frequency)
-
-
 		else
 			if(intercept)
 				Broadcast_Message(signal.data["connection"], signal.data["mob"],
@@ -354,6 +345,10 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 //				freq_text = "Mining"
 			if(1347)
 				freq_text = "Supply"
+			if(1441)
+				freq_text = "Death Squad"
+			if(1443)
+				freq_text = "Response Team"
 		//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

@@ -27,7 +27,11 @@
 /obj/machinery/telecomms/relay/preset/centcom
 	id = "Centcom Relay"
 	hide = 1
-	toggled = 0
+	toggled = 1
+	//anchored = 1
+	//use_power = 0
+	//idle_power_usage = 0
+	heatgen = 0
 	autolinkers = list("c_relay")
 
 //HUB

html/changelog.html

@@ -58,6 +58,18 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. 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">
+<div class="commit sansserif">
+	<h2 class="date">6/2</h2>
+	<h3 class="author">Meyar updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Temporarily moving the Nuke Team spawn into the shutlte pending Unsimulated tiles being fixed</li>
+		<li class="bugfix">Removed an unsimulated tile from inside the shuttle</li>
+		<li class="bugfix">ERT Radio working. For real this time. (:h)</li>
+		<li class="tweak">ERT and Syndicate starting areas now have magboots</li>
+		<li class="tweak">Side effect of the ERT radio fix: Radios can now be used on Z level 2 (Admin Z level/centcom)</li>
+	</ul>
+</div>
+
 
 <div class="commit sansserif">
 	<h2 class="date">31.05.2013</h2>