nukie stuff

Monkestation · Nov 3, 2023 · ad46457 · ad46457
1 parent 795db63
commit ad46457
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 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
@@ -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/...station/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/...station/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
@@ -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