Merge remote-tracking branch 'cmss13-devs/master' into project/ares/t…

…m_holder
cmss13-devs · May 25, 2024 · 2734298 · 2734298
2 parents ec33590 + 2521048
commit 2734298
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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."