bugfix: Setups Malfunctioning AI as a special role to prevent double …

…antaging (#6151)
ss220-space · Nov 9, 2024 · 44923b1 · 44923b1
1 parent 052bd39
commit 44923b1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm
@@ -70,3 +70,4 @@
 #define SPECIAL_ROLE_THIEF "Thief"
 #define SPECIAL_ROLE_SPACE_DRAGON "Space Dragon"
 #define SPECIAL_ROLE_EVENTMISC "Event Role"
+#define SPECIAL_ROLE_MALFAI "Malfunctioning AI"
diff --git a/code/game/gamemodes/antag_paradise/antag_paradise.dm b/code/game/gamemodes/antag_paradise/antag_paradise.dm
@@ -107,7 +107,7 @@
 				if(special_antag)
 					special_antag.restricted_roles = (restricted_jobs|protected_jobs|protected_jobs_AI)
 					special_antag.restricted_roles -= JOB_TITLE_AI
-					special_antag.special_role = SPECIAL_ROLE_TRAITOR
+					special_antag.special_role = SPECIAL_ROLE_MALFAI
 					SSjobs.new_malf = special_antag.current
 					pre_antags[special_antag] = ROLE_MALF_AI
 					antags_amount--

diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
@@ -77,6 +77,7 @@
 				pre_malf_AI = traitor
 				pre_malf_AI.restricted_roles = (restricted_jobs|protected_jobs|protected_jobs_AI)	// All jobs are restricted for malf AI despite the config.
 				pre_malf_AI.restricted_roles -= JOB_TITLE_AI
+				traitor.special_role = SPECIAL_ROLE_MALFAI
 				SSjobs.new_malf = traitor.current
 		else
 			pre_traitors += traitor

diff --git a/code/modules/antagonists/malf_ai/malf_ai_datum.dm b/code/modules/antagonists/malf_ai/malf_ai_datum.dm
@@ -2,7 +2,7 @@
 	name = "Malfunctioning AI"
 	roundend_category = "traitors"
 	job_rank = ROLE_MALF_AI
-	special_role = SPECIAL_ROLE_TRAITOR
+	special_role = SPECIAL_ROLE_MALFAI
 	antag_hud_name = "hudsyndicate"
 	antag_hud_type = ANTAG_HUD_TRAITOR
 	/// Should the AI get codewords?

diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
@@ -58,7 +58,8 @@
 		SPECIAL_ROLE_TRAITOR,
 		SPECIAL_ROLE_VAMPIRE,
 		SPECIAL_ROLE_VAMPIRE_THRALL,
-		SPECIAL_ROLE_THIEF
+		SPECIAL_ROLE_THIEF,
+		SPECIAL_ROLE_MALFAI
 	)
 	if(special_role in crew_roles)
 		return 0