Arthur Asimov f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Server/RoundEnd/RoundEndSystem.cs # Resources/Prototypes/Datasets/Names/Operation_suffix.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Maps/core.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/ServerInfo/Guidebook/Science/Robotics.xml		2023-12-03 15:10:26 +03:00
..
Atmos/gasanalyzer.rsi	Copyright Pass/Pruning | Part 2 - Objects (#3905)	2021-04-29 18:09:14 +00:00
Chapel	Emaggable vendors + Familiars for Chaplain (#6961)	2022-04-17 17:16:02 +10:00
Chemistry	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Hydroponics	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-12-03 15:10:26 +03:00
Janitorial	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-04 12:16:53 +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-10-20 01:50:09 +03:00
Mining/ore_bag.rsi	[Resprite] Ore & hydro bag inhand (#1059)	2023-05-12 00:01:00 +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	Telecrystals (and a bit more ECS) (#4775)	2021-10-08 12:26:42 +02:00
Xenoarchaeology	node scanner resprite (#17609)	2023-06-24 14:20:26 +10:00