Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/CharacterSetupGui.xaml # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Entities/Clothing/Back/satchel.yml # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-11-04 12:16:53 +03:00
..
Components	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
EntitySystems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-04 12:16:53 +03:00
Muting	Rename DummyPuppet to VentriloquistPuppet (#19777)	2023-09-16 14:54:46 +10:00
AccentSystem.cs	Add department-specific radio channels (#9061)	2022-06-23 20:11:03 +10:00
ListenEvent.cs	IListener and IRadio purge (#11980)	2022-11-15 15:09:27 +11:00
SpeechNoiseSystem.cs	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00