NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 19:01:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Power
History
Exact
Morb0 b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +03:00
..
APC Change "Battery Power" to "Load" for APCs (#19766) 2023-09-03 10:24:24 -04: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 'wizards/master' into upstream-sync 2023-07-10 07:03:24 +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