From 58ab7a2d7b25099e75b873de27be79e8c6e2f690 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Thu, 3 Oct 2024 15:42:47 -0700 Subject: [PATCH] [MIRROR] fix timer window (#9135) Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: CHOMPStation2 --- code/_onclick/hud/robot.dm | 4 ++-- code/datums/chat_message.dm | 2 +- code/modules/economy/cash_register.dm | 2 +- tgui/packages/tgui/interfaces/AssemblyTimer.tsx | 7 +++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 3ab7410269..87bc406604 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -256,9 +256,9 @@ var/obj/screen/robot_inventory control_vtec.icon_state = "speed_2" R.m_intent = "run" R.hud_used.move_intent.icon_state = "running" - R.client.screen += control_vtec + R.client?.screen += control_vtec else - R.client.screen -= control_vtec + R.client?.screen -= control_vtec R.speed = 0 /datum/hud/proc/toggle_show_robot_modules() diff --git a/code/datums/chat_message.dm b/code/datums/chat_message.dm index df88397490..7088d70917 100644 --- a/code/datums/chat_message.dm +++ b/code/datums/chat_message.dm @@ -121,7 +121,7 @@ var/list/runechat_image_cache = list() // Always force it back to a pref if they have one if(ismob(target)) var/mob/M = target - if(M?.client?.prefs?.runechat_color != COLOR_BLACK) + if(M?.client?.prefs && M.client.prefs.runechat_color != COLOR_BLACK) target.chat_color = M.client.prefs.runechat_color target.chat_color_darkened = M.client.prefs.runechat_color diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index d02305a6d0..607bf08e8a 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -190,7 +190,7 @@ scan_cash(SC) else if(istype(O, /obj/item/card/emag)) return ..() - else if(O.has_tool_quality(TOOL_WRENCH)) + else if(istype(O) && O.has_tool_quality(TOOL_WRENCH)) var/obj/item/tool/wrench/W = O toggle_anchors(W, user) // Not paying: Look up price and add it to transaction_amount diff --git a/tgui/packages/tgui/interfaces/AssemblyTimer.tsx b/tgui/packages/tgui/interfaces/AssemblyTimer.tsx index c9f950026d..e1b527bfa7 100644 --- a/tgui/packages/tgui/interfaces/AssemblyTimer.tsx +++ b/tgui/packages/tgui/interfaces/AssemblyTimer.tsx @@ -1,10 +1,9 @@ import { round } from 'common/math'; import { useBackend } from '../backend'; -import { Button, LabeledList, Section } from '../components'; +import { Button, LabeledList, NumberInput, Section } from '../components'; import { formatTime } from '../format'; import { Window } from '../layouts'; -import { NumberInputModal } from './NumberInputModal'; type Data = { timing: number; time: number }; @@ -12,7 +11,7 @@ export const AssemblyTimer = (props) => { const { act, data } = useBackend(); const { timing, time } = data; return ( - +
@@ -28,7 +27,7 @@ export const AssemblyTimer = (props) => { } > -