From 075fe6eff79e33fe0796c3d13648cd86f2e7249f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 18 Apr 2019 13:45:26 -0400
Subject: [PATCH] Merge pull request #5095 from VOREStation/upstream-merge-6098

[MIRROR] Fixes laser pointers targeting through walls
---
 code/game/objects/items/devices/laserpointer.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 343a58ce1a2..751022c2ae2 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -71,6 +71,8 @@
 /obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user)
 	if(!(user in (viewers(world.view,target))))
 		return
+	if(!(target in view(user, world.view)))
+		return
 	if(!(world.time - last_used_time >= cooldown))
 		return
 	if (!diode)