Ghost roles create new minds, better tracking of roles at round end screen (#5175)
* Ghost roles now get new Minds
* Some round start/end button stuff
* Mind tracking for better round end reports
* Make traitor kill objectives use mind CharacterName rather than actual occupied entity ("kill brain" prevention)
* Transition over to EntityUid for mind stuff because that's the only way to do it
* BrainSystem fix for PR rebase
This commit is contained in:
@@ -93,7 +93,7 @@ namespace Content.Server.Administration
|
||||
// TODO VERB ICON control mob icon
|
||||
verb.Act = () =>
|
||||
{
|
||||
player.ContentData()?.Mind?.TransferTo(args.Target, ghostCheckOverride: true);
|
||||
player.ContentData()?.Mind?.TransferTo(args.Target.Uid, ghostCheckOverride: true);
|
||||
};
|
||||
args.Verbs.Add(verb);
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace Content.Server.Administration.Commands
|
||||
else
|
||||
{
|
||||
ghost.Name = player.Name;
|
||||
mind.TransferTo(ghost);
|
||||
mind.TransferTo(ghost.Uid);
|
||||
}
|
||||
|
||||
var comp = ghost.GetComponent<GhostComponent>();
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace Content.Server.Administration.Commands
|
||||
|
||||
DebugTools.AssertNotNull(mind);
|
||||
|
||||
mind!.TransferTo(target);
|
||||
mind!.TransferTo(target.Uid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,9 +71,9 @@ namespace Content.Server.Administration.Commands
|
||||
{
|
||||
CharacterName = target.Name
|
||||
};
|
||||
playerCData.Mind = mind;
|
||||
mind.ChangeOwningPlayer(session.UserId);
|
||||
}
|
||||
mind.TransferTo(target);
|
||||
mind.TransferTo(target.Uid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user