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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-09-19 19:54:34 +01:00
parent 083eaca90f cee087bda9
commit ac61a5cc37
18 changed files with 753 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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/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))