From 395e59a8a6c73b15787a272c535bb1c7a23c9849 Mon Sep 17 00:00:00 2001 From: MistChristmas Date: Mon, 13 Jan 2025 20:07:03 +0000 Subject: [PATCH 1/7] Update OverwatchConsole.jsx --- tgui/packages/tgui/interfaces/OverwatchConsole.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index ae8637e63c71..c00b2ada73c8 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -23,7 +23,7 @@ export const OverwatchConsole = (props) => { height={600} theme={data.theme ? data.theme : 'crtblue'} > - + {(!data.current_squad && ) || } From d4bb1c46670b4e93e3f53e17e9fb557e3d03e4fb Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Wed, 15 Jan 2025 12:56:18 +0000 Subject: [PATCH 2/7] doesn't let the crt effect behind --- .../tgui/interfaces/OverwatchConsole.jsx | 352 ++++++++++-------- 1 file changed, 188 insertions(+), 164 deletions(-) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index c00b2ada73c8..e5c8dbf90961 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -23,7 +23,7 @@ export const OverwatchConsole = (props) => { height={600} theme={data.theme ? data.theme : 'crtblue'} > - + {(!data.current_squad && ) || } @@ -402,174 +402,198 @@ const SquadMonitor = (props) => { } return ( -
- - {(showDeadMarines && ( - - )) || ( - - )} - {(showHiddenMarines && ( - - )) || ( - - )} - - - - } - > - setMarineSearch(value)} - /> - - - Name - Role - - State - - Location - - SL Dist. - - - - {squad_leader && ( - - - {(squad_leader.has_helmet && ( +
+ +
+ + {(showDeadMarines && ( - )) || {squad_leader.name} (NO HELMET)} - - {squad_leader.role} - - {squad_leader.state} - - {squad_leader.area_name} - - {squad_leader.distance} - - - - )} - {marines && - marines - .sort(sortByRole) - .filter((marine) => { - if (marineSearch) { - const searchableString = String(marine.name).toLowerCase(); - return searchableString.match(new RegExp(marineSearch, 'i')); - } - return marine; - }) - .map((marine, index) => { - if (squad_leader) { - if (marine.ref === squad_leader.ref) { - return; - } - } - if (hidden_marines.includes(marine.ref) && !showHiddenMarines) { - return; - } - if (marine.state === 'Dead' && !showDeadMarines) { - return; - } + )) || ( + + )} + {(showHiddenMarines && ( + + )) || ( + + )} + + + + } + > + setMarineSearch(value)} + /> +
+ + Name + Role + + State + + Location + + SL Dist. + + + + {squad_leader && ( + + + {(squad_leader.has_helmet && ( + + )) || ( + {squad_leader.name} (NO HELMET) + )} + + {squad_leader.role} + + {squad_leader.state} + + {squad_leader.area_name} + + {squad_leader.distance} + + + + )} + {marines && + marines + .sort(sortByRole) + .filter((marine) => { + if (marineSearch) { + const searchableString = String(marine.name).toLowerCase(); + return searchableString.match( + new RegExp(marineSearch, 'i'), + ); + } + return marine; + }) + .map((marine, index) => { + if (squad_leader) { + if (marine.ref === squad_leader.ref) { + return; + } + } + if ( + hidden_marines.includes(marine.ref) && + !showHiddenMarines + ) { + return; + } + if (marine.state === 'Dead' && !showDeadMarines) { + return; + } - return ( - - - {(marine.has_helmet && ( - + )) || ( + {marine.name} (NO HELMET) + )} + + {marine.role} + - {marine.name} - - )) || {marine.name} (NO HELMET)} - - {marine.role} - - {marine.state} - - {marine.area_name} - - {marine.distance} - - - {(hidden_marines.includes(marine.ref) && ( -
+ {marine.state} + + {marine.area_name} + + {marine.distance} + + + {(hidden_marines.includes(marine.ref) && ( +
+ ); }; From fa0366de5ceb1723133ed2ab78b4e2216ce7e503 Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Thu, 16 Jan 2025 00:32:25 +0000 Subject: [PATCH 3/7] without overspill this time --- .../tgui/interfaces/OverwatchConsole.jsx | 342 +++++++++--------- 1 file changed, 161 insertions(+), 181 deletions(-) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index e5c8dbf90961..b61e49196f13 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -402,198 +402,178 @@ const SquadMonitor = (props) => { } return ( -
- -
- - {(showDeadMarines && ( - - )) || ( - - )} - {(showHiddenMarines && ( - - )) || ( - - )} - - + {(showDeadMarines && ( + + )) || ( + + )} + {(showHiddenMarines && ( + + )) || ( + + )} + + + + } + > + setMarineSearch(value)} + /> +
+ + + Name + Role + + State + + Location + + SL Dist. + + + + {squad_leader && ( + + + {(squad_leader.has_helmet && ( + + )) || {squad_leader.name} (NO HELMET)} + + {squad_leader.role} + - Insubordination - - - } - > - setMarineSearch(value)} - /> -
- - Name - Role - - State + {squad_leader.state} - Location - - SL Dist. + {squad_leader.area_name} + + {squad_leader.distance} - + - {squad_leader && ( - - - {(squad_leader.has_helmet && ( - - )) || ( - {squad_leader.name} (NO HELMET) - )} - - {squad_leader.role} - - {squad_leader.state} - - {squad_leader.area_name} - - {squad_leader.distance} - - - - )} - {marines && - marines - .sort(sortByRole) - .filter((marine) => { - if (marineSearch) { - const searchableString = String(marine.name).toLowerCase(); - return searchableString.match( - new RegExp(marineSearch, 'i'), - ); - } - return marine; - }) - .map((marine, index) => { - if (squad_leader) { - if (marine.ref === squad_leader.ref) { - return; - } - } - if ( - hidden_marines.includes(marine.ref) && - !showHiddenMarines - ) { - return; - } - if (marine.state === 'Dead' && !showDeadMarines) { + )} + {marines && + marines + .sort(sortByRole) + .filter((marine) => { + if (marineSearch) { + const searchableString = String(marine.name).toLowerCase(); + return searchableString.match(new RegExp(marineSearch, 'i')); + } + return marine; + }) + .map((marine, index) => { + if (squad_leader) { + if (marine.ref === squad_leader.ref) { return; } + } + if (hidden_marines.includes(marine.ref) && !showHiddenMarines) { + return; + } + if (marine.state === 'Dead' && !showDeadMarines) { + return; + } - return ( - - - {(marine.has_helmet && ( - - )) || ( - {marine.name} (NO HELMET) - )} - - {marine.role} - - {marine.state} - - {marine.area_name} - - {marine.distance} - - - {(hidden_marines.includes(marine.ref) && ( - + )) || {marine.name} (NO HELMET)} + + {marine.role} + + {marine.state} + + {marine.area_name} + + {marine.distance} + + + {(hidden_marines.includes(marine.ref) && ( +
-
- + )) || ( +
); }; From 03143e62f9e1906bcc6fdaa5e291559b79a1cede Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Thu, 16 Jan 2025 04:21:08 +0000 Subject: [PATCH 4/7] Saves CRT + no weird overlap kinda --- .../tgui/interfaces/OverwatchConsole.jsx | 98 ++++++++++--------- 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index b61e49196f13..65b5a9ea0fef 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -79,47 +79,53 @@ const SquadPanel = (props) => { return ( <> - - - - - - - - - - setCategory('monitor')} - > - Squad Monitor - - {!!data.can_launch_crates && ( - setCategory('supply')} - > - Supply Drop - - )} - {!!data.can_launch_obs && ( - setCategory('ob')} - > - Orbital Bombardment - - )} - act('tacmap_unpin')}> - Tactical Map - - - {category === 'monitor' && } - {category === 'supply' && data.can_launch_crates && } - {category === 'ob' && data.can_launch_obs && } + + + + + + + + + + + + + + setCategory('monitor')} + > + Squad Monitor + + {!!data.can_launch_crates && ( + setCategory('supply')} + > + Supply Drop + + )} + {!!data.can_launch_obs && ( + setCategory('ob')} + > + Orbital Bombardment + + )} + act('tacmap_unpin')}> + Tactical Map + + + + {category === 'monitor' && } + {category === 'supply' && data.can_launch_crates && } + {category === 'ob' && data.can_launch_obs && } + ); }; @@ -403,7 +409,7 @@ const SquadMonitor = (props) => { return (
{ value={marineSearch} onInput={(e, value) => setMarineSearch(value)} /> -
+
Name @@ -595,7 +601,7 @@ const SupplyDrop = (props) => { } return ( -
+
@@ -647,6 +653,7 @@ const SupplyDrop = (props) => { +
); }; @@ -668,7 +675,7 @@ const OrbitalBombardment = (props) => { } return ( -
+
@@ -719,6 +726,7 @@ const OrbitalBombardment = (props) => { +
); }; From 05cad66720b6a137f26f3341681d6b63d485749c Mon Sep 17 00:00:00 2001 From: MistChristmas <7815982+MistChristmas@users.noreply.github.com> Date: Fri, 17 Jan 2025 07:15:04 +0000 Subject: [PATCH 5/7] Fixes layout issues on 515 --- .../tgui/interfaces/OverwatchConsole.jsx | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx index 65b5a9ea0fef..845ade552b75 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.jsx +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.jsx @@ -78,55 +78,55 @@ const SquadPanel = (props) => { const [category, setCategory] = useSharedState('selected', 'monitor'); return ( - <> - - - - - - - - - - - - - + + + + + + + + + + + + + + setCategory('monitor')} + > + Squad Monitor + + {!!data.can_launch_crates && ( setCategory('monitor')} + selected={category === 'supply'} + icon="wrench" + onClick={() => setCategory('supply')} > - Squad Monitor + Supply Drop - {!!data.can_launch_crates && ( - setCategory('supply')} - > - Supply Drop - - )} - {!!data.can_launch_obs && ( - setCategory('ob')} - > - Orbital Bombardment - - )} - act('tacmap_unpin')}> - Tactical Map + )} + {!!data.can_launch_obs && ( + setCategory('ob')} + > + Orbital Bombardment - - + )} + act('tacmap_unpin')}> + Tactical Map + + + + {category === 'monitor' && } {category === 'supply' && data.can_launch_crates && } {category === 'ob' && data.can_launch_obs && } - - + + ); }; @@ -247,7 +247,7 @@ const RoleTable = (props) => { } = data; return ( -
+
Squad Leader From 60726cbbc0cd63eac43c254dcd3758462527dd3a Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 17 Jan 2025 01:38:58 -0600 Subject: [PATCH 6/7] Fix linters not checking jsx --- tgui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/package.json b/tgui/package.json index 032f5c5c34d8..624b43ad7cc5 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -11,7 +11,7 @@ "tgui:bench": "webpack --env TGUI_BENCH=1 && node packages/tgui-bench/index.js", "tgui:build": "BROWSERSLIST_IGNORE_OLD_DATA=true webpack", "tgui:dev": "node --experimental-modules packages/tgui-dev-server/index.js", - "tgui:lint": "eslint packages --ext .js,.cjs,.ts,.tsx", + "tgui:lint": "eslint packages --ext .js,.jsx,.cjs,.ts,.tsx", "tgui:prettier": "prettier --check .", "tgui:sonar": "eslint packages -c .eslintrc-sonar.yml", "tgui:test": "jest --watch", From 3593fa379ae57cecf3054fd1333f792b139ea8bb Mon Sep 17 00:00:00 2001 From: Drulikar Date: Fri, 17 Jan 2025 01:39:45 -0600 Subject: [PATCH 7/7] Minor spelling mistake --- code/modules/admin/verbs/debug.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 41d4388fd70d..380efa3cfdf3 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -353,7 +353,7 @@ return if(byond_version < 516) - to_chat(src, SPAN_WARNING("You can only use this on 515!")) + to_chat(src, SPAN_WARNING("You can only use this on 516!")) return to_chat(src, SPAN_INFO("You can now right click to use inspect on browsers."))