- {{:helper.link('Overall info', 'note', {'state' :'status'}, null, data.state == 'status' ? 'selected' : null)}}
- {{:helper.link('Details', 'note', {'state' : 'engines'}, null, data.state == 'engines' ? 'selected' : null)}}
-
-
-
- Engine #{{:(index + 1)}}:
-
-
- {{:helper.link(value.eng_on ? 'Shutdown' : 'Power up', 'power', { 'toggle' : 1, 'engine' : value.eng_reference }, null, value.eng_on ? value.eng_on == 1 ? 'linkOn' : 'yellowButton' : null)}}
-
-
-
-
- Type:
-
-
- {{:value.eng_type}}
-
-
-
-
- Status:
-
-
- {{:value.eng_on ? value.eng_on == 1 ? 'Online' : 'Booting' : 'Offline'}}
- {{:value.eng_status}}
-
-
-
-
- Current thrust:
-
-
- {{:value.eng_thrust}}
-
-
-
-
- Volume limit:
-
-
- {{:helper.link('', 'circle-plus', { 'limit' : 0.1, 'engine' : value.eng_reference }, null, null)}}
- {{:helper.link(value.eng_thrust_limiter+'%', null, { 'set_limit' : 1, 'engine' : value.eng_reference }, null, null)}}
- {{:helper.link('', 'circle-minus', { 'limit' : -0.1, 'engine' : value.eng_reference }, null, null)}}
-
-
-
- {{/for}}
- {{/if}}
-{{/if}}
-{{if data.state == "status"}}
- {{if data.engines_info}}
- {{for data.engines_info}}
-
-
-
- Engine #{{:(index + 1)}}:
-
-
- {{:helper.link(value.eng_on ? 'Shutdown' : 'Power up', 'power', { 'toggle' : 1, 'engine' : value.eng_reference }, null, value.eng_on ? value.eng_on == 1 ? 'linkOn' : 'yellowButton' : null)}}
-
-
-
-
- Thrust:
-
- Volume limit:
-
-
- {{:value.eng_thrust}}
-
- {{:value.eng_thrust_limiter}}%
-
-
-
- {{/for}}
- {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/nano/templates/helm.tmpl b/nano/templates/helm.tmpl
deleted file mode 100644
index 2d371b1154..0000000000
--- a/nano/templates/helm.tmpl
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Navigation data
-
-
- Location:
-
-
- {{:data.sector}}
-
-
-
-
- Coordinates:
-
-
- {{:data.s_x}} : {{:data.s_y}}
-
-
-
-
- Scan data:
-
-
- {{:data.sector_info}}
-
-
-
-
- Status:
-
-
- {{:data.landed}}
-
-
-
- {{:helper.link('Save current position', 'disk', { 'add' : 'current' }, null)}}
- {{:helper.link('Add new entry', 'document', { 'add' : 'new' }, null)}}
-
-
-
- | Name | Coordinates | Actions
- {{for data.locations}}
- |
|---|
| {{:value.name}}
- | {{:value.x}} : {{:value.y}}
- | {{:helper.link('Plot course', 'arrowreturnthick-1-e', { 'x' : value.x, 'y' : value.y }, null, null)}}
- {{:helper.link('Remove', 'close', { 'remove' : value.reference }, null, null)}}
- {{/for}}
- |
-
-
-
-
\ No newline at end of file
diff --git a/nano/templates/nav.tmpl b/nano/templates/nav.tmpl
deleted file mode 100644
index 6b5f5a9628..0000000000
--- a/nano/templates/nav.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-
Navigation
-
-
-
-
- Map view
- {{:helper.link(data.viewing ? 'Engaged' : 'Disengaged', 'shuffle', { 'viewing' : 1 }, null, data.viewing ? 'selected' : null)}}
-
-
-
-
-
-
Sector information
-
- {{:data.sector}}
-
- Coordinates: {{:data.s_x}} : {{:data.s_y}}
-
- Additional information: {{:data.sector_info}}
-
-
-
-
-
Flight data
-
-
-
- ETA to next grid:
-
-
- {{:data.ETAnext}}
-
-
-
-
- Speed:
-
-
- {{:data.speed}} Gm/h
-
-
-
-
- Acceleration:
-
-
- {{:data.accel}} Gm/h
-
-
-
-
- Heading:
-
-
- {{:data.heading}}°
-
-
-
-
\ No newline at end of file
diff --git a/nano/templates/shipsensors.tmpl b/nano/templates/shipsensors.tmpl
deleted file mode 100644
index 5931fd01b2..0000000000
--- a/nano/templates/shipsensors.tmpl
+++ /dev/null
@@ -1,90 +0,0 @@
-
Sensors control console
-
- {{:helper.link(data.on ? 'Switch off' : 'Switch on', 'gear', { 'toggle' : 1 }, data.status != 'MISSING' ? null : 'disabled', data.on ? 'selected' : null)}}
-
-
- Status:
-
-
- {{:data.status}}
-
-
-
-
- Range:
-
-
- {{:helper.link(data.range, null, { 'range' : 1 }, null, null)}}
-
-
-
-
-
-
- Integrity:
-
-
- {{if data.health < (data.max_health * 0.25)}}
- {{:helper.displayBar(data.health, 0, data.max_health, 'bad')}}
-
{{:data.health}}/{{:data.max_health}}
- {{else data.health < data.max_health *.75}}
- {{:helper.displayBar(data.health, 0, data.max_health, 'average')}}
-
{{:data.health}}/{{:data.max_health}}
- {{else}}
- {{:helper.displayBar(data.health, 0, data.max_health, 'good')}}
-
{{:data.health}}/{{:data.max_health}}
- {{/if}}
-
-
-
-
- Temperature:
-
-
- {{if data.heat < (data.critical_heat * 0.5)}}
- {{:helper.displayBar(data.heat, 0, data.critical_heat, 'good')}}
- {{else data.heat < (data.critical_heat * 0.75)}}
- {{:helper.displayBar(data.heat, 0, data.critical_heat, 'average')}}
- {{else}}
- {{:helper.displayBar(data.heat, 0, data.critical_heat, 'bad')}}
- {{/if}}
-
-
- {{if data.heat < (data.critical_heat * 0.5)}}
- Temperature low.
- {{else data.heat < (data.critical_heat * 0.75)}}
- Sensor temperature high!
- {{else}}
- TEMPERATURE CRITICAL: Disable or reduce power immediately!
- {{/if}}
-
-
-
-
-
-
- Sector map view
- {{:helper.link(data.viewing ? 'Engaged' : 'Disengaged', 'shuffle', { 'viewing' : 1 }, null, data.viewing ? 'selected' : null)}}
-
-
-
-
Sensor contacts
-
-{{if data.contacts}}
-
- {{for data.contacts}}
-
-
-
{{:helper.link('Scan', 'search' ,{ 'scan' : value.ref }, null, null)}} |
- {{:value.name}}, bearing {{:value.bearing}} |
-
-
- {{/for}}
-
-{{/if}}
-
-{{if data.status == 'MISSING'}}
-
- {{:helper.link('Link up with the sensor suite', 'gear', { 'link' : 1 }, data.status == 'MISSING' ? null : 'disabled', null)}}
-
-{{/if}}
diff --git a/tgui/packages/tgui/interfaces/NtosOvermapNavigation.js b/tgui/packages/tgui/interfaces/NtosOvermapNavigation.js
new file mode 100644
index 0000000000..eb3dbe06f0
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NtosOvermapNavigation.js
@@ -0,0 +1,15 @@
+import { NtosWindow } from '../layouts';
+import { OvermapNavigationContent } from './OvermapNavigation';
+
+export const NtosOvermapNavigation = () => {
+ return (
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/OvermapDisperser.js b/tgui/packages/tgui/interfaces/OvermapDisperser.js
new file mode 100644
index 0000000000..7f231bcb3a
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/OvermapDisperser.js
@@ -0,0 +1,129 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, ProgressBar, Section, Table, AnimatedNumber } from "../components";
+import { Window } from "../layouts";
+import { OvermapPanControls } from './common/Overmap';
+
+export const OvermapDisperser = (props, context) => {
+ return (
+
+
+
+
+
+ );
+};
+
+const OvermapDisperserContent = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ faillink,
+ calibration,
+ overmapdir,
+ cal_accuracy,
+ strength,
+ range,
+ next_shot,
+ nopower,
+ skill,
+ chargeload,
+ } = data;
+
+ if (faillink) {
+ return (
+
+ Machine is incomplete, out of range, or misaligned!
+
+ );
+ }
+
+ return (
+
+
+
+ val === overmapdir} />
+
+
+
+
+
+ {nopower && (
+
+ At least one part of the machine is unpowered.
+
+ ) || null}
+
+ {chargeload}
+
+
+ {next_shot === 0 && (
+ Ready
+ ) || next_shot > 1 && (
+
+ Seconds
+ Warning: Do not fire during cooldown.
+
+ ) || null}
+
+
+
+
+
+
+ %
+
+
+ {calibration.map((cal, i) => (
+
+ Cal #{i}:
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/tgui/packages/tgui/interfaces/OvermapEngines.js b/tgui/packages/tgui/interfaces/OvermapEngines.js
new file mode 100644
index 0000000000..5dd80a8b70
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/OvermapEngines.js
@@ -0,0 +1,110 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, ProgressBar, Section, AnimatedNumber, Collapsible } from "../components";
+import { Window } from "../layouts";
+
+export const OvermapEngines = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ global_state, // This indicates all engines being powered up or not
+ global_limit, // Global Thrust limit
+ engines_info, // Array of engines
+ total_thrust, // Total thrust of all engines together
+ } = data;
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {engines_info.map((engine, i) => (
+
+
+
+ Engine #{i + 1} |
+ Thrust: |
+ Limit: val + "%"} />
+
+ // "Engine " + (i + 1)
+ // + " | Thrust: " + engine.eng_thrust
+ // + " | Limit: " + engine.eng_thrust_limiter + "%"
+ )}>
+
+
+
+ {engine.eng_type}
+
+
+
+ {engine.eng_on ? (engine.eng_on === 1 ? "Online" : "Booting") : "Offline"}
+
+ {engine.eng_status.map(status => {
+ if (Array.isArray(status)) {
+ return {status[0]};
+ } else {
+ return {status};
+ }
+ })}
+
+
+ {engine.eng_thrust}
+
+
+
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/tgui/packages/tgui/interfaces/OvermapHelm.js b/tgui/packages/tgui/interfaces/OvermapHelm.js
new file mode 100644
index 0000000000..0ddd5112d6
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/OvermapHelm.js
@@ -0,0 +1,235 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, ProgressBar, Section, Table } from "../components";
+import { Window } from "../layouts";
+import { OvermapFlightData, OvermapPanControls } from './common/Overmap';
+
+export const OvermapHelm = (props, context) => {
+ const { act, data } = useBackend(context);
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export const OvermapFlightDataWrap = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ // While, yes, this is a strange choice to use fieldset over Section
+ // just look at how pretty the legend is, sticking partially through the border ;///;
+ return (
+
+ );
+};
+
+const OvermapManualControl = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const {
+ canburn,
+ manual_control,
+ } = data;
+
+ return (
+
+ );
+};
+
+const OvermapAutopilot = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ dest,
+ d_x,
+ d_y,
+ speedlimit,
+ autopilot,
+ autopilot_disabled,
+ } = data;
+
+ if (autopilot_disabled) {
+ return (
+
+ );
+ }
+
+ return (
+
+ );
+};
+
+const OvermapNavComputer = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const {
+ sector,
+ s_x,
+ s_y,
+ sector_info,
+ landed,
+ locations,
+ } = data;
+
+ return (
+
+
+
+ {sector}
+
+
+ {s_x} : {s_y}
+
+
+ {sector_info}
+
+
+ {landed}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+ Coordinates
+ Actions
+
+ {locations.map(loc => (
+
+ {loc.name}
+ {loc.x} : {loc.y}
+
+
+
+
+
+ ))}
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/tgui/packages/tgui/interfaces/OvermapNavigation.js b/tgui/packages/tgui/interfaces/OvermapNavigation.js
new file mode 100644
index 0000000000..48215060ab
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/OvermapNavigation.js
@@ -0,0 +1,54 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, ProgressBar, Section } from "../components";
+import { Window } from "../layouts";
+import { OvermapFlightData } from "./common/Overmap";
+
+export const OvermapNavigation = (props, context) => {
+ return (
+
+
+
+
+
+ );
+};
+
+export const OvermapNavigationContent = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ sector,
+ s_x,
+ s_y,
+ sector_info,
+ viewing,
+ } = data;
+ return (
+
+ act("viewing")}>
+ Map View
+
+ }>
+
+
+ {sector}
+
+
+ {s_x} : {s_y}
+
+
+ {sector_info}
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/OvermapShipSensors.js b/tgui/packages/tgui/interfaces/OvermapShipSensors.js
new file mode 100644
index 0000000000..980b27446e
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/OvermapShipSensors.js
@@ -0,0 +1,111 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend } from "../backend";
+import { Box, Button, Flex, Icon, LabeledList, ProgressBar, Section } from "../components";
+import { Window } from "../layouts";
+
+export const OvermapShipSensors = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ viewing,
+ on,
+ range,
+ health,
+ max_health,
+ heat,
+ critical_heat,
+ status,
+ contacts,
+ } = data;
+
+ return (
+
+
+
+
+
+
+ )}>
+
+
+ {status}
+
+
+
+
+
+
+ {health} / {max_health}
+
+
+
+
+ {heat < critical_heat * 0.5 && (
+ Temperature low.
+ ) || heat < critical_heat * 0.75 && (
+ Sensor temperature high!
+ ) || (
+ TEMPERATURE CRITICAL: Disable or reduce power immediately!
+ )}
+
+
+
+
+
+ {contacts.length && contacts.map(alien => (
+
+ )) || (
+
+ No contacts on sensors.
+
+ )}
+
+ {data.status === "MISSING" && (
+
+
+
+ ) || null}
+
+
+ );
+};
\ No newline at end of file
diff --git a/tgui/packages/tgui/interfaces/common/Overmap.js b/tgui/packages/tgui/interfaces/common/Overmap.js
new file mode 100644
index 0000000000..17a2b2cfee
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/common/Overmap.js
@@ -0,0 +1,117 @@
+import { round } from 'common/math';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from "../../backend";
+import { Box, Button, Flex, Icon, LabeledList, ProgressBar, Section, Table } from "../../components";
+
+export const OvermapFlightData = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const {
+ disableLimiterControls,
+ } = props;
+
+ const {
+ ETAnext,
+ speed,
+ speed_color,
+ accel,
+ heading,
+ accellimit,
+ } = data;
+
+ // While, yes, this is a strange choice to use fieldset over Section
+ // just look at how pretty the legend is, sticking partially through the border ;///;
+ return (
+
+
+ {ETAnext}
+
+
+ {speed} Gm/h
+
+
+ {accel} Gm/h
+
+
+ {heading}°
+
+ {!disableLimiterControls && (
+
+
+
+ ) || null}
+
+ );
+};
+
+export const OvermapPanControls = (props, context) => {
+ const { act } = useBackend(context);
+
+ const {
+ disabled,
+ actToDo,
+ selected = val => false,
+ } = props;
+
+ return (
+
+
+
+
+
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/vorestation.dme b/vorestation.dme
index 04ed3b7f86..c860cdab61 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2901,7 +2901,6 @@
#include "code\modules\modular_computers\file_system\programs\security\alarm_monitor.dm"
#include "code\modules\modular_computers\file_system\programs\security\digitalwarrant.dm"
#include "code\modules\modular_computers\file_system\programs\ships\navigation.dm"
-#include "code\modules\modular_computers\file_system\programs\ships\ship.dm"
#include "code\modules\modular_computers\hardware\_hardware.dm"
#include "code\modules\modular_computers\hardware\battery_module.dm"
#include "code\modules\modular_computers\hardware\card_slot.dm"
@@ -3497,6 +3496,7 @@
#include "code\modules\tgui\modules\atmos_control.dm"
#include "code\modules\tgui\modules\camera.dm"
#include "code\modules\tgui\modules\crew_monitor.dm"
+#include "code\modules\tgui\modules\overmap.dm"
#include "code\modules\tgui\modules\power_monitor.dm"
#include "code\modules\tgui\modules\rcon.dm"
#include "code\modules\tgui\modules\shutoff_monitor.dm"