cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NO GBP] Some miscellaneous RCD fixes (#94008)

Browse Source 
## 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
🆑
fix: exosuit RCD uses charge without silo link
fix: deconstruct sound fx plays for borg rcd & rtd
/🆑
This commit is contained in:
SyncIt21
2025-11-20 23:21:44 -05:00
committed by GitHub
parent d7f04b06d4
commit 4c4f5cbd6a
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/rcd/RCD.dm
+8 -13
View File
@@ -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
code/game/objects/items/rcd/RTD.dm
+4 -1
View File
@@ -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