cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7602 from Cyantime/patch-2

Browse Source 
Fix jetpack ion trail
This commit is contained in:
Atermonera
2020-08-31 22:03:57 -07:00
committed by VirgoBot
parent b6cc3bd705
commit 3daa38aade
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/effects/effect_system.dm
View File

@@ -438,11 +438,15 @@ steam.start() -- spawns the effect
if(src.processing) if(src.processing)
src.processing = 0 src.processing = 0
spawn(0) spawn(0)
var/turf/T = get_turf(src.holder) var/turf/T
if(istype(holder, /atom/movable)) if(istype(holder, /atom/movable))
var/atom/movable/AM = holder var/atom/movable/AM = holder
if(AM.locs && AM.locs.len) 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(T != src.oldposition)
if(isturf(T)) if(isturf(T))
var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition) var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)