NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Power
History
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
..
APC Remove lights compref (#19531) 2023-09-11 19:18:06 +10:00
Generation/Teg Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Generator Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
SMES Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Visualizers Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
PowerMonitoringWindow.xaml Power Monitoring Console (#7849) 2022-05-04 10:59:40 -07:00
PowerMonitoringWindow.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-09-13 16:51:52 +03:00
SolarControlWindow.xaml Fixing some warnings (#6250) 2022-01-21 10:38:35 +01:00
SolarControlWindow.xaml.cs Cleaner BoundUserInterfaces (#17736) 2023-07-09 02:02:17 +10:00