From 0eb29e37c05a5ca7381ac5cfc05195a6c64ad1e7 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:24:29 +0200 Subject: [PATCH 1/5] fix timer window --- tgui/packages/tgui/interfaces/AssemblyTimer.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tgui/packages/tgui/interfaces/AssemblyTimer.tsx b/tgui/packages/tgui/interfaces/AssemblyTimer.tsx index c9f950026d5..e1b527bfa72 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) => { } > - Date: Thu, 3 Oct 2024 01:26:04 +0200 Subject: [PATCH 2/5] also fix that --- code/modules/economy/cash_register.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index d02305a6d0f..607bf08e8ac 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 From 41b7fe46687907885780d6ead11a784d4f8dae70 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Thu, 3 Oct 2024 02:01:46 +0200 Subject: [PATCH 3/5] might be an empty shell getting an upgrade --- code/game/objects/items/robot/robot_upgrades.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 161f09385b7..fbe6495ab6b 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -121,7 +121,7 @@ R.verbs += /mob/living/silicon/robot/proc/toggle_vtec R.vtec_active = TRUE - R.hud_used.toggle_vtec_control() + R.hud_used?.toggle_vtec_control() return 1 /obj/item/borg/upgrade/basic/sizeshift From 0dccf5f954c6e9ec59579a25960f4f1f57967ccc Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Thu, 3 Oct 2024 02:03:36 +0200 Subject: [PATCH 4/5] . --- code/_onclick/hud/robot.dm | 4 ++-- code/game/objects/items/robot/robot_upgrades.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 3ab7410269e..87bc4066045 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/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index fbe6495ab6b..161f09385b7 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -121,7 +121,7 @@ R.verbs += /mob/living/silicon/robot/proc/toggle_vtec R.vtec_active = TRUE - R.hud_used?.toggle_vtec_control() + R.hud_used.toggle_vtec_control() return 1 /obj/item/borg/upgrade/basic/sizeshift From bafb099bc0a09964007eb8ec952da63606fa969c Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Thu, 3 Oct 2024 22:44:24 +0200 Subject: [PATCH 5/5] fix runtime flood on chat messages --- code/datums/chat_message.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/chat_message.dm b/code/datums/chat_message.dm index 16710d8c809..65296088d48 100644 --- a/code/datums/chat_message.dm +++ b/code/datums/chat_message.dm @@ -126,7 +126,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