From ab9f1cc1214774cc19484e7ff7dcc7ae645c85e7 Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Mon, 26 Mar 2012 18:16:37 +0100
Subject: [PATCH] Small Merge Fixes.

---
 baystation12.dme                           | 1 +
 code/game/machinery/constructable_frame.dm | 8 ++++++--
 code/modules/mob/say.dm                    | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index b419cd59be9..e2ef99fb245 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -989,6 +989,7 @@
 #include "code\modules\mob\organ\organ_external.dm"
 #include "code\modules\mob\organ\organ_internal.dm"
 #include "code\modules\mob\organ\pain.dm"
+#include "code\modules\mob\simple_animal\shade.dm"
 #include "code\modules\power\apc.dm"
 #include "code\modules\power\cable.dm"
 #include "code\modules\power\cell.dm"
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 667347e48e5..8098200a4ee 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -348,7 +348,7 @@ obj/item/weapon/circuitboard/rdserver
 							"/obj/item/weapon/stock_parts/subspace/filter" = 1)
 
 /obj/item/weapon/circuitboard/telecomms/broadcaster
-	name = "Circuit Board (Bus Mainframe)"
+	name = "Circuit Board (Subspace Broadcaster)"
 	build_path = "/obj/machinery/telecomms/broadcaster"
 	board_type = "machine"
 	origin_tech = "programming=4;engineering=4;bluespace=2"
@@ -360,4 +360,8 @@ obj/item/weapon/circuitboard/rdserver
 							"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
 							"/obj/item/weapon/stock_parts/subspace/transmitter" = 1,
 							"/obj/item/weapon/stock_parts/subspace/amplifier" = 1,
-							"/obj/item/weapon/stock_parts/micro_laser/high" = 4)
\ No newline at end of file
+							"/obj/item/weapon/stock_parts/micro_laser/high" = 4)
+
+
+
+
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index e923cb459a9..8bceb81fa08 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -29,7 +29,6 @@
 			alt_name = " (died as [src.real_name])"
 
 	message = src.say_quote(message)
-
 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
 
 	for (var/mob/M in world)