From 8b3de4dd3eb4c4ab43dfe61509874f9590c5cbd7 Mon Sep 17 00:00:00 2001
From: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Date: Thu, 19 Jun 2025 01:31:24 +0500
Subject: [PATCH] Add Wheelcart Sound To More Objs (#29427)

* bo

* ba

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
---
 code/game/gamemodes/nuclear/nuclearbomb.dm                | 6 ++++++
 code/game/machinery/iv_drip.dm                            | 2 +-
 code/game/objects/structures/crates_lockers/crates.dm     | 6 ++++++
 code/game/objects/structures/janicart.dm                  | 8 +++++++-
 code/game/objects/structures/stool_bed_chair_nest/bed.dm  | 6 ++++++
 .../objects/structures/stool_bed_chair_nest/chairs.dm     | 6 ++++++
 .../atmospherics/machinery/portable/portable_pump.dm      | 6 ++++++
 code/modules/atmospherics/machinery/portable/scrubber.dm  | 6 ++++++
 code/modules/reagents/reagent_dispenser.dm                | 6 ++++++
 9 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 0fa4e0b2e33..22894dd2c34 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -690,6 +690,12 @@ GLOBAL_VAR(bomb_set)
 				return
 	return
 
+/obj/machinery/nuclearbomb/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
+
 // MARK: Nuclear Disk
 
 /obj/item/disk/nuclear
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 650330cf16a..f969e8daaf5 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -98,7 +98,7 @@
 	. = ..()
 	if(!.) // ..() will return 0 if we didn't actually move anywhere.
 		return
-	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 75, TRUE, ignore_walls = FALSE)
 
 #undef IV_TAKING
 #undef IV_INJECTING
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index b1f3e9a3941..07559ac79a5 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -358,6 +358,12 @@
 	icon_opened = "trashcart_open"
 	icon_closed = "trashcart"
 
+/obj/structure/closet/crate/trashcart/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
+
 /obj/structure/closet/crate/medical
 	desc = "A medical crate."
 	name = "medical crate"
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index ff19e721056..dff605b1aa0 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -120,7 +120,7 @@
 			put_in_cart(user, used)
 			return
 		item_present = TRUE
-	
+
 	if(istype(used, /obj/item/storage/bag/trash))
 		if(!my_bag)
 			my_bag = used
@@ -291,3 +291,9 @@
 				reagentsImage.icon_state = "cart_reagents4"
 		reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list)
 		. += reagentsImage
+
+/obj/structure/janitorialcart/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index ace22e11ee9..c806af71505 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -167,6 +167,12 @@
 	else
 		return ..()
 
+/obj/structure/bed/roller/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 75, TRUE, ignore_walls = FALSE)
+
 /obj/structure/bed/roller/post_buckle_mob(mob/living/M)
 	density = TRUE
 	icon_state = icon_up
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 936a391052f..84bbbb17f4e 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -298,6 +298,12 @@
 	else
 		cut_overlay(armrest)
 
+/obj/structure/chair/office/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 75, TRUE, ignore_walls = FALSE)
+
 /obj/structure/chair/office/dark
 	icon_state = "officechair_dark"
 
diff --git a/code/modules/atmospherics/machinery/portable/portable_pump.dm b/code/modules/atmospherics/machinery/portable/portable_pump.dm
index dc880779145..c96ac8f2e5d 100644
--- a/code/modules/atmospherics/machinery/portable/portable_pump.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_pump.dm
@@ -216,6 +216,12 @@
 	else
 		icon_state = "[base_icon_state]:[on]"
 
+/obj/machinery/atmospherics/portable/pump/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
+
 #undef MAX_TARGET_PRESSURE
 #undef DIRECTION_IN
 #undef DIRECTION_OUT
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 71e1af7f9b7..355f3fbfd6b 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -202,3 +202,9 @@
 	stationary = TRUE
 
 #undef MAX_RATE
+
+/obj/machinery/atmospherics/portable/scrubber/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 60616779c89..e142f3bc673 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -75,6 +75,12 @@
 	else
 		qdel(src)
 
+/obj/structure/reagent_dispensers/Move(NewLoc, direct)
+	. = ..()
+	if(!.)
+		return
+	playsound(loc, pick('sound/items/cartwheel1.ogg', 'sound/items/cartwheel2.ogg'), 100, TRUE, ignore_walls = FALSE)
+
 //Dispensers
 /obj/structure/reagent_dispensers/watertank
 	name = "water tank"