From ad6f0cb1571151028d5ff2ccda44b612ac5bc08e Mon Sep 17 00:00:00 2001
From: Bjorn Neergaard <bjorn@neersighted.com>
Date: Fri, 12 Feb 2016 00:11:50 -0600
Subject: [PATCH] Fix some poor intercom code

---
 code/game/objects/items/devices/radio/intercom.dm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index e5529b5d949..eac36d5be0a 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -58,14 +58,11 @@
 	if(((world.timeofday - last_tick) > 30) || ((world.timeofday - last_tick) < 0))
 		last_tick = world.timeofday
 
-		if(!src.loc)
+		var/area/A = get_area_master(src)
+		if(!A || emped)
 			on = 0
 		else
-			var/area/A = src.loc.loc
-			if(!A || !isarea(A) || !A.master || emped)
-				on = 0
-			else
-				on = A.master.powered(EQUIP) // set "on" to the power status
+			on = A.powered(EQUIP) // set "on" to the power status
 
 		if(!on)
 			icon_state = "intercom-p"