Vigers Ray 5c219f5105 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Resources/Locale/en-US/_strings/administration/antag.ftl # Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl # Resources/Locale/en-US/_strings/mind/role-types.ftl # Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml # Resources/Prototypes/Entities/Mobs/Player/dragon.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-01-14 18:46:45 +03:00
..
DrainComponent.cs	Remove Entity<T> data-fields (#34083)	2025-01-11 21:22:29 +01:00
EvaporationComponent.cs	Add prediction for puddle and spillable examines (#25794)	2024-03-03 16:36:36 +11:00
PuddleComponent.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
SpillableComponent.cs	Replace BlockSolutionAccessComponent with an attempt event (#26988)	2024-06-21 13:04:02 +10:00
SpillWhenWornComponent.cs	Replace BlockSolutionAccessComponent with an attempt event (#26988)	2024-06-21 13:04:02 +10:00
SpraySafetyComponent.cs	fire extinguisher using item toggle (#29906)	2024-07-13 14:17:10 +10:00