From cebe9d7e47e8a9aa75c561bd4b2216e3186b592e Mon Sep 17 00:00:00 2001 From: Brandon H Date: Thu, 25 Jul 2024 10:29:07 -0500 Subject: [PATCH 1/4] IN MY WALLS! IN MY WALLS THEY ARE IN MY WALLS HELP HEELP HEKP PA DADOEAMD EODM AOM D *DIES* IM NOT DEAD ADADADDADIAMSDIM --- Content.Server/Antag/AntagSelectionSystem.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index d2bc26f20d34..019ecc6dac53 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -329,11 +329,9 @@ public void MakeAntag(Entity ent, ICommonSession? sessi if (session != null) { var curMind = session.GetMind(); - if (curMind == null) - { - curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); - _mind.SetUserId(curMind.Value, session.UserId); - } + + curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); + _mind.SetUserId(curMind.Value, session.UserId); _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true); _role.MindAddRoles(curMind.Value, def.MindComponents); From 322e96bd1d3b2cde5440d58c1298de885e558fe6 Mon Sep 17 00:00:00 2001 From: Brandon H Date: Thu, 25 Jul 2024 10:34:28 -0500 Subject: [PATCH 2/4] RUN I SAID RUN! THEY TOOK MY UKELELE Co-authored-by: EmoGarbage404 --- Content.Server/Antag/AntagSelectionSystem.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 019ecc6dac53..44ca1488d031 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -328,8 +328,6 @@ public void MakeAntag(Entity ent, ICommonSession? sessi if (session != null) { - var curMind = session.GetMind(); - curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); _mind.SetUserId(curMind.Value, session.UserId); From 3919fe439003a2de60fc8f95be5643ae6ef2e9a2 Mon Sep 17 00:00:00 2001 From: Brandon H Date: Thu, 25 Jul 2024 10:38:54 -0500 Subject: [PATCH 3/4] Many have fallen --- Content.Server/Antag/AntagSelectionSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 44ca1488d031..d2a38e9c04b2 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -328,7 +328,7 @@ public void MakeAntag(Entity ent, ICommonSession? sessi if (session != null) { - curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); + var curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); _mind.SetUserId(curMind.Value, session.UserId); _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true); From 3690bf1d775f36c1f9c5f8f419a6f54ed411aac9 Mon Sep 17 00:00:00 2001 From: Brandon H Date: Thu, 25 Jul 2024 10:42:07 -0500 Subject: [PATCH 4/4] It's all emo's fault --- Content.Server/Antag/AntagSelectionSystem.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index d2a38e9c04b2..fcbf2bf676a0 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -329,11 +329,11 @@ public void MakeAntag(Entity ent, ICommonSession? sessi if (session != null) { var curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); - _mind.SetUserId(curMind.Value, session.UserId); + _mind.SetUserId(curMind, session.UserId); - _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true); - _role.MindAddRoles(curMind.Value, def.MindComponents); - ent.Comp.SelectedMinds.Add((curMind.Value, Name(player))); + _mind.TransferTo(curMind, antagEnt, ghostCheckOverride: true); + _role.MindAddRoles(curMind, def.MindComponents); + ent.Comp.SelectedMinds.Add((curMind, Name(player))); SendBriefing(session, def.Briefing); }