Merge pull request #1064 from Citadel-Station-13/upstream-merge-27436

[MIRROR] Fixes buttons under doors.
2017-05-20 15:05:17 -05:00
parent 186a63ad34 06c0856799
commit 2600dfaa19
1 changed files with 3 additions and 1 deletions
@@ -148,7 +148,9 @@
 /atom/proc/IsObscured()
 	if(!isturf(loc)) //This only makes sense for things directly on turfs for now
 		return FALSE
-	var/turf/T = loc
+	var/turf/T = get_turf_pixel(src)
+	if(!T)
+		return FALSE
 	for(var/atom/movable/AM in T)
 		if(AM.flags & PREVENT_CLICK_UNDER && AM.density && AM.layer > layer)
 			return TRUE