diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 959d4566d2..488498a58b 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -107,7 +107,7 @@ /obj/item/device/assembly/prox_sensor/tgui_data(mob/user) var/list/data = ..() - data["time"] = time * 10 + data["time"] = time data["timing"] = timing data["range"] = range data["maxRange"] = 5 @@ -135,7 +135,7 @@ for(var/i in 1 to LAZYLEN(L)) real_new_time += text2num(L[i]) * (60 ** (LAZYLEN(L) - i)) else - real_new_time = text2num(new_time) + real_new_time = text2num(new_time * 10) time = clamp(real_new_time, 0, 600) return TRUE if("range") diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index fb47a020c3..13e4c63043 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -73,7 +73,7 @@ /obj/item/device/assembly/timer/tgui_data(mob/user) var/list/data = ..() - data["time"] = time * 10 + data["time"] = time data["timing"] = timing return data @@ -94,6 +94,6 @@ for(var/i in 1 to LAZYLEN(L)) real_new_time += text2num(L[i]) * (60 ** (LAZYLEN(L) - i)) else - real_new_time = text2num(new_time) + real_new_time = text2num(new_time * 10) time = clamp(real_new_time, 0, 600) return TRUE diff --git a/tgui/packages/tgui/interfaces/AssemblyProx.jsx b/tgui/packages/tgui/interfaces/AssemblyProx.jsx index 19feacea1e..a569ab8113 100644 --- a/tgui/packages/tgui/interfaces/AssemblyProx.jsx +++ b/tgui/packages/tgui/interfaces/AssemblyProx.jsx @@ -30,8 +30,8 @@ export const AssemblyProx = (props) => { fluid value={time / 10} minValue={0} - maxValue={600} - format={(val) => formatTime(round(val))} + maxValue={60} + format={(val) => formatTime(round(val * 10))} onDrag={(e, val) => act('set_time', { time: val })} /> diff --git a/tgui/packages/tgui/interfaces/AssemblyTimer.jsx b/tgui/packages/tgui/interfaces/AssemblyTimer.jsx index fef7278b3f..98b64eaa62 100644 --- a/tgui/packages/tgui/interfaces/AssemblyTimer.jsx +++ b/tgui/packages/tgui/interfaces/AssemblyTimer.jsx @@ -30,8 +30,8 @@ export const AssemblyTimer = (props) => { fluid value={time / 10} minValue={0} - maxValue={600} - format={(val) => formatTime(round(val))} + maxValue={60} + format={(val) => formatTime(round(val * 10))} onDrag={(e, val) => act('set_time', { time: val })} /> diff --git a/tgui/packages/tgui/interfaces/BrigTimer.jsx b/tgui/packages/tgui/interfaces/BrigTimer.jsx index 38268d6fb9..44e693a609 100644 --- a/tgui/packages/tgui/interfaces/BrigTimer.jsx +++ b/tgui/packages/tgui/interfaces/BrigTimer.jsx @@ -8,7 +8,7 @@ import { Window } from '../layouts'; export const BrigTimer = (props) => { const { act, data } = useBackend(); return ( - +
{ value={data.time_left / 10} minValue={0} maxValue={data.max_time_left / 10} - format={(val) => formatTime(round(val))} + format={(val) => formatTime(round(val * 10))} onDrag={(e, val) => act('time', { time: val })} /> @@ -50,7 +50,7 @@ export const BrigTimer = (props) => { icon="hourglass-start" onClick={() => act('preset', { preset: 'short' })} > - {'Add ' + formatTime(data.preset_short / 10)} + {'Add ' + formatTime(data.preset_short)} @@ -59,7 +59,7 @@ export const BrigTimer = (props) => { icon="hourglass-start" onClick={() => act('preset', { preset: 'medium' })} > - {'Add ' + formatTime(data.preset_medium / 10)} + {'Add ' + formatTime(data.preset_medium)} @@ -68,7 +68,7 @@ export const BrigTimer = (props) => { icon="hourglass-start" onClick={() => act('preset', { preset: 'long' })} > - {'Add ' + formatTime(data.preset_long / 10)} + {'Add ' + formatTime(data.preset_long)}