From 4c4f5cbd6a5df9d7da5aff1402bdcb97e764bdc4 Mon Sep 17 00:00:00 2001
From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Date: Fri, 21 Nov 2025 09:51:44 +0530
Subject: [PATCH] [NO GBP] Some miscellaneous RCD fixes (#94008)

## About The Pull Request
Sometimes we notice our mistakes only after the
[PR](https://github.com/tgstation/tgstation/pull/93945) gets merged.
This one's one me sorry!!

- The exosuit RCD now uses charge again when not connected to silo link
- The deconstruction RCD sound fx plays again for the borg RCD & RTD

## Changelog
:cl:
fix: exosuit RCD uses charge without silo link
fix: deconstruct sound fx plays for borg rcd & rtd
/:cl:
---
 code/game/objects/items/rcd/RCD.dm | 21 ++++++++-------------
 code/game/objects/items/rcd/RTD.dm |  5 ++++-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm
index ffc8a4ed8fd..09a177a1175 100644
--- a/code/game/objects/items/rcd/RCD.dm
+++ b/code/game/objects/items/rcd/RCD.dm
@@ -500,7 +500,10 @@
 	if(borgy.cell.charge < (amount * energyfactor))
 		balloon_alert(user, "insufficient charge!")
 		return FALSE
-	return dry_run ? TRUE : borgy.cell.use(amount * energyfactor)
+	if(!dry_run)
+		playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+		return borgy.cell.use(amount * energyfactor)
+	return TRUE
 
 /obj/item/construction/rcd/borg/syndicate
 	name = "syndicate RCD"
@@ -593,17 +596,6 @@
 	var/obj/vehicle/sealed/mecha/gundam = owner
 	return round(gundam.get_charge() / MASS_TO_ENERGY)
 
-/obj/item/construction/rcd/exosuit/useResource(amount, mob/user)
-	if(silo_link)
-		return ..()
-	if(!ismecha(owner))
-		return 0
-	var/obj/vehicle/sealed/mecha/gundam = owner
-	if(!gundam.use_energy(amount * MASS_TO_ENERGY))
-		gundam.balloon_alert(user, "insufficient charge!")
-		return FALSE
-	return TRUE
-
 /obj/item/construction/rcd/exosuit/useResource(amount, mob/user, dry_run)
 	if(silo_link)
 		return ..()
@@ -613,7 +605,10 @@
 	if(!gundam.has_charge(amount * MASS_TO_ENERGY))
 		gundam.balloon_alert(user, "insufficient charge!")
 		return FALSE
-	return ..()
+	if(!dry_run)
+		playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+		return gundam.use_energy(amount * MASS_TO_ENERGY)
+	return TRUE
 
 #undef MASS_TO_ENERGY
 
diff --git a/code/game/objects/items/rcd/RTD.dm b/code/game/objects/items/rcd/RTD.dm
index 71aa31c34df..a1ad9191ad7 100644
--- a/code/game/objects/items/rcd/RTD.dm
+++ b/code/game/objects/items/rcd/RTD.dm
@@ -419,7 +419,10 @@
 	if(borgy.cell.charge >= (amount * RTD_BORG_ENERGY_FACTOR))
 		balloon_alert(user, "insufficient charge!")
 		return FALSE
-	return dry_run ? TRUE: borgy.cell.use(amount * RTD_BORG_ENERGY_FACTOR)
+	if(!dry_run)
+		playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+		return borgy.cell.use(amount * RTD_BORG_ENERGY_FACTOR)
+	return TRUE
 
 #undef RTD_BORG_ENERGY_FACTOR