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
..
Atmos/gasanalyzer.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Chapel	Added urn (#22488)	2023-12-16 03:31:12 -07:00
Chemistry	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-18 01:51:30 +03:00
Hydroponics	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-24 20:02:16 +03:00
Janitorial	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-16 03:05:40 +03:00
Kitchen/food_carts.rsi	Add food carts (#19177)	2023-08-15 15:26:49 -07:00
Library/Equipment/books_bag.rsi	[Sprite] inhand sprites for bags (#16005)	2023-05-02 18:24:37 +10:00
Mech	vim!!!!!!11! (#15659)	2023-08-11 12:20:16 -04:00
Medical	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-23 02:53:18 +03:00
Mining	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-21 03:03:30 +03:00
Research	Wide anomaly locator (#20581)	2023-10-01 12:41:32 -04:00
Robotics	Borg QOL, part 3 (#21567)	2023-11-10 23:43:13 -07:00
Security	Add DamagePopup, Target Entities, And Practice Laser Gun (#12317)	2022-11-06 02:32:00 +11:00
Service/vending_machine_restock.rsi	Adds vending restocks for ChefVend and Condiment Stations (#19305)	2023-10-01 16:49:10 -04:00
Syndicate/telecrystal.rsi	add saturation to TC inhand sprites (#22870)	2023-12-22 20:26:01 -07:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00