From 8278a083d596be7d1e2a2bda2f214379d2ac2c07 Mon Sep 17 00:00:00 2001 From: Emmett Gaines Date: Tue, 13 Mar 2018 15:38:51 -0400 Subject: [PATCH 1/2] Any closed turf blocks aux base placement (#35308) * Any closed turf blocks aux base placement * ignores rock walls and destroys them before landing * Goes back to some more standard style --- code/modules/mining/aux_base.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index d52482c4abeb..397436bda885 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -144,9 +144,11 @@ interface with the mining shuttle at the landing site if a mobile beacon is also return if(!no_restrictions) var/static/list/disallowed_turf_types = typecacheof(list( + /turf/closed, /turf/open/lava, - /turf/closed/indestructible, /turf/open/indestructible, + )) - typecacheof(list( + /turf/closed/mineral, )) if(!is_mining_level(T.z)) @@ -231,7 +233,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also if(BAD_COORDS) to_chat(user, "Location is too close to the edge of the station's scanning range. Move several paces away and try again.") if(BAD_TURF) - to_chat(user, "The landing zone contains turfs unsuitable for a base.") + to_chat(user, "The landing zone contains turfs unsuitable for a base. Make sure you've removed all walls and dangerous terrain from the landing zone.") /obj/item/device/assault_pod/mining/unrestricted name = "omni-locational landing field designator" @@ -248,6 +250,13 @@ interface with the mining shuttle at the landing site if a mobile beacon is also width = 9 height = 9 +/obj/docking_port/mobile/auxillary_base/takeoff(list/old_turfs, list/new_turfs, list/moved_atoms, rotation, movement_direction, old_dock, area/underlying_old_area) + for(var/i in new_turfs) + var/turf/place = i + if(istype(place, /turf/closed/mineral)) + place.ScrapeAway() + return ..() + obj/docking_port/stationary/public_mining_dock name = "public mining base dock" id = "disabled" //The Aux Base has to leave before this can be used as a dock. From bfa4bd34a93c7df44eaec403076ac975cd0673ad Mon Sep 17 00:00:00 2001 From: yogstation13-bot Date: Wed, 14 Mar 2018 01:02:44 +0100 Subject: [PATCH 2/2] Any closed turf blocks aux base placement