Vigers Ray 1b61551b4d Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Server/Implants/SubdermalImplantSystem.cs # Content.Server/Silicons/Borgs/BorgSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl # Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml		2025-01-16 20:00:41 +03:00
..
Components	Add prediction to Spill Container verb, add dummy TrySpill methods to shared (#25813)	2024-03-29 02:00:09 -07:00
EntitySystems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-16 20:00:41 +03:00
ShowFluidsCommand.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00