Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Mindshield/MindShieldSystem.cs # Content.Shared/Gravity/SharedGravitySystem.cs # Content.Shared/Implants/SharedSubdermalImplantSystem.cs # Resources/Locale/en-US/_strings/traits/traits.ftl # Resources/Prototypes/Entities/Clothing/Shoes/misc.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-08-23 23:10:05 +03:00
..
Components	Predict MessyDrinker (#39660)	2025-08-16 17:03:50 +02:00
EntitySystems	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
Events	MessyDrinker for dogs (#38852)	2025-08-06 15:00:32 +02:00
Hungry.cs	Refactor the hungry debug command to be in line with thirsty (#30591)	2024-08-05 18:12:07 +10: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