diff --git a/code/game/machinery/sentry_holder.dm b/code/game/machinery/sentry_holder.dm index 9ba9273619dc..255e718f40b8 100644 --- a/code/game/machinery/sentry_holder.dm +++ b/code/game/machinery/sentry_holder.dm @@ -80,11 +80,11 @@ icon_state = "[base_icon_state]_deployed" if(deployed_turret.density) - for(var/mob/M in deployed_turret.loc) - if(deployed_turret.loc == src.loc) - step(M, deployed_turret.dir) + for(var/mob/blocking_mob in deployed_turret.loc) + if(deployed_turret.loc == loc) + step(blocking_mob, deployed_turret.dir) else - step(M, get_dir(src,deployed_turret)) + step(blocking_mob, get_dir(src, deployed_turret)) deployed_turret.setDir(dir) deployed_turret.pixel_x = 0 diff --git a/html/changelogs/AutoChangeLog-pr-6268.yml b/html/changelogs/AutoChangeLog-pr-6268.yml new file mode 100644 index 000000000000..5e6dfc1db6e6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-6268.yml @@ -0,0 +1,5 @@ +author: "realforest2001" +delete-after: True +changes: + - imageadd: "added sprites for floor-mounted sentry deployment systems." + - rscadd: "Added mini-sentry deployment systems, and an AI Core subtype." \ No newline at end of file