cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shelter Capsule Deploy Check

Browse Source 
...Simpler and hopefully it works
This commit is contained in:
Unknown
2019-09-18 15:30:59 -04:00
parent 0dfa81dba5
commit fcaf8906b2
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mining/shelters.dm
View File

@@ -2,14 +2,12 @@
var/shelter_id var/shelter_id
var/description var/description
var/blacklisted_turfs var/blacklisted_turfs
var/whitelisted_turfs
var/banned_areas var/banned_areas
var/banned_objects var/banned_objects
/datum/map_template/shelter/New() /datum/map_template/shelter/New()
. = ..() . = ..()
blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/wall, /turf/simulated/floor/tiled, /turf/simulated/mineral)) blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/wall, /turf/simulated/floor/tiled))
whitelisted_turfs = typecacheof(/turf/simulated/mineral/floor)
banned_areas = typecacheof(/area/shuttle) banned_areas = typecacheof(/area/shuttle)
banned_objects = list() banned_objects = list()
@@ -21,9 +19,7 @@
return SHELTER_DEPLOY_BAD_AREA return SHELTER_DEPLOY_BAD_AREA
var/banned = is_type_in_typecache(T, blacklisted_turfs) var/banned = is_type_in_typecache(T, blacklisted_turfs)
var/permitted = is_type_in_typecache(T, whitelisted_turfs) if(banned || T.density)
if(banned)
if(!permitted)
return SHELTER_DEPLOY_BAD_TURFS return SHELTER_DEPLOY_BAD_TURFS
for(var/obj/O in T) for(var/obj/O in T)