buildmode fix + blueprints fix (#2261)

* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.

* sync turf.dm
This commit is contained in:
CitadelStationBot
2017-08-04 13:46:11 -05:00
committed by kevinz000
parent 32a7158a72
commit f5bc18bb55
3 changed files with 46 additions and 20 deletions

View File

@@ -20,26 +20,34 @@
/datum/mapGeneratorModule/bottomLayer/massdelete
spawnableAtoms = list()
spawnableTurfs = list()
var/deletemobs = TRUE
var/deleteturfs = TRUE
var/deleteturfs = TRUE //separate var for the empty type.
var/list/ignore_typecache
/datum/mapGeneratorModule/bottomLayer/massdelete/generate()
if(!mother)
return
for(var/V in mother.map)
var/turf/T = V
T.empty(deleteturfs? null : T.type, delmobs = deletemobs, forceop = TRUE)
T.empty(deleteturfs? null : T.type, ignore_typecache = ignore_typecache, forceop = TRUE)
/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs
deletemobs = FALSE
/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs/New()
..()
ignore_typecache = typecacheof(list(/mob))
/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs
deleteturfs = FALSE
/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs/New()
..()
ignore_typecache = typecacheof(list(/turf))
/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete
deletemobs = FALSE
deleteturfs = FALSE
/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete/New()
..()
ignore_typecache = typecacheof(list(/mob, /turf))
//Only places atoms/turfs on area borders
/datum/mapGeneratorModule/border
clusterCheckFlags = CLUSTER_CHECK_NONE