rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Power
History
VigersRay 7cb20da0e6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Textures/Structures/Power/apc.rsi/base.png
#	Resources/Textures/Structures/Power/apc.rsi/broken.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png
#	Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png
#	Resources/Textures/Structures/Power/apc.rsi/display-charging.png
#	Resources/Textures/Structures/Power/apc.rsi/display-full.png
#	Resources/Textures/Structures/Power/apc.rsi/display-lack.png
#	Resources/Textures/Structures/Power/apc.rsi/display-remote.png
#	Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
#	Resources/Textures/Structures/Power/apc.rsi/frame.png
#	Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png
#	Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png
#	Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png
#	Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png
#	Resources/Textures/Structures/Power/apc.rsi/meta.json
#	Resources/Textures/Structures/Power/apc.rsi/panel.png
#	Resources/Textures/Structures/Power/apc.rsi/static.png
2024-06-16 21:46:31 +03:00
..
APC Apc & Substation resprite (#28998) 2024-06-16 05:43:22 -05:00
Components Move ApcPowerReceiverComponent Powered state to shared (#28206) 2024-05-30 16:46:22 +10:00
EntitySystems Predict ActivatableUIRequiresPower (#28405) 2024-05-30 00:32:16 -07:00
Generation/Teg Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Generator Adds signal control to portable generators (#24157) 2024-01-29 15:56:29 +01: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
ActivatableUIRequiresPowerSystem.cs Predict ActivatableUIRequiresPower (#28405) 2024-05-30 00:32:16 -07:00
PowerMonitoringConsoleBoundUserInterface.cs Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
PowerMonitoringConsoleNavMapControl.cs Replace NavMap dictionaries with int[] (#27602) 2024-05-02 12:51:21 +10:00
PowerMonitoringWindow.xaml Station Map window edges (#24024) 2024-01-13 16:04:45 +01:00
PowerMonitoringWindow.xaml.cs Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
PowerMonitoringWindow.xaml.Widgets.cs Widen power monitoring widget (#29062) 2024-06-15 21:06:54 -04: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