From 2d13c339062dbbb7e15175100b579b375bcdb731 Mon Sep 17 00:00:00 2001 From: Farie82 Date: Mon, 4 Oct 2021 21:15:10 +0200 Subject: [PATCH] Makes laser pointers not go through walls (#16871) * Makes laser pointers not go through walls * Add comment * Use the laserpointer instead as center --- code/game/objects/items/devices/laserpointer.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index d8ea4209cb1..3ca4fe30764 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -71,8 +71,6 @@ laser_act(target, user, params) /obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user, params) - if( !(user in (viewers(7,target))) ) - return if(!diode) to_chat(user, "You point [src] at [target], but nothing happens!") return @@ -82,6 +80,9 @@ if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) to_chat(user, "Your fingers can't press the button!") return + if(!(target in view(7, get_turf(src)))) // Use the turf as center so it won't use the potential xray of the user + to_chat(user, "There is something in the way!") + return add_fingerprint(user)