From ad464577b351ea694db79d126a64e531d4cec24e Mon Sep 17 00:00:00 2001
From: dwasint <82520990+dwasint@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:19:06 -0400
Subject: [PATCH] nukie stuff

---
 .../converted_events/solo/clown_operative.dm             | 6 +++---
 .../solo/ghosts/nuclear_operative_ghost.dm               | 9 ++++++---
 .../converted_events/solo/nuclear_operative.dm           | 9 ++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm
index 03d1866b32f4..8a2272bdf791 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm
@@ -41,7 +41,6 @@
 	excute_round_end_reports = TRUE
 	end_when = 60000 /// we will end on our own when revs win
 	var/static/datum/team/nuclear/nuke_team
-	var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader
 	var/set_leader = FALSE
 	var/required_role = ROLE_CLOWN_OPERATIVE
 
@@ -71,8 +70,9 @@
 
 	if(!set_leader)
 		set_leader = TRUE
-		var/datum/antagonist/nukeop/leader/leader = most_experienced.add_antag_datum(antag_leader_datum)
-		nuke_team = leader.nuke_team
+		var/datum/antagonist/nukeop/leader/leader_antag_datum = new()
+		nuke_team = leader_antag_datum.nuke_team
+		most_experienced.add_antag_datum(leader_antag_datum)
 
 	if(antag_mind == most_experienced)
 		return
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
index 90dfba4182be..4043e891dec0 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm
@@ -41,7 +41,6 @@
 	excute_round_end_reports = TRUE
 	end_when = 60000 /// we will end on our own when revs win
 	var/static/datum/team/nuclear/nuke_team
-	var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader
 	var/set_leader = FALSE
 	var/required_role = ROLE_NUCLEAR_OPERATIVE
 
@@ -53,13 +52,17 @@
 		qdel(item)
 
 	var/datum/mind/most_experienced = get_most_experienced(setup_minds, required_role)
+	antag_mind.set_assigned_role(SSjob.GetJobType(/datum/job/nuclear_operative))
+	antag_mind.special_role = ROLE_NUCLEAR_OPERATIVE
+
 	if(!most_experienced)
 		most_experienced = antag_mind
 
 	if(!set_leader)
 		set_leader = TRUE
-		var/datum/antagonist/nukeop/leader/leader = most_experienced.add_antag_datum(antag_leader_datum)
-		nuke_team = leader.nuke_team
+		var/datum/antagonist/nukeop/leader/leader_antag_datum = new()
+		nuke_team = leader_antag_datum.nuke_team
+		most_experienced.add_antag_datum(leader_antag_datum)
 
 	if(antag_mind == most_experienced)
 		return
diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
index 6646c502a4a7..240c97793364 100644
--- a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
+++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm
@@ -41,7 +41,6 @@
 	excute_round_end_reports = TRUE
 	end_when = 60000 /// we will end on our own when revs win
 	var/static/datum/team/nuclear/nuke_team
-	var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader
 	var/set_leader = FALSE
 	var/required_role = ROLE_NUCLEAR_OPERATIVE
 
@@ -54,13 +53,17 @@
 		qdel(item)
 
 	var/datum/mind/most_experienced = get_most_experienced(setup_minds, required_role)
+	antag_mind.set_assigned_role(SSjob.GetJobType(/datum/job/nuclear_operative))
+	antag_mind.special_role = ROLE_NUCLEAR_OPERATIVE
+
 	if(!most_experienced)
 		most_experienced = antag_mind
 
 	if(!set_leader)
 		set_leader = TRUE
-		var/datum/antagonist/nukeop/leader/leader = most_experienced.add_antag_datum(antag_leader_datum)
-		nuke_team = leader.nuke_team
+		var/datum/antagonist/nukeop/leader/leader_antag_datum = new()
+		nuke_team = leader_antag_datum.nuke_team
+		most_experienced.add_antag_datum(leader_antag_datum)
 
 	if(antag_mind == most_experienced)
 		return