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
..
apc.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
borg_charger.rsi	Borgs (#18136)	2023-08-12 16:39:58 -05:00
cable_terminal.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
Cables	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00
cell_recharger.rsi	Misc sprite changes (#15011)	2023-04-14 12:43:49 -07:00
Generation	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
power.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
recharger.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00
smes.rsi	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
substation.rsi	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
wall_recharger.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00