NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 20:14:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Resources/Textures/Structures/Power/Generation/Singularity
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
..
collector.rsi Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-24 20:02:16 +03:00
containment.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
containment_field.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
emitter.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
generator.rsi Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
singularity_1.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
singularity_2.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
singularity_3.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
singularity_4.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
singularity_5.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00
singularity_6.rsi [Resprite] Singularity stuff (#320) 2022-07-26 20:56:02 +03:00