Merge pull request #11377 from Kraseo/contractor-fixes

Some contractor adjustments & fixes

code/__HELPERS/game.dm

@@ -564,13 +564,13 @@
 	var/list/possible_loc = list()
 	for(var/turf/found_turf in turfs)
 		var/area/turf_area = get_area(found_turf)
-		if (specific_area)	// We check if both the turf is a floor, and that it's actually in the area. // We also want a location that's clear of any obstructions.
+		if(specific_area)	// We check if both the turf is a floor, and that it's actually in the area. // We also want a location that's clear of any obstructions.
 			if(!istype(turf_area, specific_area))
 				continue
 		if(!isspaceturf(found_turf))
 			if(!is_blocked_turf(found_turf))
 				possible_loc.Add(found_turf)
-	if (possible_loc.len < 1)	// Need at least one free location.
+	if(possible_loc.len < 1)	// Need at least one free location.
 		return FALSE
 	return pick(possible_loc)
 

code/game/gamemodes/objective.dm

@@ -1168,7 +1168,7 @@ GLOBAL_LIST_EMPTY(possible_sabotages)
 	var/found = FALSE
 	while(!found)
 		var/area/dropoff_area = pick(GLOB.sortedAreas)
-		if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors)
+		if(dropoff_area && is_station_level(dropoff_area.z) && !dropoff_area.outdoors && !istype(dropoff_area, /area/shuttle/))
 			dropoff = dropoff_area
 			found = TRUE
 

code/game/objects/items/melee/misc.dm

@@ -378,7 +378,7 @@
 	item_flags = NONE
 	force = 5
 	cooldown = 20
-	stam_dmg = 45	//3 hit stamcrit
+	stam_dmg = 45	//4 hit stamcrit
 	affect_silicon = TRUE
 	on_sound = 'sound/weapons/contractorbatonextend.ogg'
 	on_stun_sound = 'sound/effects/contractorbatonhit.ogg'

code/game/objects/items/storage/uplink_kits.dm

@@ -481,8 +481,7 @@
 		/obj/item/clothing/gloves/krav_maga/combatglovesplus,
 		/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/riot,
 		/obj/item/reagent_containers/syringe/stimulants,
-		/obj/item/storage/box/syndie_kit/imp_freedom,
-		/obj/item/toy/eightball/haunted
+		/obj/item/storage/box/syndie_kit/imp_freedom
 	)
 	var/obj/item1 = pick_n_take(item_list)
 	var/obj/item2 = pick_n_take(item_list)

code/modules/antagonists/traitor/syndicate_contract.dm

@@ -2,6 +2,7 @@
 	var/id = 0
 	var/status = CONTRACT_STATUS_INACTIVE
 	var/datum/objective/contract/contract = new()
+	var/target_rank
 	var/ransom = 0
 	var/payout_type = null
 	var/list/victim_belongings = list()
@@ -13,6 +14,11 @@
 
 /datum/syndicate_contract/proc/generate(blacklist)
 	contract.find_target(null, blacklist)
+	var/datum/data/record/record = find_record("name", contract.target.name, GLOB.data_core.general)
+	if(record)
+		target_rank = record.fields["rank"]
+	else
+		target_rank = "Unknown"
 	if (payout_type == CONTRACT_PAYOUT_LARGE)
 		contract.payout_bonus = rand(9,13)
 	else if(payout_type == CONTRACT_PAYOUT_MEDIUM)

code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm

@@ -129,16 +129,9 @@
 				"item_icon" = hub_item.item_icon
 			))
 		for(var/datum/syndicate_contract/contract in traitor_data.contractor_hub.assigned_contracts)
-			var/target_rank = ""
-			if(contract.contract.target)
-				var/datum/data/record/record = find_record("name", contract.contract.target.current.real_name, GLOB.data_core.general)
-				if(record)
-					target_rank = record.fields["rank"]
-				else
-					target_rank = "Unknown"
 			data["contracts"] += list(list(
 				"target" = contract.contract.target,
-				"target_rank" = target_rank,
+				"target_rank" = contract.target_rank,
 				"payout" = contract.contract.payout,
 				"payout_bonus" = contract.contract.payout_bonus,
 				"dropoff" = contract.contract.dropoff,

code/modules/uplink/uplink_items/uplink_bundles.dm

@@ -38,7 +38,7 @@
 			specialised contractor baton, and three randomly selected low cost items. Can include otherwise unobtainable items."
 	item = /obj/item/storage/box/syndie_kit/contract_kit
 	cost = 20
-	player_minimum = 20
+	player_minimum = 15
 	exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
 
 /datum/uplink_item/bundles_TC/cybernetics_bundle