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
..
CargoSystem.Bounty.cs	Remove calls to FormattedMessage obsolete methods (#31706)	2024-09-01 13:00:53 +02:00
CargoSystem.cs	feat: now when research is unlocked in console, approver of reasearch is radio-ed too (#31170)	2024-09-03 23:01:38 +10:00
CargoSystem.Orders.cs	upstream	2024-09-16 12:40:23 +03:00
CargoSystem.Shuttle.cs	upstream	2024-09-16 12:40:23 +03:00
CargoSystem.Telepad.cs	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
PriceGunSystem.cs	Predict appraisal tool verb! (#32496)	2024-09-28 14:40:24 +10:00
PricingSystem.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00