NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-20 23:41:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
CatStation/Resources/Textures/Structures/Power/Generation
History
Morb0 c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
2023-12-24 20:02:16 +03:00
..
ame.rsi Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
PA PA Fixes (#18116) 2023-07-17 23:57:59 -06:00
portable_generator.rsi Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
rtg.rsi New generators and wallmount substation (Shuttle power PR) (#6795) 2022-03-15 12:27:39 +11:00
Singularity Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-24 20:02:16 +03:00
solar_panel.rsi Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
teg.rsi Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00
wallmount_generator.rsi Power monitoring console overhaul (#20927) 2023-12-24 17:07:41 +11:00