[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>
This commit is contained in:
SkyratBot
2021-07-06 23:06:31 +01:00
committed by GitHub
parent 49a6af8d4f
commit f6f7a738d7
34 changed files with 48 additions and 29 deletions
@@ -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
@@ -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
@@ -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)
@@ -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..."))
@@ -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
@@ -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?
+1
View File
@@ -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)
+1
View File
@@ -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
@@ -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
+3
View File
@@ -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)
..()
@@ -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"
@@ -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"
+1
View File
@@ -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.
@@ -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")
@@ -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
@@ -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
@@ -3,3 +3,4 @@
show_in_antagpanel = FALSE
show_name_in_check_antagonists = TRUE
show_to_ghosts = TRUE
suicide_cry = "FOR THE DARKNESS!!"
@@ -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)
. = ..()
@@ -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.
@@ -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()
@@ -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
@@ -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()
@@ -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
+1
View File
@@ -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()
. = ..()
@@ -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()
@@ -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
@@ -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()
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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