VigersRay b1cac7e781 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Chat/Managers/IChatManager.cs # Content.Client/IoC/ClientContentIoC.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.Player.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl # Resources/Locale/en-US/_strings/discord/vote-notifications.ftl # Resources/Locale/en-US/_strings/npc/firebot.ftl # Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Recipes/Crafting/bots.yml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png		2024-10-02 06:45:10 +03:00
..
AnnounceOnSpawnSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-12 00:55:20 +03:00
AutoEmoteSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ChatSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
ChatSystem.Emote.cs	Trim punctuation marks in the chat emote system (#28612)	2024-08-18 16:49:07 -06:00
EmoteOnDamageSystem.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
SpeakOnUseSystem.cs	SpeakOnUseSystem and phrases for figurines (#30455)	2024-08-03 10:06:04 -04:00