Vigers Ray d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Content.Client/Lobby/UI/CharacterSetupGui.xaml # Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs # Content.Server/Antag/AntagSelectionSystem.cs # Content.Server/GameTicking/GameTicker.Lobby.cs # Content.Server/Objectives/Systems/KillPersonConditionSystem.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json		2024-11-19 18:34:32 +03:00
..
Components	Sliceable doAfter (#30824)	2024-08-13 13:53:59 +03:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-19 18:34:32 +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