mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] fix timer window (#9135)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<Data>();
|
||||
const { timing, time } = data;
|
||||
return (
|
||||
<Window>
|
||||
<Window width={400} height={110}>
|
||||
<Window.Content>
|
||||
<Section title="Timing Unit">
|
||||
<LabeledList>
|
||||
@@ -28,7 +27,7 @@ export const AssemblyTimer = (props) => {
|
||||
</Button>
|
||||
}
|
||||
>
|
||||
<NumberInputModal
|
||||
<NumberInput
|
||||
animated
|
||||
fluid
|
||||
step={1}
|
||||
|
||||
Reference in New Issue
Block a user