From 3daa38aade3c2317c83f894800c481b60e4b4652 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 31 Aug 2020 22:03:57 -0700 Subject: [PATCH] Merge pull request #7602 from Cyantime/patch-2 Fix jetpack ion trail --- code/game/objects/effects/effect_system.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 48223c67e25..1e804bbb266 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -438,11 +438,15 @@ steam.start() -- spawns the effect if(src.processing) src.processing = 0 spawn(0) - var/turf/T = get_turf(src.holder) + var/turf/T if(istype(holder, /atom/movable)) var/atom/movable/AM = holder if(AM.locs && AM.locs.len) - T = pick(AM.locs) + T = get_turf(pick(AM.locs)) + else + T = get_turf(AM) + else //when would this ever be attached a non-atom/movable? + T = get_turf(src.holder) if(T != src.oldposition) if(isturf(T)) var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)