such immense suffering.

cmss13-devs · Sep 27, 2023 · 79d20d2 · 79d20d2
1 parent 2329406
commit 79d20d2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -891,7 +891,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
 	specialty = "M10 pattern captain"
 	flags_atom = NO_SNOW_TYPE
-	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security)
+	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced, new /obj/item/device/helmet_visor/security,  new /obj/item/device/helmet_visor/tactical_map_visor)
 
 /obj/item/clothing/head/helmet/marine/MP
 	name = "\improper M10 pattern MP helmet"
@@ -915,7 +915,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
 	icon_state = "helmet"
 	item_state = "helmet"
 	specialty = "M10 pattern officer"
-	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced)
+	built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced,  new /obj/item/device/helmet_visor/tactical_map_visor)
 
 /obj/item/clothing/head/helmet/marine/mp/provost/marshal
 	name = "\improper Provost Marshal Cap"

diff --git a/tgui/packages/tgui/interfaces/CanvasLayer.js b/tgui/packages/tgui/interfaces/CanvasLayer.js
@@ -92,7 +92,7 @@ export class CanvasLayer extends Component {
         this.lastY,
         x,
         y,
-        this.state.selection,
+        this.ctx.strokeStyle,
       ]);
     }
 
@@ -133,11 +133,12 @@ export class CanvasLayer extends Component {
       if (this.lineStack.length === 0) {
         return;
       }
-      const line = this.lineStack[this.lineStack.length - 1];
 
-      // selects last color before line is yeeted, this is buggy sometimes.
+      const line = this.lineStack.pop();
+      if (line.length === 0) {
+        return;
+      }
       const prevColor = line[0][4];
-      this.lineStack.pop();
 
       this.ctx.clearRect(
         0,

diff --git a/tgui/packages/tgui/interfaces/TacticalMap.tsx b/tgui/packages/tgui/interfaces/TacticalMap.tsx
@@ -135,17 +135,21 @@ export const TacticalMap = (props, context) => {
 
 const ViewMapPanel = (props, context) => {
   const { data } = useBackend<TacMapProps>(context);
+
+  //byond ui can't resist trying to render
+  if (data.canViewHome !== 1) {
+    return <OldMapPanel {...props} context={context} />;
+  }
+
   return (
     <Section fill>
-      {data.canViewHome === 1 && (
-        <ByondUi
-          params={{
-            id: data.mapRef,
-            type: 'map',
-          }}
-          class="TacticalMap"
-        />
-      )}
+      <ByondUi
+        params={{
+          id: data.mapRef,
+          type: 'map',
+        }}
+        class="TacticalMap"
+      />
     </Section>
   );
 };