From cbbbc0d5d34f454c5fc3eaa6b0067e74db1cb86a Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 15 Aug 2020 23:04:33 +0200
Subject: [PATCH] [MIRROR] Small TGUI tweaks and fixes (#353)
* Small TGUI tweaks and fixes (#52955)
* LaborClaimConsole cleanup
* UI tweaks
* Small TGUI tweaks and fixes
Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
---
.../machinery/porta_turret/portable_turret.dm | 2 +-
.../objects/items/devices/transfer_valve.dm | 6 +-
code/modules/mining/laborcamp/laborstacker.dm | 59 +++++++++--------
tgui/packages/tgui/interfaces/BankMachine.js | 18 +++---
.../tgui/interfaces/GravityGenerator.js | 2 +-
.../tgui/interfaces/LaborClaimConsole.js | 2 +-
.../tgui/interfaces/PortableTurret.js | 10 +--
.../tgui/interfaces/ProbingConsole.js | 4 +-
.../packages/tgui/interfaces/TransferValve.js | 63 +++++++++----------
.../packages/tgui/interfaces/TurretControl.js | 2 +-
.../packages/tgui/public/tgui-common.chunk.js | 2 +-
tgui/packages/tgui/public/tgui.bundle.js | 2 +-
12 files changed, 90 insertions(+), 82 deletions(-)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 1e8bc23e069..582905a28db 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -206,7 +206,7 @@
"neutralize_unidentified" = turret_flags & TURRET_FLAG_SHOOT_ANOMALOUS,
"neutralize_nonmindshielded" = turret_flags & TURRET_FLAG_SHOOT_UNSHIELDED,
"neutralize_cyborgs" = turret_flags & TURRET_FLAG_SHOOT_BORGS,
- "ignore_heads" = turret_flags & TURRET_FLAG_SHOOT_HEADS,
+ "neutralize_heads" = turret_flags & TURRET_FLAG_SHOOT_HEADS,
"manual_control" = manual_control,
"silicon_user" = FALSE,
"allow_manual_control" = FALSE,
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index cc26d390ee2..9435089a15a 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -203,9 +203,9 @@
/obj/item/transfer_valve/ui_data(mob/user)
var/list/data = list()
- data["tank_one"] = tank_one
- data["tank_two"] = tank_two
- data["attached_device"] = attached_device
+ data["tank_one"] = tank_one ? tank_one.name : null
+ data["tank_two"] = tank_two ? tank_two.name : null
+ data["attached_device"] = attached_device ? attached_device.name : null
data["valve"] = valve_open
return data
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index c9510cdbd15..94b92ec8139 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -8,12 +8,12 @@ GLOBAL_LIST(labor_sheet_values)
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = FALSE
-
+ /// Connected stacking machine
var/obj/machinery/mineral/stacking_machine/laborstacker/stacking_machine = null
+ /// Direction of the stacking machine
var/machinedir = SOUTH
- var/obj/machinery/door/airlock/release_door
- var/door_tag = "prisonshuttle"
- var/obj/item/radio/Radio //needed to send messages to sec radio
+ /// Needed to send messages to sec radio
+ var/obj/item/radio/Radio
/obj/machinery/mineral/labor_claim_console/Initialize()
. = ..()
@@ -39,12 +39,18 @@ GLOBAL_LIST(labor_sheet_values)
ui = new(user, src, "LaborClaimConsole", name)
ui.open()
+/obj/machinery/mineral/labor_claim_console/ui_static_data(mob/user)
+ var/list/data = list()
+ data["ores"] = GLOB.labor_sheet_values
+ return data
+
/obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
var/list/data = list()
var/can_go_home = FALSE
- data["emagged"] = (obj_flags & EMAGGED) ? 1 : 0
+ data["emagged"] = FALSE
if(obj_flags & EMAGGED)
+ data["emagged"] = TRUE
can_go_home = TRUE
var/obj/item/card/id/I = user.get_idcard(TRUE)
@@ -63,43 +69,42 @@ GLOBAL_LIST(labor_sheet_values)
if(stacking_machine)
data["unclaimed_points"] = stacking_machine.points
- data["ores"] = GLOB.labor_sheet_values
data["can_go_home"] = can_go_home
-
return data
/obj/machinery/mineral/labor_claim_console/ui_act(action, params)
if(..())
return
+
+ var/mob/M = usr
switch(action)
if("claim_points")
- var/mob/M = usr
var/obj/item/card/id/I = M.get_idcard(TRUE)
if(istype(I, /obj/item/card/id/prisoner))
var/obj/item/card/id/prisoner/P = I
P.points += stacking_machine.points
stacking_machine.points = 0
- to_chat(usr, "Points transferred.")
- . = TRUE
+ to_chat(M, "Points transferred.")
+ return TRUE
else
- to_chat(usr, "No valid id for point transfer detected.")
+ to_chat(M, "No valid id for point transfer detected.")
if("move_shuttle")
- if(!alone_in_area(get_area(src), usr))
- to_chat(usr, "Prisoners are only allowed to be released while alone.")
- else
- switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
- if(1)
- to_chat(usr, "Shuttle not found.")
- if(2)
- to_chat(usr, "Shuttle already at station.")
- if(3)
- to_chat(usr, "No permission to dock could be granted.")
- else
- if(!(obj_flags & EMAGGED))
- Radio.set_frequency(FREQ_SECURITY)
- Radio.talk_into(src, "A prisoner has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY)
- to_chat(usr, "Shuttle received message and will be sent shortly.")
- . = TRUE
+ if(!alone_in_area(get_area(src), M))
+ to_chat(M, "Prisoners are only allowed to be released while alone.")
+ return
+ switch(SSshuttle.moveShuttle("laborcamp", "laborcamp_home", TRUE))
+ if(1)
+ to_chat(M, "Shuttle not found.")
+ if(2)
+ to_chat(M, "Shuttle already at station.")
+ if(3)
+ to_chat(M, "No permission to dock could be granted.")
+ else
+ if(!(obj_flags & EMAGGED))
+ Radio.set_frequency(FREQ_SECURITY)
+ Radio.talk_into(src, "A prisoner has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY)
+ to_chat(M, "Shuttle received message and will be sent shortly.")
+ return TRUE
/obj/machinery/mineral/labor_claim_console/proc/locate_stacking_machine()
stacking_machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir))
diff --git a/tgui/packages/tgui/interfaces/BankMachine.js b/tgui/packages/tgui/interfaces/BankMachine.js
index f77fa087dc3..8aa607b8c92 100644
--- a/tgui/packages/tgui/interfaces/BankMachine.js
+++ b/tgui/packages/tgui/interfaces/BankMachine.js
@@ -1,5 +1,6 @@
import { useBackend } from '../backend';
-import { Button, LabeledList, NoticeBox, Section } from '../components';
+import { AnimatedNumber, Button, LabeledList, NoticeBox, Section } from '../components';
+import { formatMoney } from '../format';
import { Window } from '../layouts';
export const BankMachine = (props, context) => {
@@ -11,9 +12,12 @@ export const BankMachine = (props, context) => {
} = data;
return (
+ width={350}
+ height={155}>
+
+ Authorized personnel only
+
{
selected={siphoning}
onClick={() => act(siphoning ? 'halt' : 'siphon')} />
)}>
- {current_balance + ' cr'}
+ formatMoney(value)} />
+ {' cr'}
-
- Authorized personnel only
-
);
diff --git a/tgui/packages/tgui/interfaces/GravityGenerator.js b/tgui/packages/tgui/interfaces/GravityGenerator.js
index 5c6499cf542..02ab06a6fe1 100644
--- a/tgui/packages/tgui/interfaces/GravityGenerator.js
+++ b/tgui/packages/tgui/interfaces/GravityGenerator.js
@@ -11,7 +11,7 @@ export const GravityGenerator = (props, context) => {
return (
+ height={155}>
{!operational && (
diff --git a/tgui/packages/tgui/interfaces/LaborClaimConsole.js b/tgui/packages/tgui/interfaces/LaborClaimConsole.js
index 5483b1dd70a..4b539685069 100644
--- a/tgui/packages/tgui/interfaces/LaborClaimConsole.js
+++ b/tgui/packages/tgui/interfaces/LaborClaimConsole.js
@@ -15,7 +15,7 @@ export const LaborClaimConsole = (props, context) => {
return (
+ height={440}>
diff --git a/tgui/packages/tgui/interfaces/PortableTurret.js b/tgui/packages/tgui/interfaces/PortableTurret.js
index bb6700743c1..fefb317b923 100644
--- a/tgui/packages/tgui/interfaces/PortableTurret.js
+++ b/tgui/packages/tgui/interfaces/PortableTurret.js
@@ -15,15 +15,15 @@ export const PortableTurret = (props, context) => {
neutralize_unidentified,
neutralize_nonmindshielded,
neutralize_cyborgs,
- ignore_heads,
+ neutralize_heads,
manual_control,
allow_manual_control,
lasertag_turret,
} = data;
return (
+ width={310}
+ height={lasertag_turret ? 110 : 292}>
Swipe an ID card to {locked ? 'unlock' : 'lock'} this interface.
@@ -58,8 +58,8 @@ export const PortableTurret = (props, context) => {
title="Target Settings"
buttons={(
act('shootheads')} />
)}>
diff --git a/tgui/packages/tgui/interfaces/ProbingConsole.js b/tgui/packages/tgui/interfaces/ProbingConsole.js
index 4115be4e4b0..bbc35d911be 100644
--- a/tgui/packages/tgui/interfaces/ProbingConsole.js
+++ b/tgui/packages/tgui/interfaces/ProbingConsole.js
@@ -47,8 +47,8 @@ export const ProbingConsole = (props, context) => {
{occupant_status === 3
? 'Deceased'
: occupant_status === 2
- ? 'Unconcious'
- : 'Concious'}
+ ? 'Unconscious'
+ : 'Conscious'}