diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 73ee0afcc57..1b378f6240f 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -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) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm index 4ef2a8fd8b5..6680e5c767e 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human_update_icons.dm @@ -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)