From bfac760d7039d5ae78166d2c394599e5ab42ef08 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Thu, 20 Mar 2025 16:00:47 +0100
Subject: [PATCH] up port muffle items (#17380)

* up port muffle items

* fix that

* Update exonet_node.dm

* fix that...
---
 code/game/machinery/exonet_node.dm                  |  7 ++++---
 code/game/objects/items/weapons/storage/backpack.dm |  7 ++++++-
 code/game/objects/items/weapons/storage/storage.dm  |  4 +++-
 code/modules/power/batteryrack.dm                   | 12 ++----------
 code/modules/reagents/machinery/chem_master.dm      |  1 +
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm
index 264bc263e53..ccd793cb383 100644
--- a/code/game/machinery/exonet_node.dm
+++ b/code/game/machinery/exonet_node.dm
@@ -20,11 +20,12 @@
 // Proc: New()
 // Parameters: None
 // Description: Adds components to the machine for deconstruction.
-/obj/machinery/exonet_node/map/Initialize(mapload)
+/obj/machinery/exonet_node/Initialize(mapload)
 	. = ..()
 	default_apply_parts()
-	desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \
-	electronically."
+	if(mapload)
+		desc = "This machine is one of many, many nodes inside [using_map.starsys_name]'s section of the Exonet, connecting the [using_map.station_short] to the rest of the system, at least \
+		electronically."
 
 // Proc: update_icon()
 // Parameters: None
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index c23b0dc64cb..ad37f1e28f0 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -28,7 +28,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 6e212e0f583..09548ee6752 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -237,7 +237,9 @@
 
 /obj/item/storage/proc/open(mob/user as mob)
 	if (use_sound)
-		playsound(src, src.use_sound, 50, 0, -5)
+		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)
 
 	orient2hud(user)
 	if(user.s_active)
diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index bb1a6a997fc..9f23b0de3a5 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/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm
index 008996793e0..c5d193521f1 100644
--- a/code/modules/reagents/machinery/chem_master.dm
+++ b/code/modules/reagents/machinery/chem_master.dm
@@ -25,6 +25,7 @@
 
 /obj/machinery/chem_master/Initialize(mapload)
 	. = ..()
+	default_apply_parts()
 	var/datum/reagents/R = new/datum/reagents(900)	//Just a huge random number so the buffer should (probably) never dump your reagents.
 	reagents = R	//There should be a nano ui thingy to warn of this.
 	R.my_atom = src