cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fix timer window (#9135)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2024-10-03 15:42:47 -07:00
committed by GitHub
parent 4ff2ed823b
commit 58ab7a2d7b
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_onclick/hud/robot.dm
View File

@@ -256,9 +256,9 @@ var/obj/screen/robot_inventory
control_vtec.icon_state = "speed_2" control_vtec.icon_state = "speed_2"
R.m_intent = "run" R.m_intent = "run"
R.hud_used.move_intent.icon_state = "running" R.hud_used.move_intent.icon_state = "running"
R.client.screen += control_vtec R.client?.screen += control_vtec
else else
R.client.screen -= control_vtec R.client?.screen -= control_vtec
R.speed = 0 R.speed = 0
/datum/hud/proc/toggle_show_robot_modules() /datum/hud/proc/toggle_show_robot_modules()

2
code/datums/chat_message.dm
View File

@@ -121,7 +121,7 @@ var/list/runechat_image_cache = list()
// Always force it back to a pref if they have one // Always force it back to a pref if they have one
if(ismob(target)) if(ismob(target))
var/mob/M = 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 = M.client.prefs.runechat_color
target.chat_color_darkened = M.client.prefs.runechat_color target.chat_color_darkened = M.client.prefs.runechat_color

2
code/modules/economy/cash_register.dm
View File

@@ -190,7 +190,7 @@
scan_cash(SC) scan_cash(SC)
else if(istype(O, /obj/item/card/emag)) else if(istype(O, /obj/item/card/emag))
return ..() 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 var/obj/item/tool/wrench/W = O
toggle_anchors(W, user) toggle_anchors(W, user)
// Not paying: Look up price and add it to transaction_amount // Not paying: Look up price and add it to transaction_amount

7
tgui/packages/tgui/interfaces/AssemblyTimer.tsx
View File

@@ -1,10 +1,9 @@
import { round } from 'common/math'; import { round } from 'common/math';
import { useBackend } from '../backend'; import { useBackend } from '../backend';
import { Button, LabeledList, Section } from '../components'; import { Button, LabeledList, NumberInput, Section } from '../components';
import { formatTime } from '../format'; import { formatTime } from '../format';
import { Window } from '../layouts'; import { Window } from '../layouts';
import { NumberInputModal } from './NumberInputModal';
type Data = { timing: number; time: number }; type Data = { timing: number; time: number };
@@ -12,7 +11,7 @@ export const AssemblyTimer = (props) => {
const { act, data } = useBackend<Data>(); const { act, data } = useBackend<Data>();
const { timing, time } = data; const { timing, time } = data;
return ( return (
<Window> <Window width={400} height={110}>
<Window.Content> <Window.Content>
<Section title="Timing Unit"> <Section title="Timing Unit">
<LabeledList> <LabeledList>
@@ -28,7 +27,7 @@ export const AssemblyTimer = (props) => {
</Button> </Button>
} }
> >
<NumberInputModal <NumberInput
animated animated
fluid fluid
step={1} step={1}