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.

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

Station maps #13027

Merged
merged 45 commits into from
Apr 13, 2023
Merged

Conversation

metalgearsloth
Copy link
Contributor

@metalgearsloth metalgearsloth commented Dec 14, 2022

Generic system I primarily want to use for salvage expeditions but also intended to be used for:

  • crew monitoring
  • power
  • alerts (e.g. atmos alarms, beepsky)
  • station maps

image

In this PR I'm mainly looking at targeting crew monitoring and station maps.

🆑

  • add: Station maps have been added.

Edit:
Alright so I gave up on adding the tech and the cgraph because it would've taken me like an hour so this is as is until someone adds it. I'd also like delta diffs for the navmap state but ehhh it was kinda annoying to add so I'll do that later.

@github-actions github-actions bot added the Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design label Dec 14, 2022
@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Dec 15, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Dec 15, 2022

RSI Diff Bot; head commit 704b3cb merging into fc94d52
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/tablets.rsi

State Old New Status
generic Added
tablet Added
tabletsol Added

Resources/Textures/Structures/Machines/station_map.rsi

State Old New Status
station_map-panel Added
station_map0 Added
station_map_broken Added
station_map_frame0 Added
station_map_frame1 Added
station_map_frame2 Added
station_map_frame3 Added
unshaded Added

Edit: diff updated after 704b3cb

@github-actions github-actions bot added the Status: Needs Review This PR requires new reviews before it can be merged. label Dec 16, 2022
Copy link
Contributor

@Macoron Macoron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based

Content.Shared/Pinpointer/NavMapComponent.cs Show resolved Hide resolved
Content.Shared/Pinpointer/NavMapComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Pinpointer/NavMapComponent.cs Outdated Show resolved Hide resolved
nameLabel.MouseFilter = MouseFilterMode.Stop;

// Hide all others upon mouseover.
nameLabel.OnMouseEntered += args =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imo current UX with mouse hoover is a bit confusing. Maybe use toggles? Change selected dot color to green or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crew monitoring window itself needs a redesign so might leave it to later.

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Dec 30, 2022
# Conflicts:
#	Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
#	Content.Client/Shuttles/UI/DockingControl.cs
#	Content.Client/Shuttles/UI/RadarControl.cs
#	Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
#	Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
#	Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 4, 2023
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Mar 10, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@AJCM-git AJCM-git added the Status: Derelict This PR appears to be abandoned but might contain something that can be salvaged. label Mar 15, 2023
# Conflicts:
#	Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
#	Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
#	Content.Client/Shuttles/UI/RadarControl.cs
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Apr 13, 2023
@metalgearsloth metalgearsloth merged commit be4e69b into space-wizards:master Apr 13, 2023
11 checks passed
@metalgearsloth metalgearsloth deleted the 2022-12-12-nav-map branch April 13, 2023 06:21
rbertoche pushed a commit to rbertoche/space-station-14 that referenced this pull request May 19, 2023
sampletestboy2 pushed a commit to sampletestboy2/space-station-14 that referenced this pull request Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Changes: UI Can be reviewed or fixed by people who are knowledgeable with UI design Status: Derelict This PR appears to be abandoned but might contain something that can be salvaged. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants