NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Textures/Structures/Power/Generation
History
Exact
Morb0 e853272357 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
2024-07-21 12:48:56 +03:00
..
ame.rsi Added Warning state for AME (#24699) 2024-02-01 19:40:57 +11:00
PA PA ui cleanup + bugfixes (#28750) 2024-07-21 15:27:18 +10:00
portable_generator.rsi Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
rtg.rsi
Singularity Fix emitter unlocked state name 2024-02-17 13:02:12 +03:00
solar_panel.rsi Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
teg.rsi Fixed the pipe in the TEG sprite (#29543) 2024-06-28 22:03:45 -04:00
Tesla Major Tesla tweaks (#23235) 2023-12-31 23:33:48 -08:00
wallmount_generator.rsi [Resprite] Wallmount generator (#2137) 2024-05-20 14:01:07 +03:00