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
..
BeingGibbedEvent.cs	Body code cleanup (#24946)	2024-03-27 17:48:37 -07:00
BloodstreamComponent.cs	Remove Entity<T> data-fields (#34083)	2025-01-11 21:22:29 +01:00
BrainComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
InternalsComponent.cs	Replace IClickAlert with events (#30728)	2024-08-07 15:15:35 +10:00
LungComponent.cs	Remove Entity<T> data-fields (#34083)	2025-01-11 21:22:29 +01:00
MetabolizerComponent.cs	Body code cleanup (#24946)	2024-03-27 17:48:37 -07:00
RespiratorComponent.cs	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
StomachComponent.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-14 18:46:45 +03:00
ThermalRegulatorComponent.cs	Body code cleanup (#24946)	2024-03-27 17:48:37 -07:00