Commit graph

13 commits

Author SHA1 Message Date
Morb0
c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-12-24 20:02:16 +03:00
chromiumboy
1de682e23f
Power monitoring console overhaul (#20927)
* Prototyping whole station wire map

* More prototyping

* Added icons for the different power distributors and toggleable cable displays

* Power cable layouts are now only sent to the client when the power monitor is open

* UI prototyping

* Power monitors can now see the sprites of distant entities, long entity names are truncated

* Updated how network devices are added to the player's PVS

* More feature prototypes

* Added source / load symbols

* Final prototype! Time to actually code it properly...

* Start of code clean up

* Continuing code clean up

* Fixed UI appearance

* Code clean up complete

* Removed unnecessary changes

* Updated how power values are calculated, added UI warnings for power sinks and power net checks

* Updated how power values are calculated again, added support for portable generators

* Removed unnecessary files

* Map beacons start toggled off, console map now works outside the station, fixed substation icon

* Made some of Sloth's requested changes. Power distributors don't blink anymore, unless selected

* Moved a number of static variables in PowerMonitoringHelper to sensible places in the main files. Added a NavMapTrackableComponent so that you can specify how individual entities appear on the navmap

* Updated the colors/positions of HV cables and SMESes to improve contrast

* Fixed SMES color in map legend

* Partially fixed auto-scrolling on device selection, made sublists alphabetical

* Changed how auto-scroll is handled

* Changed the font color of the console warning messages

* Reduced the font size of beacon labels

* Added the station name to the console

* Organized references

* Removed unwanted changes to RobustToolbox

* Fix merge conflict

* Fix merge conflict, maybe

* Fix merge conflict

* Updated outdated reference

* Fixed portable_generator.yml

* Implemented a number of requested changes, move bit masks to a shared component

* Navigate listings via the navmap

* First attempt at improving efficiency

* Second attempt at optimization, entity grouping added for solar panels

* Finished solar panel entity joining

* Finished major revisions, code clean up needed

* Finializing optimizations

* Made requested changes

* Bug fix, removed obsolete code

* Bug fixes

* Bug fixes

* STarted revisions

* Further revisions

* More revision

* Finalizing revisions. Need to make RT PR

* Code tidying

* More code tidying

* Trying to avoid merge conflicts

* Trying to avoid merge conflicts

* Removed use of PVS

* Improving efficiency

* Addressed a bunch of outstanding issues

* Clear old data on console refresh

* UI adjustments

* Made node comparison more robust. More devices can be combined into one entry

* Added missing component 'dirty'
2023-12-24 17:07:41 +11:00
Morb0
e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
metalgearsloth
99b77bc2d3
Remove lights compref (#19531) 2023-09-11 19:18:06 +10:00
faint
076d2e339b Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
#	Content.Client/LateJoin/LateJoinGui.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
#	RobustToolbox
2023-07-10 07:03:24 +03:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces (#17736) 2023-07-09 02:02:17 +10:00
metalgearsloth
68480af109
Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morb
a3661b0fe8
Change windows size (#515) 2022-11-04 08:20:44 -07:00
Leon Friedrich
921e2ee57d
BUI changes required for Engine PR (#10608) 2022-08-21 03:38:30 +10:00
metalgearsloth
45bd1edd5b
Revert "Update submodule to 0.34.0.0 (#10356)" (#10359) 2022-08-06 16:48:21 +10:00
Leon Friedrich
e06ea56eb2
Content BUI changes for engine PR (#10308) 2022-08-06 14:59:02 +10:00
20kdc
70cd3d18ca
Power Monitoring Console (#7849) 2022-05-04 10:59:40 -07:00