Merge remote-tracking branch 'origin/master' into rustsql

code/game/gamemodes/gangs/gang_items.dm

@@ -133,7 +133,7 @@
 	icon_state = "knuckles"
 	w_class = 3
 
-datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang member anyways?
+/datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang member anyways?
 	name = "Cool Sunglasses"
 	id = "glasses"
 	cost = 5
@@ -313,13 +313,13 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
 	permeability_coefficient = 0.01
 	clothing_flags = NOSLIP
 
-datum/gang_item/equipment/shield
+/datum/gang_item/equipment/shield
 	name = "Riot Shield"
 	id = "riot_shield"
 	cost = 25
 	item_path = /obj/item/shield/riot
 
-datum/gang_item/equipment/gangsheild
+/datum/gang_item/equipment/gangsheild
 	name = "Tower Shield"
 	id = "metal"
 	cost = 45 //High block of melee and even higher for bullets

code/game/gamemodes/objective.dm

@@ -455,7 +455,7 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo.
 	var/target_real_name // Has to be stored because the target's real_name can change over the course of the round
 	var/target_missing_id
 
-/datum/objective/escape/escape_with_identity/find_target()
+/datum/objective/escape/escape_with_identity/find_target(dupe_search_range, blacklist)
 	target = ..()
 	update_explanation_text()
 
@@ -553,7 +553,7 @@ GLOBAL_LIST_EMPTY(possible_items)
 		for(var/I in subtypesof(/datum/objective_item/steal))
 			new I
 
-/datum/objective/steal/find_target()
+/datum/objective/steal/find_target(dupe_search_range, blacklist)
 	var/list/datum/mind/owners = get_owners()
 	var/approved_targets = list()
 	check_items:
@@ -631,7 +631,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 		for(var/I in subtypesof(/datum/objective_item/special) + subtypesof(/datum/objective_item/stack))
 			new I
 
-/datum/objective/steal/special/find_target()
+/datum/objective/steal/special/find_target(dupe_search_range, blacklist)
 	return set_target(pick(GLOB.possible_items_special))
 
 /datum/objective/steal/exchange
@@ -844,7 +844,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	name = "destroy AI"
 	martyr_compatible = 1
 
-/datum/objective/destroy/find_target()
+/datum/objective/destroy/find_target(dupe_search_range, blacklist)
 	var/list/possible_targets = active_ais(1)
 	var/mob/living/silicon/ai/target_ai = pick(possible_targets)
 	target = target_ai.mind
@@ -1124,7 +1124,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 /datum/objective/hoard/heirloom
 	name = "steal heirloom"
 
-/datum/objective/hoard/heirloom/find_target()
+/datum/objective/hoard/heirloom/find_target(dupe_search_range, blacklist)
 	set_target(pick(GLOB.family_heirlooms))
 
 GLOBAL_LIST_EMPTY(traitor_contraband)
@@ -1141,7 +1141,7 @@ GLOBAL_LIST_EMPTY(cult_contraband)
 	if(!GLOB.cult_contraband.len)
 		GLOB.cult_contraband = list(/obj/item/clockwork/slab,/obj/item/clockwork/component/belligerent_eye,/obj/item/clockwork/component/belligerent_eye/lens_gem,/obj/item/shuttle_curse,/obj/item/cult_shift)
 
-/datum/objective/hoard/collector/find_target()
+/datum/objective/hoard/collector/find_target(dupe_search_range, blacklist)
 	var/obj/item/I
 	var/I_type
 	if(prob(50))
@@ -1172,7 +1172,7 @@ GLOBAL_LIST_EMPTY(possible_sabotages)
 		for(var/I in subtypesof(/datum/sabotage_objective))
 			new I
 
-/datum/objective/sabotage/find_target()
+/datum/objective/sabotage/find_target(dupe_search_range, blacklist)
 	var/list/datum/mind/owners = get_owners()
 	var/approved_targets = list()
 	check_sabotages:

code/game/gamemodes/objective_sabotage.dm

@@ -33,6 +33,7 @@
 /datum/sabotage_objective/processing/check_conditions()
 	return won
 
+/*
 /datum/sabotage_objective/processing/power_sink
 	name = "Drain at least 100 megajoules of power using a power sink."
 	sabotage_type = "powersink"
@@ -44,6 +45,7 @@
 	for(var/s in GLOB.power_sinks)
 		var/obj/item/powersink/sink = s
 		won = max(won,sink.power_drained/1e8)
+*/
 
 /obj/item/paper/guides/antag/supermatter_sabotage
 	info = "Ways to sabotage a supermatter:<br>\