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

</span>

Browse Source
This commit is contained in:
Putnam
2020-02-01 06:01:54 -08:00
parent 50a53c6558
commit d6d01d848c
11 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/roundend.dm
+1 -1
View File
@@ -566,7 +566,7 @@
else
objective_parts += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
objective_parts += "<B>Objective #[count]</B>: [objective.explanation_text]"
objective_parts += "<B>Objective #[count]</B>: [objective.explanation_text]</span>"
count++
return objective_parts.Join("<br>")
code/datums/mind.dm
+4 -4
View File
@@ -374,7 +374,7 @@
output += "<B>Objectives:</B>"
var/obj_count = 1
for(var/datum/objective/objective in all_objectives)
output += "<br><B>Objective #[obj_count++]</B>: [objective.explanation_text]"
output += "<br><B>Objective #[obj_count++]</B>: [objective.explanation_text]</span>"
var/list/datum/mind/other_owners = objective.get_owners() - src
if(other_owners.len)
output += "<ul>"
@@ -523,8 +523,8 @@
to_chat(usr,"Invalid objective.")
return
qdel(objective) //TODO: Needs cleaning objective destroys (whatever that means)
message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]")
log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]")
message_admins("[key_name_admin(usr)] removed an objective for [current]: [objective.explanation_text]</span>")
log_admin("[key_name(usr)] removed an objective for [current]: [objective.explanation_text]</span>")
else if(href_list["obj_completed"])
var/datum/objective/objective
@@ -537,7 +537,7 @@
to_chat(usr,"Invalid objective.")
return
objective.completed = !objective.completed
log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]")
log_admin("[key_name(usr)] toggled the win state for [current]'s objective: [objective.explanation_text]</span>")
else if (href_list["silicon"])
switch(href_list["silicon"])
code/game/gamemodes/objective.dm
+3
View File
@@ -1157,3 +1157,6 @@ GLOBAL_LIST_EMPTY(possible_sabotages)
/datum/objective/flavor/wizard
flavor_file = "strings/flavor_objectives/wizard.txt"
/datum/objective/flavor/bloodsucker
flavor_file = "strings/flavor_objectives/bloodsucker.txt"
code/modules/antagonists/_common/antag_team.dm
+1 -1
View File
@@ -46,7 +46,7 @@
else
report += "<B>Objective #[objective_count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
report += "<B>Objective #[objective_count]</B>: [objective.explanation_text]"
report += "<B>Objective #[objective_count]</B>: [objective.explanation_text]</span>"
objective_count++
if(win)
report += "<span class='greentext'>The [name] was successful!</span>"
code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+1 -1
View File
@@ -372,7 +372,7 @@ datum/antagonist/bloodsucker/proc/SpendRank()
protege_objective.generate_objective()
add_objective(protege_objective)
if (rand(0,1) == 0)
if (prob(50))
// Heart Thief Objective
var/datum/objective/bloodsucker/heartthief/heartthief_objective = new
heartthief_objective.owner = owner
code/modules/antagonists/brother/brother.dm
+1 -1
View File
@@ -118,7 +118,7 @@
else
parts += "<B>Objective #[objective_count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
parts += "<B>Objective #[objective_count]</B>: [objective.explanation_text]"
parts += "<B>Objective #[objective_count]</B>: [objective.explanation_text]</span>"
objective_count++
if(win)
parts += "<span class='greentext'>The blood brothers were successful!</span>"
code/modules/antagonists/changeling/changeling.dm
+1 -1
View File
@@ -564,7 +564,7 @@
else
parts += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
parts += "<B>Objective #[count]</B>: [objective.explanation_text]"
parts += "<B>Objective #[count]</B>: [objective.explanation_text]</span>"
count++
if(changelingwin)
code/modules/antagonists/cult/cult.dm
+1 -1
View File
@@ -434,7 +434,7 @@
else
parts += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
parts += "<B>Objective #[count]</B>: [objective.explanation_text]"
parts += "<B>Objective #[count]</B>: [objective.explanation_text]</span>"
count++
if(members.len)
code/modules/antagonists/disease/disease_datum.dm
+1 -1
View File
@@ -54,7 +54,7 @@
else
result += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
result += "<B>Objective #[count]</B>: [objective.explanation_text]"
result += "<B>Objective #[count]</B>: [objective.explanation_text]</span>"
count++
result += objectives_text
code/modules/antagonists/traitor/datum_traitor.dm
+1 -1
View File
@@ -398,7 +398,7 @@
else
objectives_text += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
objectives_text += "<B>Objective #[count]</B>: [objective.explanation_text]"
objectives_text += "<B>Objective #[count]</B>: [objective.explanation_text]</span>"
count++
if(uplink_true)
code/modules/antagonists/wizard/wizard.dm
+1 -1
View File
@@ -276,7 +276,7 @@
else
parts += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='yellowtext'>[completion*100]%</span>"
else
parts += "<B>Objective #[count]</B>: [objective.explanation_text]"
parts += "<B>Objective #[count]</B>: [objective.explanation_text]</span>"
count++
if(wizardwin)