From abacca05d6de5f4def4ecc63fd05040e299752a7 Mon Sep 17 00:00:00 2001 From: SMOSMOSMOSMOSMO <95004236+SmoSmoSmoSmok@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:39:43 +0200 Subject: [PATCH] [no gbp] orm correctly displays borg id data (#73808) ## About The Pull Request this is a minor thing i forgot to add in my last PR, now the borg's name will be displayed as well when interacting with the ORM rather than displaying "no id detected" ## Why It's Good For The Game ## Changelog :cl: qol: Borgs are now acknowledged by the orm /:cl: --- code/modules/mining/machine_redemption.dm | 7 +++++++ .../tgui/interfaces/OreRedemptionMachine.js | 19 ++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 6eb4b28da81..c8b14a20310 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -252,6 +252,13 @@ "name" = card.registered_account.account_holder, "cash" = card.registered_account.account_balance, ) + + else if(issilicon(user)) + var/mob/living/silicon/silicon_player = user + data["user"] = list( + "name" = silicon_player.name, + "cash" = "No valid account", + ) return data /obj/machinery/mineral/ore_redemption/ui_static_data(mob/user) diff --git a/tgui/packages/tgui/interfaces/OreRedemptionMachine.js b/tgui/packages/tgui/interfaces/OreRedemptionMachine.js index 89b3f63fd54..df47f2f9452 100644 --- a/tgui/packages/tgui/interfaces/OreRedemptionMachine.js +++ b/tgui/packages/tgui/interfaces/OreRedemptionMachine.js @@ -32,20 +32,17 @@ export const OreRedemptionMachine = (props, context) => { /> - {(!user && 'No user Detected') || ( - - - {user.name || 'No name detected'} - - - {user.cash + ' cr' || 'No balance detected'} - - - )} + + + {user?.name || 'No Name Detected'} + + + {user?.cash || 'No Balance Detected'} + +