Merge pull request #552 from wraith-54321/actually-storytellers-fixes

Storytellers fixes
Monkestation · Nov 14, 2023 · 3c6d32b · 3c6d32b
2 parents 207d510 + 0c7078b
commit 3c6d32b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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