From e80d294aa59f8de031fdaa47cd21a28752a25bc8 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Mon, 10 Nov 2014 13:17:17 +1030
Subject: [PATCH] Compile issues with the merge. PDA tapping may be broken for
 pAIs.

---
 code/game/objects/items/devices/PDA/PDA.dm | 9 +++------
 code/modules/power/breaker_box.dm          | 2 +-
 code/modules/power/smes.dm                 | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 5e1b0b4818..b43035509a 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1026,12 +1026,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			L << reception_message
 		nanomanager.update_user_uis(L, src) // Update the receiving user's PDA UI so that they can see the new message
 
-		if(L)
-			L << "\icon[P] <b>Message from [src.owner] ([ownjob]), </b>\"[t]\" (<a href='byond://?src=\ref[P];choice=Message;notap=[istype(L, /mob/living/silicon)];skiprefresh=1;target=\ref[src]'>Reply</a>)"
-			nanomanager.update_user_uis(L, P) // Update the receiving user's PDA UI so that they can see the new message
-
 /obj/item/device/pda/proc/new_news(var/message)
 	new_info(news_silent, newstone, news_silent ? "" : "\icon[src] <b>[message]</b>")
+
 	new_news = 1
 	update_icon()
 
@@ -1042,7 +1039,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	new_message(sending_device.name, sending_device.owner, sending_device.ownjob, message)
 
 /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
-	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)"
+	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[src]'>Reply</a>)"
 	new_info(news_silent, newstone, reception_message)
 
 	log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")
@@ -1404,4 +1401,4 @@ var/global/list/obj/item/device/pda/PDAs = list()
 // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
 /obj/item/device/pda/emp_act(severity)
 	for(var/atom/A in src)
-		A.emp_act(severity)
+		A.emp_act(severity)
\ No newline at end of file
diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm
index b6bc3205ed..701a2bb146 100644
--- a/code/modules/power/breaker_box.dm
+++ b/code/modules/power/breaker_box.dm
@@ -8,7 +8,7 @@
 	name = "Breaker Box"
 	icon = 'icons/obj/power.dmi'
 	icon_state = "bbox_off"
-	directwired = 0
+	//directwired = 0
 	var/icon_state_on = "bbox_on"
 	var/icon_state_off = "bbox_off"
 	flags = FPRINT
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 9d5a055a2b..64a8b74f04 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -11,7 +11,7 @@
 	density = 1
 	anchored = 1
 	use_power = 0
-	directwired = 0
+	//directwired = 0
 	var/output = 50000		//Amount of power it tries to output
 	var/lastout = 0			//Amount of power it actually outputs to the powernet
 	var/loaddemand = 0		//For use in restore()