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
..
Components	Remove ghost compref (#19478)	2023-08-25 18:50:46 +10:00
Roles	upstream	2024-09-16 12:40:23 +03:00
GhostBooEvent.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
GhostCommand.cs	Move OnGhostAttempt to GhostSystem (#31445)	2024-08-26 14:15:33 +02:00
GhostSystem.cs	Fix RA0032 (#32514)	2024-09-29 02:25:21 +02:00
ObserverRoleComponent.cs	Namespace cleanup around Mind Roles (#30965)	2024-08-15 20:26:57 +02:00
ReturnToBodyEui.cs	Move minds, roles, jobs and objectives to shared (#19679)	2023-08-30 21:46:11 -07:00