From b4301c3e76127e83d7a59fbf1dbd7547d10e6d09 Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Sun, 9 Aug 2015 23:58:05 +0200
Subject: [PATCH] Let ghosts interact with requests consoles/turret controls,
 mecha bay console icon fix

---
 code/game/machinery/alarm.dm            | 5 +++++
 code/game/machinery/firealarm.dm        | 7 +------
 code/game/machinery/requests_console.dm | 9 ++++++++-
 code/game/machinery/turret_control.dm   | 3 +++
 code/game/mecha/mech_bay.dm             | 1 +
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index b9abe4e1c1d..f5ef29300f8 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -601,6 +601,11 @@
 
 /obj/machinery/alarm/attack_robot(mob/user)
 	return attack_ai(user)
+	
+/obj/machinery/alarm/attack_ghost(user as mob)
+	if(stat & (BROKEN|MAINT))
+		return
+	return ui_interact(user)
 
 /obj/machinery/alarm/attack_hand(mob/user)
 	. = ..()
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 7d454f857c8..2c03a7a92e8 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -53,12 +53,7 @@ FIRE ALARM
 	if(src.detecting)
 		if(temperature > T0C+200)
 			src.alarm()			// added check of detector status here
-	return
-	
-/obj/machinery/alarm/attack_ghost(user as mob)
-	if(stat & (BROKEN|MAINT))
-		return
-	return ui_interact(user)	
+	return	
 
 /obj/machinery/firealarm/attack_ai(mob/user as mob)
 	src.add_hiddenprint(user)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 65096f6b938..133ce3814df 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -98,6 +98,12 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			req_console_information -= department
 	..()
 
+/obj/machinery/requests_console/attack_ghost(user as mob)
+	if(stat & NOPOWER)
+		return
+		
+	ui_interact(user)	
+	
 /obj/machinery/requests_console/attack_hand(user as mob)
 	if(..(user))
 		return
@@ -132,7 +138,8 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		ui.set_auto_update(1)
 
 /obj/machinery/requests_console/Topic(href, href_list)
-	if(..())	return
+	if(..())	
+		return 1
 	usr.set_machine(src)
 	add_fingerprint(usr)
 
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 798fc855f29..1f09153a78a 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -107,6 +107,9 @@
 		return
 
 	ui_interact(user)
+	
+/obj/machinery/turretid/attack_ghost(mob/user as mob)
+	ui_interact(user)
 
 /obj/machinery/turretid/attack_hand(mob/user as mob)
 	if(isLocked(user))
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index b9516d3619d..3f6b92c98ce 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -223,6 +223,7 @@
 /obj/machinery/computer/mech_bay_power_console/proc/mecha_out()
 	if(recharge_port)
 		recharge_port.stop_charge()
+		update_icon()
 	return
 
 /obj/machinery/computer/mech_bay_power_console/power_change()