Skip to content

Commit

Permalink
minor tacmap ui change (#5264)
Browse files Browse the repository at this point in the history
# About the pull request
it's kind of been bothering me for a bit, just some minor tacmap ui
changes.

# Explain why it's good for the game

I got ocd, please merge. 

# Testing Photographs and Procedure
<img width="534" alt="Screen Shot 2023-12-20 at 3 24 17 PM"
src="https://github.com/cmss13-devs/cmss13/assets/122310258/72b17b85-0453-49cc-94a7-dfe944b3cbb7">

<img width="389" alt="Screen Shot 2023-12-20 at 3 27 20 PM"
src="https://github.com/cmss13-devs/cmss13/assets/122310258/6f87f439-b8b8-4167-9bd3-c98af2fc8b2f">

# Changelog
:cl:
ui: tacmap ui tweaks
/:cl:
  • Loading branch information
Cthulhu80 authored Dec 21, 2023
1 parent 3ca6df6 commit 002062e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions code/controllers/subsystem/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -826,9 +826,9 @@ SUBSYSTEM_DEF(minimaps)
faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE
var/drawing_allowed = !is_observer && can_draw(faction, user)

switch(action)
if("menuSelect")
if(params["selection"] != "new canvas")
switch (action)
if ("menuSelect")
if(params["selection"] != "Canvas")
if(updated_canvas)
updated_canvas = FALSE
toolbar_updated_selection = toolbar_color_selection // doing this if it == canvas can cause a latency issue with the stroke.
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/interfaces/TacticalMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ interface TacMapProps {

const PAGES = [
{
title: 'tacmap',
title: 'Live Tacmap',
canOpen: (data) => {
return 1;
},
Expand All @@ -42,7 +42,7 @@ const PAGES = [
},
},
{
title: 'old canvas',
title: 'Map View',
canOpen: (data) => {
return 1;
},
Expand All @@ -53,7 +53,7 @@ const PAGES = [
},
},
{
title: 'new canvas',
title: 'Canvas',
canOpen: (data) => {
return data.tacmapReady;
},
Expand Down

0 comments on commit 002062e

Please sign in to comment.