rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Power
History
Vigers Ray 3cf56cd5b3 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Access/Systems/AgentIDCardSystem.cs
#	Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
#	Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
#	Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Content.Shared/Standing/StandingStateSystem.cs
#	Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
#	Content.Shared/Stunnable/SharedStunSystem.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-changeling.ftl
#	Resources/Locale/en-US/_strings/ghost/observer-role.ftl
#	Resources/Locale/en-US/_strings/robotics/borg_modules.ftl
#	Resources/Prototypes/Entities/Clothing/Ears/specific.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
#	Resources/Prototypes/Entities/Clothing/Hands/specific.yml
#	Resources/Prototypes/Entities/Clothing/Head/specific.yml
#	Resources/Prototypes/Entities/Clothing/Neck/specific.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Entities/Objects/Materials/parts.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
2025-08-13 14:13:30 +03:00
..
APC Merge remote-tracking branch 'space-wizards/master' 2025-08-10 01:49:23 +03:00
Battery Battery (SMES/substation) interface (#36386) 2025-04-27 21:08:34 +10:00
Components Predict PoweredLights (#36541) 2025-08-11 23:06:28 +02:00
EntitySystems Fix devices in terminal mispredicting power state (#38647) 2025-07-14 00:49:27 -07:00
Generation/Teg Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814) 2025-07-07 21:57:05 +02:00
Generator Fix window positions not saving (#35055) 2025-02-23 23:57:57 +11:00
PowerCharge Better PowerCharge menu wrapping (retry) (#34036) 2025-04-19 16:20:32 -04:00
SMES Cleanup redundant SpriteSystem dependencies in VisualizerSystems (#37758) 2025-05-23 14:12:20 -04:00
Visualizers Cleanup more SpriteComponent warnings (part 5) (#37590) 2025-05-19 03:09:47 +02:00
ActivatableUIRequiresPowerSystem.cs Fix powered machines working unpowered if the panel is open. (#32135) 2024-09-14 01:58:54 +02:00
PowerMonitoringConsoleBoundUserInterface.cs add missing base calls to several BUIs (#35124) 2025-02-13 01:41:30 -05: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 Reapply "Remove some BUI boilerplate" (#30214) (#30219) 2024-07-21 14:48:13 +10:00
PowerMonitoringWindow.xaml.Widgets.cs Update content to remove redundant Robust math types (#38930) 2025-07-22 12:29:17 +02: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