# Conflicts: # Content.Server/Chat/SuicideSystem.cs # Content.Server/Ghost/GhostSystem.cs # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Content.Shared/Standing/StandingStateSystem.cs # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/thief.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml # Resources/Prototypes/Roles/Jobs/CentComm/official.yml |
||
|---|---|---|
| .. | ||
| CriminalRecordsConsoleSystem.cs | ||
| CriminalRecordsHackerSystem.cs | ||
| CriminalRecordsSystem.cs | ||