From 58d1241fe7c39be7238dde9a7389a124ea45d4be Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Tue, 26 May 2026 19:57:36 +0200
Subject: [PATCH] Fixed carts to not make a noise when pushed into walls
 (#22506)

fixes https://github.com/Aurorastation/Aurora.3/issues/22359
---
 code/game/objects/structures/carts/carts.dm | 13 +++++++------
 html/changelogs/CartFix.yml                 |  6 ++++++
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/CartFix.yml

diff --git a/code/game/objects/structures/carts/carts.dm b/code/game/objects/structures/carts/carts.dm
index 29856ef7aa7..762d9d34b6c 100644
--- a/code/game/objects/structures/carts/carts.dm
+++ b/code/game/objects/structures/carts/carts.dm
@@ -78,12 +78,13 @@ ABSTRACT_TYPE(/obj/structure/cart)
 
 /obj/structure/cart/Move()
 	. = ..()
-	if(pulling && (get_dist(src, pulling) > 1))
-		pulling.pulledby = null
-		to_chat(pulling, SPAN_WARNING("You lost your grip!"))
-		pulling = null
-	if(has_gravity())
-		playsound(src, movesound, 10, TRUE)
+	if(.)
+		if(pulling && (get_dist(src, pulling) > 1))
+			pulling.pulledby = null
+			to_chat(pulling, SPAN_WARNING("You lost your grip!"))
+			pulling = null
+		if(has_gravity())
+			playsound(src, movesound, 10, TRUE)
 
 /obj/structure/cart/CtrlClick(var/mob/user)
 	if(in_range(src, user))
diff --git a/html/changelogs/CartFix.yml b/html/changelogs/CartFix.yml
new file mode 100644
index 00000000000..695971a0652
--- /dev/null
+++ b/html/changelogs/CartFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed carts to no longer make noise when they don't move, such as trying to push them past a wall."