From 0c7078b64f75cb3334ee5624b8f335b39988ea11 Mon Sep 17 00:00:00 2001
From: wraith-54321 <69217972+wraith-54321@users.noreply.github.com>
Date: Mon, 13 Nov 2023 19:58:28 -0800
Subject: [PATCH] wow that was so easy yet so hard

---
 code/modules/events/_event.dm                              | 2 +-
 .../modules/storytellers/converted_events/_base_event.dm   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
index 54a10b81e224..e9f0bd8d40db 100644
--- a/code/modules/events/_event.dm
+++ b/code/modules/events/_event.dm
@@ -333,7 +333,7 @@ Runs the event
 						return
 			message_admins("[key_name_admin(usr)] force scheduled event [src.name].")
 			log_admin_private("[key_name(usr)] force scheduled event [src.name].")
-			SSgamemode.forced_next_events[src.track] += src
+			SSgamemode.forced_next_events[src.track] = src
 
 //monkestation addition ends - STORYTELLERS
 
diff --git a/monkestation/code/modules/storytellers/converted_events/_base_event.dm b/monkestation/code/modules/storytellers/converted_events/_base_event.dm
index 0a4a88a2587c..17157e44bf6a 100644
--- a/monkestation/code/modules/storytellers/converted_events/_base_event.dm
+++ b/monkestation/code/modules/storytellers/converted_events/_base_event.dm
@@ -229,11 +229,10 @@
 		if(!candidate.mind)
 			candidate.mind = new /datum/mind(candidate.key)
 
-		setup_minds += candidate.mind
 		var/mob/living/carbon/human/new_human = make_body(candidate)
-		candidate.mind.set_current(new_human)
-		candidate.mind.special_role = antag_flag
-		candidate.mind.restricted_roles = restricted_roles
+		new_human.mind.special_role = antag_flag
+		new_human.mind.restricted_roles = restricted_roles
+		setup_minds += new_human.mind
 	setup = TRUE