Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor tacmap ui change #5264

Merged
merged 3 commits into from Dec 21, 2023
Merged

minor tacmap ui change #5264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32b60fe
ui fiddle
Dec 20, 2023
9bca4b7
modify hardcoded value
Dec 21, 2023
cd6e1cc
Merge branch 'master' into tacmap-ref
Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/controllers/subsystem/minimap.dm
View file
Open in desktop
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
View file
Open in desktop
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