Skip to content

Commit

Permalink
Merge remote-tracking branch 'cmss13-devs/master' into project/ares/t…
Browse files Browse the repository at this point in the history
…m_holder
  • Loading branch information
realforest2001 committed May 25, 2024
2 parents ec33590 + 2521048 commit 2734298
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/game/machinery/sentry_holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions html/changelogs/AutoChangeLog-pr-6268.yml
Original file line number Diff line number Diff line change
@@ -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."

0 comments on commit 2734298

Please sign in to comment.