shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crew objectives no longer count towards antags greentexting

Browse Source
This commit is contained in:
deathride58
2017-10-06 09:56:42 -04:00
parent 39d3897b29
commit 7ca2bd48a5
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/changeling/changeling.dm
+14 -7
View File
@@ -245,13 +245,21 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w
if(changeling.objectives.len) if(changeling.objectives.len)
var/count = 1 var/count = 1
for(var/datum/objective/objective in changeling.objectives) for(var/datum/objective/objective in changeling.objectives)
if(objective.check_completion()) if(istype(objective, /datum/objective/crew))
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font>" if(objective.check_completion())
SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS") text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
else
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
else else
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span>" if(objective.check_completion())
SSblackbox.add_details("changeling_objective","[objective.type]|FAIL") text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font>"
changelingwin = 0 SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
else
text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span>"
SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
changelingwin = 0
count++ count++
if(changelingwin) if(changelingwin)
@@ -520,4 +528,3 @@ GLOBAL_LIST_INIT(slot2type, list("head" = /obj/item/clothing/head/changeling, "w
var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING] var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING]
hud.leave_hud(changling_mind.current) hud.leave_hud(changling_mind.current)
set_antag_hud(changling_mind.current, null) set_antag_hud(changling_mind.current, null)
code/game/gamemodes/traitor/traitor.dm
+14 -6
View File
@@ -111,13 +111,21 @@
if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this. if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this.
var/count = 1 var/count = 1
for(var/datum/objective/objective in traitor.objectives) for(var/datum/objective/objective in traitor.objectives)
if(objective.check_completion()) if(istype(objective, /datum/objective/crew))
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>" if(objective.check_completion())
SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS") objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
else else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>" if(objective.check_completion())
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL") objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
traitorwin = 0 SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
traitorwin = 0
count++ count++
if(uplink_true) if(uplink_true)
code/game/gamemodes/wizard/wizard.dm
+14 -6
View File
@@ -212,13 +212,21 @@
var/count = 1 var/count = 1
var/wizardwin = 1 var/wizardwin = 1
for(var/datum/objective/objective in wizard.objectives) for(var/datum/objective/objective in wizard.objectives)
if(objective.check_completion()) if(istype(objective, /datum/objective/crew))
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>" if(objective.check_completion())
SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS") text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
else else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>" if(objective.check_completion())
SSblackbox.add_details("wizard_objective","[objective.type]|FAIL") text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
wizardwin = 0 SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
else
text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
wizardwin = 0
count++ count++
if(wizard.current && wizard.current.stat!=2 && wizardwin) if(wizard.current && wizard.current.stat!=2 && wizardwin)