VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml		2024-07-11 14:05:37 +03:00
..
Components	Revert "Make wearing an Ushanka also apply accent to your name" (#29524)	2024-06-28 10:08:09 +10:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Muting	Moves muted to shared (#25374)	2024-02-21 15:53:46 -05:00
AccentSystem.cs	Add department-specific radio channels (#9061)	2022-06-23 20:11:03 +10:00
EmotesMenuSystem.cs	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
ListenEvent.cs	IListener and IRadio purge (#11980)	2022-11-15 15:09:27 +11:00
SpeechNoiseSystem.cs	Lower speech noise volume & refactor system (#24579)	2024-01-28 21:49:55 +11:00