From fcaf8906b2f266b4156c8c7a881eafd08d9a752c Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 18 Sep 2019 15:30:59 -0400 Subject: [PATCH] Shelter Capsule Deploy Check ...Simpler and hopefully it works --- code/modules/mining/shelters.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 5b681c1ab1..1453489e3c 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -2,14 +2,12 @@ var/shelter_id var/description var/blacklisted_turfs - var/whitelisted_turfs var/banned_areas var/banned_objects /datum/map_template/shelter/New() . = ..() - blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/wall, /turf/simulated/floor/tiled, /turf/simulated/mineral)) - whitelisted_turfs = typecacheof(/turf/simulated/mineral/floor) + blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/wall, /turf/simulated/floor/tiled)) banned_areas = typecacheof(/area/shuttle) banned_objects = list() @@ -21,10 +19,8 @@ return SHELTER_DEPLOY_BAD_AREA var/banned = is_type_in_typecache(T, blacklisted_turfs) - var/permitted = is_type_in_typecache(T, whitelisted_turfs) - if(banned) - if(!permitted) - return SHELTER_DEPLOY_BAD_TURFS + if(banned || T.density) + return SHELTER_DEPLOY_BAD_TURFS for(var/obj/O in T) if((O.density && O.anchored) || is_type_in_typecache(O, banned_objects))