:badguy:

ss220-space · Oct 14, 2024 · 59ea3ad · 59ea3ad
1 parent 5ab9897
commit 59ea3ad
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
@@ -445,3 +445,23 @@ GLOBAL_LIST_EMPTY(antagonists)
  */
 /datum/antagonist/proc/roundend_report_footer()
 	return
+
+/**
+ * Create and assign a single randomized objective.
+ */
+/datum/antagonist/proc/forge_single_human_objective()
+	if(prob(50))
+		if(length(active_ais()) && prob(100 / length(GLOB.player_list)))
+			add_objective(/datum/objective/destroy)
+
+		else if(prob(5))
+			add_objective(/datum/objective/debrain)
+
+		else if(prob(20))
+			add_objective(/datum/objective/protect)
+
+		else
+			add_objective(/datum/objective/maroon)
+
+	else
+		add_objective(/datum/objective/steal)
diff --git a/code/modules/antagonists/changeling/changeling_datum.dm b/code/modules/antagonists/changeling/changeling_datum.dm
@@ -205,6 +205,9 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E
 	absorb.owner = owner
 	objectives += absorb
 
+	forge_single_human_objective()
+	forge_single_human_objective()
+
 	if(prob(60))
 		add_objective(/datum/objective/steal)
 	else

diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -184,27 +184,6 @@
 	mob.update_icons()
 
 
-/**
- * Create and assign a single randomized traitor objective.
- */
-/datum/antagonist/traitor/proc/forge_single_human_objective()
-	if(prob(50))
-		if(length(active_ais()) && prob(100 / length(GLOB.player_list)))
-			add_objective(/datum/objective/destroy)
-
-		else if(prob(5))
-			add_objective(/datum/objective/debrain)
-
-		else if(prob(20))
-			add_objective(/datum/objective/protect)
-
-		else
-			add_objective(/datum/objective/maroon)
-
-	else
-		add_objective(/datum/objective/steal)
-
-
 /**
  * Give traitors their uplink. Play the traitor an alert sound.
  */

diff --git a/code/modules/antagonists/vampire/vampire_datum.dm b/code/modules/antagonists/vampire/vampire_datum.dm
@@ -75,6 +75,8 @@
 	add_objective(/datum/objective/blood)
 	add_objective(/datum/objective/maroon)
 	add_objective(/datum/objective/steal)
+	forge_single_human_objective()
+	forge_single_human_objective()
 
 	if(prob(20)) // 20% chance of getting survive. 80% chance of getting escape.
 		add_objective(/datum/objective/survive)