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	Sliceable doAfter (#30824)	2024-08-13 13:53:59 +03:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
Hungry.cs	Refactor the hungry debug command to be in line with thirsty (#30591)	2024-08-05 18:12:07 +10:00
IngestionEvents.cs	magic bread wand (#17044)	2023-06-03 12:08:52 -07:00
SetNutrit.cs	Debug command to set either your hunger or thirst to one of their respective threshold levels (#30563)	2024-08-05 17:36:26 +10:00
Thirsty.cs	Debug command to make you thirsty (#30562)	2024-08-03 01:49:08 +10:00