errors

2020-01-20 00:30:18 -08:00
parent 06c66617e6
commit 8e674817a9
8 changed files with 28 additions and 37 deletions
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -997,7 +997,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	return horded_item

 /datum/objective/horde/proc/set_target(obj/item/I)
-	if(item)
+	if(I)
 		horded_item = I
 		explanation_text = "Keep [I] on your person at all costs."
 		return horded_item
@@ -1023,7 +1023,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 /datum/objective/horde/heirloom
 	name = "steal heirloom"

-/datum/objective/horde/heirloom/proc/find_target()
+/datum/objective/horde/heirloom/find_target()
 	set_target(pick(GLOB.family_heirlooms))

 GLOBAL_LIST_EMPTY(possible_sabotages)
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/show_in_antagpanel = TRUE	//This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind
 	var/antagpanel_category = "Uncategorized"	//Antagpanel will display these together, REQUIRED
 	var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type
-	var/list/quirk_blacklist = list("Pacifist","Mute") // Quirks that will be removed upon gaining this antag. Pacifist and mute are default.
+	var/list/blacklisted_quirks = list("Pacifist","Mute") // Quirks that will be removed upon gaining this antag. Pacifist and mute are default.

 /datum/antagonist/New()
 	GLOB.antagonists += src
@@ -120,12 +120,14 @@ GLOBAL_LIST_EMPTY(antagonists)
 	SEND_SIGNAL(owner.current, COMSIG_CLEAR_MOOD_EVENT, "antag_moodlet")

 /datum/antagonist/proc/remove_blacklisted_quirks()
-	for(var/q in owner.roundstart_quirks)	
-		var/datum/quirk/Q = q
-		if(Q.name in quirk_blacklist)
-			if(Q.antag_removal_text)
-				to_chat(owner, "<span class='boldannounce'>[Q.antag_removal_text]</span>")
-			owner.remove_quirk(Q.type)
+	var/mob/living/L = owner
+	if(istype(L))
+		for(var/q in L.roundstart_quirks)	
+			var/datum/quirk/Q = q
+			if(Q.name in blacklisted_quirks)
+				if(Q.antag_removal_text)
+					to_chat(L, "<span class='boldannounce'>[Q.antag_removal_text]</span>")
+				L.remove_quirk(Q.type)

 //Returns the team antagonist belongs to if any.
 /datum/antagonist/proc/get_team()
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -110,14 +110,14 @@
 	for(var/datum/objective/objective in objectives)
 		if(objective.completable)
 			if(objective.check_completion())
-				report += "<B>Objective #[objective_count]</B>: [objective.explanation_text] <span class='greentext'><B>Success!</span>"
+				parts += "<B>Objective #[objective_count]</B>: [objective.explanation_text] <span class='greentext'><B>Success!</span>"
 			else
-				report += "<B>Objective #[objective_count]</B>: [objective.explanation_text] <span class='redtext'>Fail.</span>"
+				parts += "<B>Objective #[objective_count]</B>: [objective.explanation_text] <span class='redtext'>Fail.</span>"
 				win = FALSE
 		else
-			report += "<B>Objective #[objective_count]</B>: [objective.explanation_text]"
+			parts += "<B>Objective #[objective_count]</B>: [objective.explanation_text]"
 		objective_count++
-if(win)
+	if(win)
 		parts += "<span class='greentext'>The blood brothers were successful!</span>"
 	else
 		parts += "<span class='redtext'>The blood brothers have failed!</span>"
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -554,12 +554,12 @@
 		for(var/datum/objective/objective in objectives)
 			if(objective.completable)
 				if(objective.check_completion())
-					report += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='greentext'><B>Success!</span>"
+					parts += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='greentext'><B>Success!</span>"
 				else
-					report += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='redtext'>Fail.</span>"
-					win = FALSE
+					parts += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='redtext'>Fail.</span>"
+					changelingwin = FALSE
 			else
-				report += "<B>Objective #[count]</B>: [objective.explanation_text]"
+				parts += "<B>Objective #[count]</B>: [objective.explanation_text]"
 			count++

 	if(changelingwin)
--- a/code/modules/antagonists/survivalist/survivalist.dm
+++ b/code/modules/antagonists/survivalist/survivalist.dm
@@ -22,18 +22,6 @@
 /datum/antagonist/survivalist/guns
 	greet_message = "Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, and don't let anyone take them!"

-/datum/antagonist/survivalist/guns/forge_objectives()
-	var/datum/objective/steal_five_of_type/summon_guns/guns = new
-	guns.owner = owner
-	objectives += guns
-	..()
-
 /datum/antagonist/survivalist/magic
 	name = "Amateur Magician"
 	greet_message = "This magic stuff is... so powerful. You want more. More! They want your power. They can't have it! Don't let them have it!"
-
-/datum/antagonist/survivalist/magic/forge_objectives()
-	var/datum/objective/steal_five_of_type/summon_magic/magic = new
-	magic.owner = owner
-	objectives += magic
-	..()
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -385,12 +385,12 @@
 		for(var/datum/objective/objective in objectives)
 			if(objective.completable)
 				if(objective.check_completion())
-					report += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='greentext'><B>Success!</span>"
+					objectives_text += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='greentext'><B>Success!</span>"
 				else
-					report += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='redtext'>Fail.</span>"
+					objectives_text += "<B>Objective #[count]</B>: [objective.explanation_text] <span class='redtext'>Fail.</span>"
 					traitorwin = FALSE
 			else
-				report += "<B>Objective #[count]</B>: [objective.explanation_text]"
+				objectives_text += "<B>Objective #[count]</B>: [objective.explanation_text]"
 			count++

 	if(uplink_true)
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -102,9 +102,9 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 	var/gun_type = pick(GLOB.summoned_guns)
 	var/obj/item/gun/G = new gun_type(get_turf(H))
 	G.unlock()
-	var/datum/antagonist/survalist/guns/our_antag_datum = has_antag_datum(/datum/antagonist/survivalist/guns)
+	var/datum/antagonist/survivalist/guns/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/guns)
 	if(our_antag_datum)
-		var/datum/objective/horde_item/O = new()
+		var/datum/objective/horde/O = new()
 		O.owner = H
 		O.set_target(G)
 		our_antag_datum.objectives += O
@@ -134,9 +134,9 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
 	var/obj/item/M = new magic_type(get_turf(H))
 	playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1)

-	var/datum/antagonist/survalist/magic/our_antag_datum = has_antag_datum(/datum/antagonist/survivalist/magic)
-	if(our_antag_datum)
-		var/datum/objective/horde_item/O = new()
+	var/datum/antagonist/survivalist/magic/our_antag_datum = H.mind.has_antag_datum(/datum/antagonist/survivalist/magic)
+	if(istype(our_antag_datum))
+		var/datum/objective/horde/O = new()
 		O.owner = H
 		O.set_target(M)
 		our_antag_datum.objectives += O
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -567,6 +567,7 @@
 #include "code\game\gamemodes\game_mode.dm"
 #include "code\game\gamemodes\objective.dm"
 #include "code\game\gamemodes\objective_items.dm"
+#include "code\game\gamemodes\objective_sabotage.dm"
 #include "code\game\gamemodes\bloodsucker\bloodsucker.dm"
 #include "code\game\gamemodes\bloodsucker\hunter.dm"
 #include "code\game\gamemodes\brother\traitor_bro.dm"