Merge pull request #11377 from Kraseo/contractor-fixes

Some contractor adjustments & fixes

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)