From 070a4bc0c4891f4772790a01624c35778c3a39ed Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 24 Jan 2018 01:00:03 -0500 Subject: [PATCH 1/2] Merge pull request #34817 from ninjanomnom/stop-pointing-at-me Makes the point effect not trigger movement code --- code/game/objects/effects/decals/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index b32cb79313..a973ec7c94 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -8,7 +8,7 @@ /obj/effect/temp_visual/point/Initialize(mapload, set_invis = 0) . = ..() var/atom/old_loc = loc - forceMove(get_turf(src)) + loc = get_turf(src) // We don't want to actualy trigger anything when it moves pixel_x = old_loc.pixel_x pixel_y = old_loc.pixel_y invisibility = set_invis