diff --git a/code/modules/background/citizenship/citizenship.dm b/code/modules/background/citizenship/citizenship.dm index d58da330ef8..40880ed2a3e 100644 --- a/code/modules/background/citizenship/citizenship.dm +++ b/code/modules/background/citizenship/citizenship.dm @@ -10,14 +10,14 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) - rep_objectives = pick("Collect evidence of NanoTrasen being unfair or oppressive against employees from [name], to be used as leverage in future diplomatic talks", + rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or oppressive against employees from [name], to be used as leverage in future diplomatic talks", "Convince [rand(1,3)] [demonym] employees to apply for the [demonym] armed forces") if(REPRESENTATIVE_MISSION_MEDIUM) - rep_objectives = pick("Have [rand(2,5)] amount of [demonym] citizens write down their grievances with the company, and present the report to station command") + rep_objectives = pick("Have [rand(2,5)] amount of [demonym] citizens write down their grievances with the company, and present the report to vessel command") else - rep_objectives = pick("Collect [rand(3,7)] pictures of secure station areas", - "Convince station command to turn a [demonym] crewmember's sentence into a fine") + rep_objectives = pick("Collect [rand(3,7)] pictures of secure vessel areas", + "Convince Horizon command to turn a [demonym] crewmember's sentence into a fine") - return rep_objectives \ No newline at end of file + return rep_objectives diff --git a/code/modules/background/citizenship/human.dm b/code/modules/background/citizenship/human.dm index 021b9475f5a..2676fdd3012 100644 --- a/code/modules/background/citizenship/human.dm +++ b/code/modules/background/citizenship/human.dm @@ -86,15 +86,15 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) - rep_objectives = pick("Collect evidence of NanoTrasen being unfair or oppressive against Solarian employees, to be used as leverage in future diplomatic talks.", + rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or oppressive against Solarian employees, to be used as leverage in future diplomatic talks.", "Convince [rand(1,3)] solarian employees to apply for the Solarian armed forces.") if(REPRESENTATIVE_MISSION_MEDIUM) - rep_objectives = pick("Have [rand(2,5)] amount of Sol citizens write down their grievances with the company, and present the report to station command.", + rep_objectives = pick("Have [rand(2,5)] amount of Sol citizens write down their grievances with the company, and present the report to [current_map.station_short] command.", "Convince [rand(3,6)] qualified specialists among crew to enter Sol Alliance space, and issue them a visa recommendation.") else - rep_objectives = pick("Collect [rand(3,7)] pictures of secure station areas.", - "Convince station command to turn a Solarian crewmember's sentence into a fine.") + rep_objectives = pick("Collect [rand(3,7)] pictures of secure [current_map.station_short] areas.", + "Convince Horizon command to turn a Solarian crewmember's sentence into a fine.") return rep_objectives @@ -200,14 +200,14 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) - rep_objectives = pick("Have [rand(2,5)] employees write their grievances with the stationbounds and IPC workers, and present the report to station command.", + rep_objectives = pick("Have [rand(2,5)] employees write their grievances with the stationbounds and IPC workers, and present the report to Horizon command.", "Convince [rand(2,5)] crewmembers of Moroz Holy Tribunal being the superior religion.") if(REPRESENTATIVE_MISSION_MEDIUM) rep_objectives = pick("Promote and distribute the copies of Dominian Code of Honor to [rand(3,6)] crewmembers.", - "Convince a Dominian citizen to return to the Empire with valuable information on NanoTrasen to present.") + "Convince a Dominian citizen to return to the Empire with valuable information on the [current_map.boss_name] to present.") else - rep_objectives = pick("Collect [rand(3,7)] pictures of secure station areas.", + rep_objectives = pick("Collect [rand(3,7)] pictures of secure vessel areas.", "Convince [rand(3,6)] crewmembers to apply for a Dominian tourist visa.") return rep_objectives diff --git a/code/modules/background/citizenship/skrell.dm b/code/modules/background/citizenship/skrell.dm index 8cf20f7d763..2aef67161d1 100644 --- a/code/modules/background/citizenship/skrell.dm +++ b/code/modules/background/citizenship/skrell.dm @@ -42,7 +42,7 @@ "Curtail the spreading of written literature or verbal notions that contain negative connotations towards the Federation") if(REPRESENTATIVE_MISSION_MEDIUM) - rep_objectives = pick("Ensure the interests of Federation citizens are upheld by the station. This includes C'thur and Diona of Federation origin", + rep_objectives = pick("Ensure the interests of Federation citizens are upheld by the vessel. This includes C'thur and Diona of Federation origin", "Legally curtail the advancements and liberal thinking towards synthetics", "The [current_map.station_name] hosts some of the brightest minds in the galaxy; winning them over towards the Federation is a major victory") else diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index 567e7d6b62d..112382a07f0 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -36,7 +36,7 @@ /datum/citizenship/pra/get_objectives(mission_level, var/mob/living/carbon/human/H) switch(mission_level) if(REPRESENTATIVE_MISSION_LOW) - return "Ensure the loyalty of PRA Citizen to the Party and President Hadii. You must also promote the relationship between NanoTrasen and the People's Republic through diplomacy." + return "Ensure the loyalty of PRA Citizen to the Party and President Hadii. You must also promote the relationship between the [current_map.boss_name] and the People's Republic through diplomacy." /datum/outfit/job/representative/consular/pra name = "PRA Consular Officer" @@ -149,7 +149,7 @@ /datum/citizenship/nka/get_objectives(mission_level, var/mob/living/carbon/human/H) switch(mission_level) if(REPRESENTATIVE_MISSION_LOW) - return "Ensure that NKA citizens are loyal to the Crown. You must also promote the relationship between NanoTrasen and the New Kingdom through diplomacy." + return "Ensure that NKA citizens are loyal to the Crown. You must also promote the relationship between the [current_map.boss_name] and the New Kingdom through diplomacy." /datum/outfit/job/representative/consular/nka name = "NKA Consular Officer" diff --git a/code/modules/background/citizenship/unathi.dm b/code/modules/background/citizenship/unathi.dm index 99f5e3f2ec0..e20cbf32b5d 100644 --- a/code/modules/background/citizenship/unathi.dm +++ b/code/modules/background/citizenship/unathi.dm @@ -38,25 +38,24 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) if(isvaurca(H)) - rep_objectives = pick("Assist K'laxan Nanotrasen personnel with their avowal process", - "Obtain [rand(2,3)] sheets of solid phoron below market value, buying directly from the source") + rep_objectives = pick("Obtain [rand(2,3)] sheets of solid phoron below market value, buying directly from the source") else rep_objectives = pick("Encourage [rand(1,2)] Unathi to become Zo'saa by signing up with the local Order", "Gather [rand(2,3)] evidences of any marginalization of Unathi beliefs") if(REPRESENTATIVE_MISSION_MEDIUM) if(isvaurca(H)) - rep_objectives = pick("Collect evidence of Nanotrasen being unfair or bigoted to Vaurca or Unathi Employees, to be used as leverage in future labor negotiations", + rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca or Unathi Employees, to be used as leverage in future labor negotiations", "Upsell K'laxan Vaurca to different command staff. Have one complete a Bound Vaurca requisition form") else - rep_objectives = pick("Speak out against any violation of the Honor Code to or by Unathi on station", + rep_objectives = pick("Speak out against any violation of the Honor Code to or by Unathi on the [current_map.station_short]", "Proselytize the Sk'akh or Tha'kh religions to the crew", "Encourage [rand(2,4)] Unathi to visit the Akhandi Order temples in Tau Ceti") else if(isvaurca(H)) rep_objectives = pick("Promote Cultural Exchange between Vaurca, Unathi and other species") else - rep_objectives = pick("Ensure all Unathi on station are being respected in their beliefs and customs and traditions", + rep_objectives = pick("Ensure all Unathi on the are being respected in their beliefs and customs and traditions", "Discourage people from associating with Guwans, but convince [rand(2,3)] Guwan to redeem themselves by becoming Zo'saa or Ahkandi") return rep_objectives diff --git a/code/modules/background/citizenship/vaurca.dm b/code/modules/background/citizenship/vaurca.dm index ed860c4ab15..d9c346f6bf0 100644 --- a/code/modules/background/citizenship/vaurca.dm +++ b/code/modules/background/citizenship/vaurca.dm @@ -38,17 +38,16 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) - rep_objectives = pick("Collect evidence of Nanotrasen being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations", + rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations", "Begin the TCFL enlistment process for an individual, completing an Enlistment form to be turned in by the individual", "Develop a metric to grade the performance of different Vaurca broods that share a job") if(REPRESENTATIVE_MISSION_MEDIUM) - rep_objectives = pick("Assist Zo'ra Nanotrasen personnel in their avowal process", - "Promote [rand(3,6)] amount of Zo'rane products, be it energy drinks or merchandise", - "Sell [rand(3,6)] copies of the Tau Ceti Foreign Legion pamphlets, 10 credits each") + rep_objectives = pick("Promote [rand(3,6)] amount of Zo'rane products, be it energy drinks or merchandise", + "Sell [rand(3,6)] copies of the Tau Ceti Foreign Legion pamphlets 10 credits each") else rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement", - "Protect and promote the public image of the Zo'ra hive to all Nanotrasen employees") + "Protect and promote the public image of the Zo'ra hive to all SCC employees") return rep_objectives @@ -112,15 +111,14 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) - rep_objectives = pick("Collect evidence of Nanotrasen being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations", + rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations", "Develop a metric to grade the performance of different Vaurca broods that share a job") if(REPRESENTATIVE_MISSION_MEDIUM) - rep_objectives = pick("Assist K'lax Nanotrasen personnel in their avowal process", - "Promote [rand(3,6)] amount of K'laxan products, be it energy drinks or merchandise") + rep_objectives = pick("Promote [rand(3,6)] amount of K'laxan products, be it energy drinks or merchandise") else rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement", - "Protect and promote the public image of the K'lax hive to all Nanotrasen employees") + "Protect and promote the public image of the K'lax hive to all [current_map.boss_name] employees") return rep_objectives @@ -183,15 +181,15 @@ switch(mission_level) if(REPRESENTATIVE_MISSION_HIGH) - rep_objectives = pick("Collect evidence of Nanotrasen being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations", + rep_objectives = pick("Collect evidence of the [current_map.boss_name] being unfair or bigoted to Vaurca employees, to be used as leverage in future hive labor negotiations", "Develop a metric to grade the performance of different Vaurca broods that share a job") if(REPRESENTATIVE_MISSION_MEDIUM) - rep_objectives = pick("Assist C'thur Nanotrasen personnel in their avowal process", - "Promote [rand(3,6)] amount of C'thuric products, be it energy drinks or merchandise") + rep_objectives = pick("Promote [rand(3,6)] amount of C'thuric products, be it energy drinks or merchandise") + else rep_objectives = pick("Question Non-Vaurcan employees about Vaurcan employees, looking for areas of improvement", - "Protect and promote the public image of the C'thur hive to all Nanotrasen employees") + "Protect and promote the public image of the C'thur hive to all [current_map.boss_name] employees") return rep_objectives diff --git a/html/changelogs/connorjg1-diplomacy.yml b/html/changelogs/connorjg1-diplomacy.yml new file mode 100644 index 00000000000..a024a849a0c --- /dev/null +++ b/html/changelogs/connorjg1-diplomacy.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Connorjg1 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Removed mentions of NanoTrasen and station in Consular directives. Replaced them with the SCC and Horizon respectively." +