diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 5f06adfda2f..bf5fbb70731 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -84,8 +84,8 @@ GLOBAL_LIST_EMPTY(all_cults) var/survivors = 0 /datum/game_mode/cult/announce() - to_chat(world, "The current game mode is - Cult!") - to_chat(world, "Some crew members are attempting to start a cult!
\nCultists - complete your objectives. Convert crew members to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had.") + to_chat(world, "The current game mode is - Cult!") + to_chat(world, "Some crew members are attempting to start a cult!
\nCultists - complete your objectives. Convert crew members to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had.") /datum/game_mode/cult/pre_setup() @@ -147,8 +147,8 @@ GLOBAL_LIST_EMPTY(all_cults) explanation = "Free objective." if("eldergod") explanation = "Summon [SSticker.cultdat.entity_name] by invoking the 'Tear Reality' rune.The summoning can only be accomplished in [english_list(GLOB.summon_spots)] - where the veil is weak enough for the ritual to begin." - to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") - cult_mind.memory += "Objective #[obj_count]: [explanation]
" + to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") + cult_mind.memory += "Objective #[obj_count]: [explanation]
" /datum/game_mode/proc/equip_cultist(mob/living/carbon/human/mob) @@ -210,7 +210,7 @@ GLOBAL_LIST_EMPTY(all_cults) update_cult_icons_removed(cult_mind) if(show_message) for(var/mob/M in viewers(cult_mind.current)) - to_chat(M, "[cult_mind.current] looks like [cult_mind.current.p_they()] just reverted to [cult_mind.current.p_their()] old faith!") + to_chat(M, "[cult_mind.current] looks like [cult_mind.current.p_they()] just reverted to [cult_mind.current.p_their()] old faith!") /datum/game_mode/proc/update_cult_icons_added(datum/mind/cult_mind) @@ -284,11 +284,11 @@ GLOBAL_LIST_EMPTY(all_cults) if(!check_cult_victory()) feedback_set_details("round_end_result","cult win - cult win") feedback_set("round_end_result",acolytes_survived) - to_chat(world, " The cult wins! It has succeeded in serving its dark masters!") + to_chat(world, " The cult wins! It has succeeded in serving its dark masters!") else feedback_set_details("round_end_result","cult loss - staff stopped the cult") feedback_set("round_end_result",acolytes_survived) - to_chat(world, " The staff managed to stop the cult!") + to_chat(world, " The staff managed to stop the cult!") var/text = "Cultists escaped: [acolytes_survived]" @@ -299,7 +299,7 @@ GLOBAL_LIST_EMPTY(all_cults) switch(objectives[obj_count]) if("survive") if(!check_survive()) - explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. Success!" + explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. Success!" feedback_add_details("cult_objective","cult_survive|SUCCESS|[acolytes_needed]") else explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. Fail." @@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(all_cults) if("sacrifice") if(sacrifice_target) if(sacrifice_target in sacrificed) - explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. Success!" + explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. Success!" feedback_add_details("cult_objective","cult_sacrifice|SUCCESS") else if(sacrifice_target && sacrifice_target.current) explanation = "Sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role]. Fail." @@ -317,7 +317,7 @@ GLOBAL_LIST_EMPTY(all_cults) feedback_add_details("cult_objective","cult_sacrifice|FAIL|GIBBED") if("eldergod") if(!eldergod) - explanation = "Summon [SSticker.cultdat.entity_name]. Success!" + explanation = "Summon [SSticker.cultdat.entity_name]. Success!" feedback_add_details("cult_objective","cult_narsie|SUCCESS") else explanation = "Summon [SSticker.cultdat.entity_name]. Fail." @@ -332,45 +332,45 @@ GLOBAL_LIST_EMPTY(all_cults) if("convert")//convert half the crew if(cult.len >= convert_target) - explanation = "Convert [convert_target] crew members ([cult.len] cultists at round end). Success!" + explanation = "Convert [convert_target] crew members ([cult.len] cultists at round end). Success!" feedback_add_details("cult_objective","cult_convertion|SUCCESS") else - explanation = "Convert [convert_target] crew members ([cult.len] total cultists). Fail." + explanation = "Convert [convert_target] crew members ([cult.len] total cultists). Fail." feedback_add_details("cult_objective","cult_convertion|FAIL") if("bloodspill")//cover a large portion of the station in blood if(max_spilled_blood >= spilltarget) - explanation = "Cover [spilltarget] tiles of the station in blood (The peak number of covered tiles was: [max_spilled_blood]). Success!" + explanation = "Cover [spilltarget] tiles of the station in blood (The peak number of covered tiles was: [max_spilled_blood]). Success!" feedback_add_details("cult_objective","cult_bloodspill|SUCCESS") else - explanation = "Cover [spilltarget] tiles of the station in blood (The peak number of covered tiles was: [max_spilled_blood]). Fail." + explanation = "Cover [spilltarget] tiles of the station in blood (The peak number of covered tiles was: [max_spilled_blood]). Fail." feedback_add_details("cult_objective","cult_bloodspill|FAIL") if("harvest") if(harvested > harvest_target) - explanation = "Offer [harvest_target] humanoids for [SSticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Success!" + explanation = "Offer [harvest_target] humanoids for [SSticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Success!" feedback_add_details("cult_objective","cult_harvest|SUCCESS") else - explanation = "Offer [harvest_target] humanoids for [SSticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Fail." + explanation = "Offer [harvest_target] humanoids for [SSticker.cultdat.entity_name]'s first meal of the day. ([harvested] sacrificed) Fail." feedback_add_details("cult_objective","cult_harvest|FAIL") if("hijack") if(!escaped_shuttle) - explanation = "Do not let a single non-cultist board the Escape Shuttle. ([escaped_shuttle] escaped on the shuttle) ([escaped_pod] escaped on pods) Success!" + explanation = "Do not let a single non-cultist board the Escape Shuttle. ([escaped_shuttle] escaped on the shuttle) ([escaped_pod] escaped on pods) Success!" feedback_add_details("cult_objective","cult_hijack|SUCCESS") else - explanation = "Do not let a single non-cultist board the Escape Shuttle. ([escaped_shuttle] escaped on the shuttle) ([escaped_pod] escaped on pods) Fail." + explanation = "Do not let a single non-cultist board the Escape Shuttle. ([escaped_shuttle] escaped on the shuttle) ([escaped_pod] escaped on pods) Fail." feedback_add_details("cult_objective","cult_hijack|FAIL") if("massacre") if(survivors < massacre_target) - explanation = "Massacre the crew until less than [massacre_target] people are left on the station. ([survivors] humanoids left alive) Success!" + explanation = "Massacre the crew until less than [massacre_target] people are left on the station. ([survivors] humanoids left alive) Success!" feedback_add_details("cult_objective","cult_massacre|SUCCESS") else - explanation = "Massacre the crew until less than [massacre_target] people are left on the station. ([survivors] humanoids left alive) Fail." + explanation = "Massacre the crew until less than [massacre_target] people are left on the station. ([survivors] humanoids left alive) Fail." feedback_add_details("cult_objective","cult_massacre|FAIL") - text += "
Objective #[obj_count]: [explanation]" + text += "
Objective #[obj_count]: [explanation]" to_chat(world, text) ..() @@ -379,7 +379,7 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/proc/auto_declare_completion_cult() if(cult.len || (SSticker && GAMEMODE_IS_CULT)) - var/text = "The cultists were:" + var/text = "The cultists were:" for(var/datum/mind/cultist in cult) text += "
[cultist.key] was [cultist.name] (" diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index 18c08d89460..38bd1919c62 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -27,8 +27,8 @@ explanation = "We need to sacrifice [sacrifice_target.name], the [sacrifice_target.assigned_role], for [sacrifice_target.p_their()] blood is the key that will lead our master to this realm. You will need 3 cultists around a Sacrifice rune to perform the ritual." for(var/datum/mind/cult_mind in cult) - to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") - cult_mind.memory += "Objective #[current_objective]: [explanation]
" + to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") + cult_mind.memory += "Objective #[current_objective]: [explanation]
" /datum/game_mode/cult/proc/bypass_phase() @@ -89,8 +89,8 @@ for(var/datum/mind/cult_mind in cult) if(cult_mind) to_chat(cult_mind.current, "You and your acolytes have completed your task, but this place requires yet more preparation!") - to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") - cult_mind.memory += "Objective #[current_objective]: [explanation]
" + to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") + cult_mind.memory += "Objective #[current_objective]: [explanation]
" message_admins("New Cult Objective: [new_objective]") log_admin("New Cult Objective: [new_objective]") @@ -104,8 +104,8 @@ for(var/datum/mind/cult_mind in cult) if(cult_mind) to_chat(cult_mind.current, "You and your acolytes suddenly feel the urge to do your best, but survive!") - to_chat(cult_mind.current, "Objective Survive: [explanation]") - cult_mind.memory += "Objective Survive: [explanation]
" + to_chat(cult_mind.current, "Objective Survive: [explanation]") + cult_mind.memory += "Objective Survive: [explanation]
" /datum/game_mode/cult/proc/second_phase() @@ -122,8 +122,8 @@ for(var/datum/mind/cult_mind in cult) if(cult_mind) to_chat(cult_mind.current, "You and your acolytes have succeeded in preparing the station for the ultimate ritual!") - to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") - cult_mind.memory += "Objective #[current_objective]: [explanation]
" + to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") + cult_mind.memory += "Objective #[current_objective]: [explanation]
" /datum/game_mode/cult/proc/third_phase() current_objective++ @@ -146,8 +146,8 @@ for(var/datum/mind/cult_mind in cult) if(cult_mind) - to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") - cult_mind.memory += "Objective #[current_objective]: [explanation]
" + to_chat(cult_mind.current, "Objective #[current_objective]: [explanation]") + cult_mind.memory += "Objective #[current_objective]: [explanation]
" message_admins("Last Cult Objective: [last_objective]") log_admin("Last Cult Objective: [last_objective]") diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 1232e5bea67..60d2a7ff73b 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -61,17 +61,17 @@ /obj/item/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1) var/dat = list() - dat += "There are [uses] bloody runes on the parchment.
" - dat += "Please choose the chant to be imbued into the fabric of reality.
" + dat += "There are [uses] bloody runes on the parchment.
" + dat += "Please choose the chant to be imbued into the fabric of reality.
" dat += "
" - dat += "N'ath reth sh'yro eth d'raggathnor! - Summons an arcane tome, used to scribe runes and communicate with other cultists.
" - dat += "Bar'tea eas! - Provides 5 runed metal.
" - dat += "Sas'so c'arta forbici! - Allows you to move to a selected teleportation rune.
" - dat += "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
" - dat += "Fuu ma'jin! - Allows you to stun a person by attacking them with the talisman.
" - dat += "Kla'atu barada nikt'o! - Two use talisman, first use makes all nearby runes invisible, second use reveals nearby hidden runes.
" - dat += "Kal'om neth! - Summons a soul stone, used to capture the spirits of dead or dying humans.
" - dat += "Daa'ig osk! - Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person.
" + dat += "N'ath reth sh'yro eth d'raggathnor! - Summons an arcane tome, used to scribe runes and communicate with other cultists.
" + dat += "Bar'tea eas! - Provides 5 runed metal.
" + dat += "Sas'so c'arta forbici! - Allows you to move to a selected teleportation rune.
" + dat += "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
" + dat += "Fuu ma'jin! - Allows you to stun a person by attacking them with the talisman.
" + dat += "Kla'atu barada nikt'o! - Two use talisman, first use makes all nearby runes invisible, second use reveals nearby hidden runes.
" + dat += "Kal'om neth! - Summons a soul stone, used to capture the spirits of dead or dying humans.
" + dat += "Daa'ig osk! - Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person.
" var/datum/browser/popup = new(user, "talisman", "", 400, 400) popup.set_content(jointext(dat, "")) popup.open()