From aa5b3331482c2335ba0900aef4b1f4f46cf38a95 Mon Sep 17 00:00:00 2001 From: Snowy1237 <54201120+Snowy1237@users.noreply.github.com> Date: Fri, 22 Aug 2025 15:02:04 +0300 Subject: [PATCH] Assorted Bluespace Drive fixes, qol tweaks and additions (#21184) Touches up the Bluespace Drive control console UI to be more properly set up, fixes the knob element popup clipping outside the window, and adds a list showing the current amount of fuel moles in the drive and the distance to be jumped in tiles. Also adds a navigation console to the BSD chamber so the engineers roughly can see where they're jumping to and from. This is my first major contribution to Aurora unless I forgot something, so do tell me if I did anything improperly! New UI: image --- code/game/machinery/bluespace_drive.dm | 2 + html/changelogs/Snowy1237-BSDadditions.yml | 59 +++++++++++ maps/sccv_horizon/sccv_horizon.dmm | 3 + .../tgui/interfaces/BluespaceDrive.tsx | 100 ++++++++++-------- 4 files changed, 122 insertions(+), 42 deletions(-) create mode 100644 html/changelogs/Snowy1237-BSDadditions.yml diff --git a/code/game/machinery/bluespace_drive.dm b/code/game/machinery/bluespace_drive.dm index 895f6a60c5d..bd54d0339d4 100644 --- a/code/game/machinery/bluespace_drive.dm +++ b/code/game/machinery/bluespace_drive.dm @@ -524,6 +524,8 @@ data["charge"] = (linked_bluespace_drive.internal_gas.total_moles || linked_bluespace_drive.fuel_gas.total_moles) ? TRUE : FALSE data["rotation"] = linked_bluespace_drive.rotation data["jumping"] = linked_bluespace_drive.initiate_jump_timer_id ? TRUE : FALSE + data["jump_power"] = linked_bluespace_drive.power_from_gas / (10 KILO) + data["fuel_gas"] = linked_bluespace_drive.fuel_gas.total_moles return data diff --git a/html/changelogs/Snowy1237-BSDadditions.yml b/html/changelogs/Snowy1237-BSDadditions.yml new file mode 100644 index 00000000000..92f378db069 --- /dev/null +++ b/html/changelogs/Snowy1237-BSDadditions.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Snowy1237 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Overhauled the Bluespace Drive control UI to be generally nicer." + - rscadd: "Added a navigation console to the Bluespace Drive chamber and added more information to be displayed on the Bluespace Drive control UI." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 00dd8d4e0bc..9b1a0aae3a9 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -94730,6 +94730,9 @@ dir = 8 }, /obj/structure/lattice/catwalk/indoor, +/obj/machinery/computer/ship/navigation{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/engineering/bluespace_drive) "nxG" = ( diff --git a/tgui/packages/tgui/interfaces/BluespaceDrive.tsx b/tgui/packages/tgui/interfaces/BluespaceDrive.tsx index a04073b2797..5069aff880e 100644 --- a/tgui/packages/tgui/interfaces/BluespaceDrive.tsx +++ b/tgui/packages/tgui/interfaces/BluespaceDrive.tsx @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Button, Knob, LabeledControls } from '../components'; +import { Button, Knob, LabeledControls, Section, LabeledList } from '../components'; import { Window } from '../layouts'; import { BooleanLike } from '../../common/react'; @@ -8,53 +8,69 @@ export type BluespaceDriveData = { charge: BooleanLike; rotation: number; jumping: BooleanLike; + jump_power: number; + fuel_gas: number; }; export const BluespaceDrive = (props, context) => { const { act, data } = useBackend(context); return ( - + - - -