From 7fcd2e3f3f58b9de229b369ed6bb83f9f1751a49 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 12 Sep 2019 23:23:22 -0400 Subject: [PATCH] Removes redundant code, fixes whitelists/blacklists --- code/modules/mining/shelters.dm | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 7df80a60a9..3e0cd74703 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -8,8 +8,8 @@ /datum/map_template/shelter/New() . = ..() - blacklisted_turfs = typecacheof(/turf/unsimulated) - whitelisted_turfs = list() + blacklisted_turfs = typecacheof(list(/turf/unsimulated, /turf/simulated/wall, /turf/simulated/floor/tiled, /turf/simulated/mineral)) + whitelisted_turfs = typecacheof(/turf/simulated/mineral/floor) banned_areas = typecacheof(/area/shuttle) banned_objects = list() @@ -54,11 +54,6 @@ absolutely free!" mappath = "maps/submaps/shelters/shelter_1.dmm" -/datum/map_template/shelter/alpha/New() - . = ..() - whitelisted_turfs = typecacheof(/turf/simulated/mineral) - banned_objects = list() - /datum/map_template/shelter/beta name = "Shelter Beta" shelter_id = "shelter_beta" @@ -69,11 +64,6 @@ an ash storm." mappath = "maps/submaps/shelters/shelter_2.dmm" -/datum/map_template/shelter/beta/New() - . = ..() - whitelisted_turfs = typecacheof(/turf/simulated/mineral) - banned_objects = list() - /datum/map_template/shelter/gamma name = "Shelter Gamma" shelter_id = "shelter_gamma" @@ -84,11 +74,6 @@ death." mappath = "maps/submaps/shelters/shelter_3.dmm" -/datum/map_template/shelter/gamma/New() - . = ..() - whitelisted_turfs = typecacheof(/turf/simulated/mineral) - banned_objects = list() - /datum/map_template/shelter/delta name = "Shelter Delta" shelter_id = "shelter_delta" @@ -99,11 +84,6 @@ possible." mappath = "maps/submaps/shelters/shelter_4.dmm" -/datum/map_template/shelter/delta/New() - . = ..() - whitelisted_turfs = typecacheof(/turf/simulated/mineral) - banned_objects = list() - /datum/map_template/shelter/phi name = "Shelter Phi" shelter_id = "shelter_phi" @@ -113,8 +93,3 @@ to no contact, the expense of these shelters have prevented them \ from seeing common use." mappath = "maps/submaps/shelters/shelter_a.dmm" - -/datum/map_template/shelter/phi/New() - . = ..() - whitelisted_turfs = typecacheof(/turf/simulated/mineral) - banned_objects = list()