Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Give objectives with assassinate targets the name of the species #13863

Merged
JamieD1 merged 2 commits into from
Apr 24, 2022
Merged

Give objectives with assassinate targets the name of the species #13863

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3547e6d
Commit 1
Simplehorror Apr 23, 2022
7128dc1
Apply suggestions from code review
JamieD1 Apr 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions code/game/gamemodes/objective.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,11 @@ GLOBAL_LIST_EMPTY(objectives)
/datum/objective/assassinate/update_explanation_text()
..()
if(target && target.current)
explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]."
if(ishuman(target.current))
var/mob/living/carbon/human/H = target.current
explanation_text = "Assassinate [target.name], the [lowertext(H.dna.species.name)] [!target_role_type ? target.assigned_role : target.special_role]."
else
explanation_text = "Assassinate [target.name], the [!target_role_type ? target.assigned_role : target.special_role]."
else
explanation_text = "Free Objective"

Expand All @@ -226,7 +230,11 @@ GLOBAL_LIST_EMPTY(objectives)
/datum/objective/assassinate/once/update_explanation_text()
START_PROCESSING(SSprocessing, src)
if(target && target.current)
explanation_text = "Ensure [target.name], the [!target_role_type ? target.assigned_role : target.special_role] has died at least once."
if(ishuman(target.current))
var/mob/living/carbon/human/H = target.current
explanation_text = "Ensure [target.name], the [lowertext(H.dna.species.name)] [!target_role_type ? target.assigned_role : target.special_role][!target_role_type ? target.assigned_role : target.special_role] has died at least once."
else
explanation_text = "Ensure [target.name], the [!target_role_type ? target.assigned_role : target.special_role][!target_role_type ? target.assigned_role : target.special_role] has died at least once."
else
explanation_text = "Free Objective"

Expand All @@ -241,7 +249,11 @@ GLOBAL_LIST_EMPTY(objectives)

/datum/objective/assassinate/cloned/update_explanation_text()
if(target && target.current)
explanation_text = "Ensure the [!target_role_type ? target.assigned_role : target.special_role] [target.name]'s original body is dead."
if(ishuman(target.current))
var/mob/living/carbon/human/H = target.current
explanation_text = "Ensure the [lowertext(H.dna.species.name)] [!target_role_type ? target.assigned_role : target.special_role] [target.name]'s original body is dead."
else
explanation_text = "Ensure the [!target_role_type ? target.assigned_role : target.special_role] [target.name]'s original body is dead."
original = target.current
else
explanation_text = "Free Objective"
Expand Down Expand Up @@ -303,7 +315,11 @@ GLOBAL_LIST_EMPTY(objectives)

/datum/objective/maroon/update_explanation_text()
if(target && target.current)
explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive."
if(ishuman(target.current))
var/mob/living/carbon/human/H = target.current
explanation_text = "Prevent [target.name], the [lowertext(H.dna.species.name)] [!target_role_type ? target.assigned_role : target.special_role], from escaping alive."
else
explanation_text = "Prevent [target.name], the [!target_role_type ? target.assigned_role : target.special_role], from escaping alive."
else
explanation_text = "Free Objective"

Expand Down