From b25441e2b0feb6f2249c12472ba4f78dd0c1f5c3 Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Thu, 20 Mar 2025 16:49:01 -0700
Subject: [PATCH] [MIRROR] up port muffle items (#10476)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 code/game/objects/items/weapons/storage/backpack.dm |  7 ++++++-
 code/game/objects/items/weapons/storage/storage.dm  |  2 --
 code/modules/power/batteryrack.dm                   | 12 ++----------
 code/modules/vore/eating/soulcatcher.dm             | 13 +++++++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 8cdc2bc892..5b633b6d0f 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -36,7 +36,12 @@
 /*
 /obj/item/storage/backpack/dropped(mob/user)
 	if (loc == user && src.use_sound)
-		playsound(src, src.use_sound, 50, 1, -5)
+		if(isbelly(user.loc))
+			var/obj/belly/B = user.loc
+			if(B.mode_flags & DM_FLAG_MUFFLEITEMS)
+				return
+		else
+			playsound(src, src.use_sound, 50, 1, -5)
 	..(user)
 */
 
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index a6f49adce3..687348fdc5 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -238,11 +238,9 @@
 
 /obj/item/storage/proc/open(mob/user as mob)
 	if (use_sound)
-		//CHOMPStation Edit
 		var/obj/belly/B = user.loc
 		if(isliving(user) && (!isbelly(B) || !(B.mode_flags & DM_FLAG_MUFFLEITEMS)))
 			playsound(src, src.use_sound, 50, 0, -5)
-		//CHOMPStation Edit end
 
 	orient2hud(user)
 	if(user.s_active)
diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index bb1a6a997f..9f23b0de3a 100644
--- a/code/modules/power/batteryrack.dm
+++ b/code/modules/power/batteryrack.dm
@@ -26,20 +26,12 @@
 	var/icon_update = 0									// Timer in ticks for icon update.
 	var/ui_tick = 0
 	should_be_mapped = TRUE
+	circuit = /obj/item/circuitboard/batteryrack
 
 
 /obj/machinery/power/smes/batteryrack/Initialize(mapload)
 	. = ..()
-	add_parts()
-	RefreshParts()
-
-/obj/machinery/power/smes/batteryrack/proc/add_parts()
-	component_parts = list()
-	component_parts += new /obj/item/circuitboard/batteryrack
-	component_parts += new /obj/item/stock_parts/capacitor				// Capacitors: Maximal I/O
-	component_parts += new /obj/item/stock_parts/capacitor
-	component_parts += new /obj/item/stock_parts/capacitor
-	component_parts += new /obj/item/stock_parts/matter_bin				// Matter Bin: Max. amount of cells.
+	default_apply_parts()
 
 /obj/machinery/power/smes/batteryrack/RefreshParts()
 	var/capacitor_efficiency = 0
diff --git a/code/modules/vore/eating/soulcatcher.dm b/code/modules/vore/eating/soulcatcher.dm
index 589cda5852..73264aece5 100644
--- a/code/modules/vore/eating/soulcatcher.dm
+++ b/code/modules/vore/eating/soulcatcher.dm
@@ -40,12 +40,17 @@
 // Store the vars_to_save into the save file
 /obj/soulgem/deserialize(list/data)
 	. = ..()
-	for(var/obj/belly in owner.vore_organs)
-		if(belly.name == data["linked_belly"])
-			update_linked_belly(belly, TRUE)
-			return
+	if(apply_stored_belly(data["linked_belly"], TRUE))
+		return
 	linked_belly = null
 
+/obj/soulgem/proc/apply_stored_belly(var/belly_string, var/skip_unreg = FALSE)
+	for(var/obj/belly in owner.vore_organs)
+		if(belly.name == belly_string)
+			update_linked_belly(belly, TRUE)
+			return TRUE
+	return FALSE
+
 // Allows to transfer the soulgem to the given mob
 /obj/soulgem/proc/transfer_self(var/mob/target)
 	QDEL_NULL(target.soulgem)