Merge pull request #11377 from Kraseo/contractor-fixes

Some contractor adjustments & fixes
This commit is contained in:
Ghom
2020-03-09 00:26:54 +01:00
committed by GitHub
8 changed files with 13 additions and 15 deletions
+2 -2
View File
@@ -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)