quick patch (#6332)

This commit is contained in:
Matthew J
2021-06-15 20:31:00 +01:00
committed by GitHub
parent faf464bbb6
commit 9fe21539c9
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -828,7 +828,7 @@
else if(T != loc)
step_towards(src, T)
hitscan_last = loc
if(!hitscanning && !forcemoved)
if(!hitscanning && !forcemoved && trajectory)
pixel_x = trajectory.return_px() - trajectory.mpx * trajectory_multiplier * SSprojectiles.global_iterations_per_move
pixel_y = trajectory.return_py() - trajectory.mpy * trajectory_multiplier * SSprojectiles.global_iterations_per_move
animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 1, flags = ANIMATION_END_NOW)
@@ -181,7 +181,7 @@
//Get the overlays for this item when it's being worn
//eg: ammo counters, primed grenade flashes, etc.
var/list/worn_overlays = worn_overlays(isinhands, file2use, mutant_styles)
var/list/worn_overlays = worn_overlays(standing, isinhands, file2use, mutant_styles)
if(worn_overlays && worn_overlays.len)
standing.overlays.Add(worn_overlays)