diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 75e711ad03..034b5d1825 100644 --- a/code/__HELPERS/game.dm +++ b/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) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 2ad3d84fd1..a4b1f68265 100644 --- a/code/game/gamemodes/objective.dm +++ b/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 diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 3dcf6d36e7..a75e881953 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/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' diff --git a/code/modules/uplink/uplink_items/uplink_bundles.dm b/code/modules/uplink/uplink_items/uplink_bundles.dm index 039a29a69d..1c7d3393ab 100644 --- a/code/modules/uplink/uplink_items/uplink_bundles.dm +++ b/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