From deccd5ad17cfacb6a0700a4e84f18e94bcbcdcb8 Mon Sep 17 00:00:00 2001 From: Kyep Date: Sun, 5 Jul 2020 01:32:41 -0700 Subject: [PATCH] addresses comments --- code/modules/station_goals/bsa.dm | 14 ++++--- .../interfaces/BlueSpaceArtilleryControl.js | 41 ++++++++++++------- tgui/packages/tgui/public/tgui.bundle.js | 6 +-- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 054bed56478..eb67b8c281a 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -336,13 +336,15 @@ /obj/machinery/computer/bsa_control/tgui_act(action, params) if(..()) return - if(action == "build") - cannon = deploy() - if(action == "fire") - fire(usr) - if(action == "recalibrate") - calibrate(usr) + switch(action) + if("build") + cannon = deploy() + if("fire") + fire(usr) + if("recalibrate") + calibrate(usr) update_icon() + return TRUE /obj/machinery/computer/bsa_control/proc/calibrate(mob/user) var/list/gps_locators = list() diff --git a/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js b/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js index 670c832946f..6cfdcee0137 100644 --- a/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js +++ b/tgui/packages/tgui/interfaces/BlueSpaceArtilleryControl.js @@ -4,6 +4,26 @@ import { Window } from "../layouts"; export const BlueSpaceArtilleryControl = (props, context) => { const { act, data } = useBackend(context); + let alertStatus; + if (data.ready) { + alertStatus = ( + + Ready + + ); + } else if (data.reloadtime_text) { + alertStatus = ( + + {data.reloadtime_text} + + ); + } else { + alertStatus = ( + + No cannon connected! + + ); + } return ( @@ -23,27 +43,18 @@ export const BlueSpaceArtilleryControl = (props, context) => { {data.ready === 1 && !!data.target && (