From f6f7a738d7d2deff1c856216601d22e2384ea80e Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 6 Jul 2021 23:06:31 +0100
Subject: [PATCH] [MIRROR] C4 suicide phrases, but it's on the datum now
 (#6765)

* Rework C4 suicide phrases to be on the antagonist datum; add more phrases (#60029)

Fun fact. Did you know the C4 has special suicideverb phrases for most antagonists? That is, most antagonists. This adds a bunch in because someone noticed Heretic didn't have one special, and I noted quite a few minor antagonists didn't either.

The suicide cry phrases are now on the antag datum instead of in the if/else chain.

* C4 suicide phrases, but it's on the datum now

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 code/game/objects/items/grenades/plastic.dm   | 37 ++++++-------------
 .../antagonists/_common/antag_datum.dm        |  3 +-
 code/modules/antagonists/abductor/abductor.dm |  1 +
 .../antagonists/ashwalker/ashwalker.dm        |  1 +
 .../antagonists/brainwashing/brainwashing.dm  |  1 +
 code/modules/antagonists/brother/brother.dm   |  1 +
 .../antagonists/changeling/changeling.dm      |  1 +
 code/modules/antagonists/creep/creep.dm       |  1 +
 code/modules/antagonists/cult/cult.dm         |  1 +
 .../eldritch_cult/eldritch_antag.dm           |  1 +
 code/modules/antagonists/ert/ert.dm           |  3 ++
 code/modules/antagonists/fugitive/fugitive.dm |  1 +
 code/modules/antagonists/fugitive/hunter.dm   |  1 +
 code/modules/antagonists/gang/gang.dm         |  1 +
 .../antagonists/greentext/greentext.dm        |  1 +
 .../antagonists/highlander/highlander.dm      |  1 +
 code/modules/antagonists/monkey/monkey.dm     |  1 +
 .../antagonists/nightmare/nightmare.dm        |  1 +
 code/modules/antagonists/nukeop/clownop.dm    |  2 +
 code/modules/antagonists/nukeop/nukeop.dm     |  1 +
 code/modules/antagonists/pirate/pirate.dm     |  1 +
 .../revolution/enemy_of_the_revolution.dm     |  1 +
 .../revolution/enemy_of_the_state.dm          |  1 +
 .../antagonists/revolution/revolution.dm      |  1 +
 code/modules/antagonists/santa/santa.dm       |  1 +
 .../antagonists/separatist/separatist.dm      |  1 +
 .../antagonists/space_ninja/space_ninja.dm    |  1 +
 .../antagonists/survivalist/survivalist.dm    |  1 +
 .../traitor/IAA/internal_affairs.dm           |  2 +-
 .../antagonists/traitor/datum_traitor.dm      |  1 +
 .../antagonists/valentines/heartbreaker.dm    |  2 +-
 .../antagonists/valentines/valentine.dm       |  1 +
 .../antagonists/wishgranter/wishgranter.dm    |  1 +
 code/modules/antagonists/wizard/wizard.dm     |  1 +
 34 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 28025f3d338..813da6c2313 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -115,33 +115,18 @@
 
 /obj/item/grenade/c4/proc/shout_syndicate_crap(mob/player)
 	if(!player)
-		return
-	var/message_say = "FOR NO RAISIN!"
+		CRASH("[src] proc shout_syndicate_crap called without a mob to shout crap from!")
+
+	var/final_message = "FOR NO RAISIN!!"
 	if(player.mind)
-		var/datum/mind/our_guy = player.mind
-		if(our_guy.has_antag_datum(/datum/antagonist/nukeop) || our_guy.has_antag_datum(/datum/antagonist/traitor))
-			message_say = "FOR THE SYNDICATE!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/changeling))
-			message_say = "FOR THE HIVE!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/cult))
-			message_say = "FOR NAR'SIE!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/rev))
-			message_say = "VIVA LA REVOLUTION!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/brother))
-			message_say = "FOR MY BROTHER!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/ninja))
-			message_say = "FOR THE SPIDER CLAN!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/fugitive))
-			message_say = "FOR FREEDOM!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/ashwalker))
-			message_say = "I HAVE NO IDEA WHAT THIS THING DOES!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/ert))
-			message_say = "FOR NANOTRASEN!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/pirate))
-			message_say = "FOR ME MATEYS!"
-		else if(our_guy.has_antag_datum(/datum/antagonist/wizard))
-			message_say = "FOR THE FEDERATION!"
-	player.say(message_say, forced="C4 suicide")
+		// Give our list of antag datums a shuffle and pick the first one with a suicide_cry to use as our shout.
+		var/list/shuffled_antag_datums = shuffle(player.mind.antag_datums)
+		for(var/datum/antagonist/found_antag as anything in shuffled_antag_datums)
+			if(found_antag.suicide_cry)
+				final_message = found_antag.suicide_cry
+				break
+
+	player.say(final_message, forced = "C4 suicide")
 
 /obj/item/grenade/c4/suicide_act(mob/living/user)
 	message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src] at [ADMIN_VERBOSEJMP(user)]")
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 16124fc487c..d6cebbb00a7 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -37,7 +37,8 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/antag_hud_name
 	/// If set to true, the antag will not be added to the living antag list.
 	var/soft_antag = FALSE
-
+	/// The battlecry this antagonist shouts when suiciding with C4/X4.
+	var/suicide_cry = ""
 	//Antag panel properties
 	///This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind
 	var/show_in_antagpanel = TRUE
diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm
index 1de47d75536..74d02ea8bf7 100644
--- a/code/modules/antagonists/abductor/abductor.dm
+++ b/code/modules/antagonists/abductor/abductor.dm
@@ -10,6 +10,7 @@ GLOBAL_LIST_INIT(possible_abductor_names, list("Alpha","Beta","Gamma","Delta","E
 	antag_hud_name = "abductor"
 	show_in_antagpanel = FALSE //should only show subtypes
 	show_to_ghosts = TRUE
+	suicide_cry = "FOR THE MOTHERSHIP!!" // They can't even talk but y'know
 	var/datum/team/abductor_team/team
 	var/sub_role
 	var/outfit
diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm
index 9b195abc232..5cda5e3da1f 100644
--- a/code/modules/antagonists/ashwalker/ashwalker.dm
+++ b/code/modules/antagonists/ashwalker/ashwalker.dm
@@ -10,6 +10,7 @@
 	show_to_ghosts = TRUE
 	prevent_roundtype_conversion = FALSE
 	antagpanel_category = "Ash Walkers"
+	suicide_cry = "I HAVE NO IDEA WHAT THIS THING DOES!!"
 	var/datum/team/ashwalkers/ashie_team
 
 /datum/antagonist/ashwalker/create_team(datum/team/team)
diff --git a/code/modules/antagonists/brainwashing/brainwashing.dm b/code/modules/antagonists/brainwashing/brainwashing.dm
index d745fa56e17..0fbe44e4989 100644
--- a/code/modules/antagonists/brainwashing/brainwashing.dm
+++ b/code/modules/antagonists/brainwashing/brainwashing.dm
@@ -32,6 +32,7 @@
 	show_in_antagpanel = TRUE
 	antagpanel_category = "Other"
 	show_name_in_check_antagonists = TRUE
+	suicide_cry = "FOR... SOMEONE!!"
 
 /datum/antagonist/brainwashed/greet()
 	to_chat(owner, span_warning("Your mind reels as it begins focusing on a single purpose..."))
diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm
index fcc595dc0a1..8d30d13e435 100644
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -6,6 +6,7 @@
 	antag_hud_type = ANTAG_HUD_BROTHER
 	antag_hud_name = "brother"
 	hijack_speed = 0.5
+	suicide_cry = "FOR MY BROTHER!!"
 	var/datum/team/brother_team/team
 	antag_moodlet = /datum/mood_event/focused
 
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index dc74a29f4ce..76419aee876 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -11,6 +11,7 @@
 	antag_hud_type = ANTAG_HUD_CHANGELING
 	antag_hud_name = "changeling"
 	hijack_speed = 0.5
+	suicide_cry = "FOR THE HIVE!!"
 	var/you_are_greet = TRUE
 	var/give_objectives = TRUE
 	var/competitive_objectives = FALSE //Should we assign objectives in competition with other lings?
diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm
index f5ad9c32abe..7fe55e45677 100644
--- a/code/modules/antagonists/creep/creep.dm
+++ b/code/modules/antagonists/creep/creep.dm
@@ -8,6 +8,7 @@
 	show_name_in_check_antagonists = TRUE
 	roundend_category = "obsessed"
 	silent = TRUE //not actually silent, because greet will be called by the trauma anyway.
+	suicide_cry = "FOR MY LOVE!!"
 	var/datum/brain_trauma/special/obsessed/trauma
 
 /datum/antagonist/obsessed/admin_add(datum/mind/new_owner,mob/admin)
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index 643f223bc18..00ade2c08f1 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -8,6 +8,7 @@
 	roundend_category = "cultists"
 	antagpanel_category = "Cult"
 	antag_moodlet = /datum/mood_event/cult
+	suicide_cry = "FOR NAR'SIE!!"
 	var/datum/action/innate/cult/comm/communion = new
 	var/datum/action/innate/cult/mastervote/vote = new
 	var/datum/action/innate/cult/blood_magic/magic = new
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
index f2200a9fd98..be9e94098fa 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
@@ -7,6 +7,7 @@
 	antag_hud_type = ANTAG_HUD_HERETIC
 	antag_hud_name = "heretic"
 	hijack_speed = 0.5
+	suicide_cry = "THE MANSUS SMILES UPON ME!!"
 	var/give_equipment = TRUE
 	var/list/researched_knowledge = list()
 	var/total_sacrifices = 0
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index e6c478298c3..f936cedbdc8 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -19,6 +19,7 @@
 	show_in_antagpanel = FALSE
 	show_to_ghosts = TRUE
 	antag_moodlet = /datum/mood_event/focused
+	suicide_cry = "FOR NANOTRASEN!!"
 
 /datum/antagonist/ert/on_gain()
 	if(random_names)
@@ -155,6 +156,7 @@
 	plasmaman_outfit = /datum/outfit/plasmaman/centcom_intern
 	random_names = FALSE
 	role = "Intern"
+	suicide_cry = "FOR MY INTERNSHIP!!"
 
 /datum/antagonist/ert/intern/leader
 	name = "CentCom Head Intern"
@@ -241,6 +243,7 @@
 	name = "Space Police Responder"
 	antag_hud_type = ANTAG_HUD_SPACECOP
 	antag_hud_name = "hud_spacecop"
+	suicide_cry = "FOR THE SPACE POLICE!!"
 
 /datum/antagonist/ert/families/apply_innate_effects(mob/living/mob_override)
 	..()
diff --git a/code/modules/antagonists/fugitive/fugitive.dm b/code/modules/antagonists/fugitive/fugitive.dm
index 5f2d2c378e5..ab5793e1ada 100644
--- a/code/modules/antagonists/fugitive/fugitive.dm
+++ b/code/modules/antagonists/fugitive/fugitive.dm
@@ -7,6 +7,7 @@
 	prevent_roundtype_conversion = FALSE
 	antag_hud_type = ANTAG_HUD_FUGITIVE
 	antag_hud_name = "fugitive"
+	suicide_cry = "FOR FREEDOM!!"
 	var/datum/team/fugitive/fugitive_team
 	var/is_captured = FALSE
 	var/backstory = "error"
diff --git a/code/modules/antagonists/fugitive/hunter.dm b/code/modules/antagonists/fugitive/hunter.dm
index 3fedd963e30..c6c1fe5a247 100644
--- a/code/modules/antagonists/fugitive/hunter.dm
+++ b/code/modules/antagonists/fugitive/hunter.dm
@@ -7,6 +7,7 @@
 	prevent_roundtype_conversion = FALSE
 	antag_hud_type = ANTAG_HUD_FUGITIVE
 	antag_hud_name = "fugitive_hunter"
+	suicide_cry = "FOR GLORY!!"
 	var/datum/team/fugitive_hunters/hunter_team
 	var/backstory = "error"
 
diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm
index e6b67f2920e..2f7d4770e9c 100644
--- a/code/modules/antagonists/gang/gang.dm
+++ b/code/modules/antagonists/gang/gang.dm
@@ -5,6 +5,7 @@
 	antag_hud_name = "hud_gangster"
 	antagpanel_category = "Family"
 	show_in_antagpanel = FALSE // i don't *think* this base class is buggy but it's too worthless to test
+	suicide_cry = "FOR THE FAMILY!!"
 	/// The overarching family that the owner of this datum is a part of. Family teams are generic and imprinted upon by the per-person antagonist datums.
 	var/datum/team/gang/my_gang
 	/// The name of the family corresponding to this family member datum.
diff --git a/code/modules/antagonists/greentext/greentext.dm b/code/modules/antagonists/greentext/greentext.dm
index 13a3c2a07a0..63cf461719a 100644
--- a/code/modules/antagonists/greentext/greentext.dm
+++ b/code/modules/antagonists/greentext/greentext.dm
@@ -2,6 +2,7 @@
 	name = "winner"
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE //Not that it will be there for long
+	suicide_cry = "FOR THE GREENTEXT!!" // This can never actually show up, but not including it is a missed opportunity
 
 /datum/antagonist/greentext/proc/forge_objectives()
 	var/datum/objective/O = new /datum/objective("Succeed")
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index f083a6a2b32..b8facdb04c8 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -4,6 +4,7 @@
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
 	can_elimination_hijack = ELIMINATION_ENABLED
+	suicide_cry = "FOR SCOTLAND!!" // If they manage to lose their no-drop stuff somehow
 
 /datum/antagonist/highlander/apply_innate_effects(mob/living/mob_override)
 	var/mob/living/L = owner.current || mob_override
diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm
index 12a6bd0a8a0..8f6ef02d0ff 100644
--- a/code/modules/antagonists/monkey/monkey.dm
+++ b/code/modules/antagonists/monkey/monkey.dm
@@ -9,6 +9,7 @@
 	roundend_category = "monkeys"
 	antagpanel_category = "Monkey"
 	show_to_ghosts = TRUE
+	suicide_cry = "EEK OOP!!"
 	var/datum/team/monkey/monkey_team
 	var/monkey_only = TRUE
 
diff --git a/code/modules/antagonists/nightmare/nightmare.dm b/code/modules/antagonists/nightmare/nightmare.dm
index 1739e249510..97ee375d35e 100644
--- a/code/modules/antagonists/nightmare/nightmare.dm
+++ b/code/modules/antagonists/nightmare/nightmare.dm
@@ -3,3 +3,4 @@
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
 	show_to_ghosts = TRUE
+	suicide_cry = "FOR THE DARKNESS!!"
diff --git a/code/modules/antagonists/nukeop/clownop.dm b/code/modules/antagonists/nukeop/clownop.dm
index 57c24772354..f97e091afe9 100644
--- a/code/modules/antagonists/nukeop/clownop.dm
+++ b/code/modules/antagonists/nukeop/clownop.dm
@@ -4,6 +4,7 @@
 	roundend_category = "clown operatives"
 	antagpanel_category = "ClownOp"
 	nukeop_outfit = /datum/outfit/syndicate/clownop
+	suicide_cry = "HAPPY BIRTHDAY!!"
 
 /datum/antagonist/nukeop/clownop/admin_add(datum/mind/new_owner,mob/admin)
 	new_owner.assigned_role = "Clown Operative"
@@ -41,6 +42,7 @@
 	antagpanel_category = "ClownOp"
 	nukeop_outfit = /datum/outfit/syndicate/clownop/leader
 	challengeitem = /obj/item/nuclear_challenge/clownops
+	suicide_cry = "HAPPY BIRTHDAY!!"
 
 /datum/antagonist/nukeop/leader/clownop/apply_innate_effects(mob/living/mob_override)
 	. = ..()
diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm
index 2b931bccaa1..008e1f172e9 100644
--- a/code/modules/antagonists/nukeop/nukeop.dm
+++ b/code/modules/antagonists/nukeop/nukeop.dm
@@ -8,6 +8,7 @@
 	antag_moodlet = /datum/mood_event/focused
 	show_to_ghosts = TRUE
 	hijack_speed = 2 //If you can't take out the station, take the shuttle instead.
+	suicide_cry = "FOR THE SYNDICATE!!"
 	var/datum/team/nuclear/nuke_team
 	var/always_new_team = FALSE //If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team.
 	var/send_to_spawnpoint = TRUE //Should the user be moved to default spawnpoint.
diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm
index 36c4dd54766..98ca7cd0110 100644
--- a/code/modules/antagonists/pirate/pirate.dm
+++ b/code/modules/antagonists/pirate/pirate.dm
@@ -4,6 +4,7 @@
 	roundend_category = "space pirates"
 	show_in_antagpanel = FALSE
 	show_to_ghosts = TRUE
+	suicide_cry = "FOR ME MATEYS!!"
 	var/datum/team/pirate/crew
 
 /datum/antagonist/pirate/greet()
diff --git a/code/modules/antagonists/revolution/enemy_of_the_revolution.dm b/code/modules/antagonists/revolution/enemy_of_the_revolution.dm
index 8cbad49940a..5c5bb68d141 100644
--- a/code/modules/antagonists/revolution/enemy_of_the_revolution.dm
+++ b/code/modules/antagonists/revolution/enemy_of_the_revolution.dm
@@ -6,6 +6,7 @@
 /datum/antagonist/enemy_of_the_revolution
 	name = "Enemy of the Revolution"
 	show_in_antagpanel = FALSE
+	suicide_cry = "FOR NANOTRASEN, NOW AND FOREVER!!"
 
 /datum/antagonist/enemy_of_the_revolution/proc/forge_objectives()
 	var/datum/objective/survive/survive = new
diff --git a/code/modules/antagonists/revolution/enemy_of_the_state.dm b/code/modules/antagonists/revolution/enemy_of_the_state.dm
index 78ef8bdb577..669d91a409a 100644
--- a/code/modules/antagonists/revolution/enemy_of_the_state.dm
+++ b/code/modules/antagonists/revolution/enemy_of_the_state.dm
@@ -8,6 +8,7 @@
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
 	hijack_speed = 2 //not like they have much to do
+	suicide_cry = "FOR THE ETERNAL REVOLUTION!!"
 
 /datum/antagonist/enemy_of_the_state/proc/forge_objectives()
 
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index d48a52cbc1b..246de78e166 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -11,6 +11,7 @@
 	antag_moodlet = /datum/mood_event/revolution
 	antag_hud_type = ANTAG_HUD_REV
 	antag_hud_name = "rev"
+	suicide_cry = "VIVA LA REVOLUTION!!"
 	var/datum/team/revolution/rev_team
 	///when this antagonist is being de-antagged, this is why
 	var/deconversion_reason
diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm
index cfa68da8f43..23d005bb8fe 100644
--- a/code/modules/antagonists/santa/santa.dm
+++ b/code/modules/antagonists/santa/santa.dm
@@ -3,6 +3,7 @@
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
 	show_to_ghosts = TRUE
+	suicide_cry = "FOR CHRISTMAS!!"
 
 /datum/antagonist/santa/on_gain()
 	. = ..()
diff --git a/code/modules/antagonists/separatist/separatist.dm b/code/modules/antagonists/separatist/separatist.dm
index 223f9620236..569c16e8716 100644
--- a/code/modules/antagonists/separatist/separatist.dm
+++ b/code/modules/antagonists/separatist/separatist.dm
@@ -72,6 +72,7 @@
 	name = "Separatists"
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
+	suicide_cry = "FOR THE MOTHERLAND!!"
 	var/datum/team/nation/nation
 
 /datum/antagonist/separatist/on_gain()
diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm
index 1a1aff1365b..f64994abe8f 100644
--- a/code/modules/antagonists/space_ninja/space_ninja.dm
+++ b/code/modules/antagonists/space_ninja/space_ninja.dm
@@ -8,6 +8,7 @@
 	show_name_in_check_antagonists = TRUE
 	show_to_ghosts = TRUE
 	antag_moodlet = /datum/mood_event/focused
+	suicide_cry = "FOR THE SPIDER CLAN!!"
 	///Whether or not this ninja will obtain objectives
 	var/give_objectives = TRUE
 	///Whether or not this ninja receives the standard equipment
diff --git a/code/modules/antagonists/survivalist/survivalist.dm b/code/modules/antagonists/survivalist/survivalist.dm
index 1edcdd0d6e7..552a6a905ff 100644
--- a/code/modules/antagonists/survivalist/survivalist.dm
+++ b/code/modules/antagonists/survivalist/survivalist.dm
@@ -2,6 +2,7 @@
 	name = "Survivalist"
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
+	suicide_cry = "FOR MYSELF!!"
 	var/greet_message = ""
 
 /datum/antagonist/survivalist/proc/forge_objectives()
diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
index 349eca0aaa5..af1b58b3ce9 100644
--- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm
+++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
@@ -7,7 +7,7 @@
 /datum/antagonist/traitor/internal_affairs
 	name = "Internal Affairs Agent"
 	employer = "Nanotrasen"
-
+	suicide_cry = "FOR THE COMPANY!!"
 	var/special_role = "internal affairs agent"
 	var/syndicate = FALSE
 	var/last_man_standing = FALSE
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 98f4be7e3fc..e3fa17d2530 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -24,6 +24,7 @@
 	antag_hud_type = ANTAG_HUD_TRAITOR
 	antag_hud_name = "traitor"
 	hijack_speed = 0.5 //10 seconds per hijack stage by default
+	suicide_cry = "FOR THE SYNDICATE!!"
 	var/employer = "The Syndicate"
 	var/give_objectives = TRUE
 	var/should_give_codewords = TRUE
diff --git a/code/modules/antagonists/valentines/heartbreaker.dm b/code/modules/antagonists/valentines/heartbreaker.dm
index 0f4fcf300e2..b8a0bd82bb3 100644
--- a/code/modules/antagonists/valentines/heartbreaker.dm
+++ b/code/modules/antagonists/valentines/heartbreaker.dm
@@ -3,7 +3,7 @@
 	roundend_category = "valentines"
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
-
+	suicide_cry = "FOR LONELINESS!!"
 
 /datum/antagonist/heartbreaker/proc/forge_objectives()
 	var/datum/objective/martyr/normiesgetout = new
diff --git a/code/modules/antagonists/valentines/valentine.dm b/code/modules/antagonists/valentines/valentine.dm
index 59ed9448a68..ac4612c0996 100644
--- a/code/modules/antagonists/valentines/valentine.dm
+++ b/code/modules/antagonists/valentines/valentine.dm
@@ -3,6 +3,7 @@
 	roundend_category = "valentines" //there's going to be a ton of them so put them in separate category
 	show_in_antagpanel = FALSE
 	prevent_roundtype_conversion = FALSE
+	suicide_cry = "FOR MY LOVE!!"
 	var/datum/mind/date
 	soft_antag = TRUE
 
diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm
index 67a6153f7bb..67805117a84 100644
--- a/code/modules/antagonists/wishgranter/wishgranter.dm
+++ b/code/modules/antagonists/wishgranter/wishgranter.dm
@@ -3,6 +3,7 @@
 	show_in_antagpanel = FALSE
 	show_name_in_check_antagonists = TRUE
 	hijack_speed = 2 //You literally are here to do nothing else. Might as well be fast about it.
+	suicide_cry = "HAHAHAHAHA!!"
 
 /datum/antagonist/wishgranter/proc/forge_objectives()
 	var/datum/objective/hijack/hijack = new
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index 24c0e8cea3d..0a81d3208b0 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -7,6 +7,7 @@
 	antag_hud_name = "wizard"
 	antag_moodlet = /datum/mood_event/focused
 	hijack_speed = 0.5
+	suicide_cry = "FOR THE FEDERATION!!"
 	var/give_objectives = TRUE
 	var/strip = TRUE //strip before equipping
 	var/allow_rename = TRUE