diff --git a/code/modules/events/drone_pod_vr.dm b/code/modules/events/drone_pod_vr.dm index 348e16d8085..54ddd7bdba9 100644 --- a/code/modules/events/drone_pod_vr.dm +++ b/code/modules/events/drone_pod_vr.dm @@ -4,27 +4,27 @@ /datum/event/drone_pod_drop/setup() startWhen = rand(8,15) - announceWhen = startWhen + 5 - if(LAZYLEN(using_map.meteor_strike_areas)) - var/turf/potential_target = null - for(var/i=1, i <= attempt_amount, i++) - potential_target = pick(get_area_turfs(pick(using_map.meteor_strike_areas))) - if(potential_target.x < 7 || potential_target.x > world.maxx-7 || potential_target.y < 7 || potential_target.y > world.maxy-7) - continue - else - land_target = potential_target - break + + var/land_spot_list = list() + var/target_spot + + for(var/obj/effect/landmark/land_spot in landmarks_list) + if(land_spot.name == "droppod_landing" && !(land_spot in land_spot_list)) + land_spot_list += land_spot + + target_spot = pick(land_spot_list) + land_target = get_turf(target_spot) if(!land_target) kill() + else + landmarks_list -= target_spot + qdel(target_spot) /datum/event/drone_pod_drop/announce() command_announcement.Announce("An unidentified drone pod has been detected landing near the surface facilty. Open and examine at your own risk.", "NanoTrasen Orbital Monitoring") /datum/event/drone_pod_drop/start() - if(istype(land_target, /turf/simulated/open)) - while(istype(land_target, /turf/simulated/open)) - land_target = GetBelow(land_target) if(!land_target) kill() diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 02a2d0fac0a..4b68b9f6484 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -32259,6 +32259,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/external) +"bcV" = ( +/obj/effect/landmark{ + name = "droppod_landing" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/outside/outside1) "cGJ" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) @@ -33621,7 +33627,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -34590,7 +34596,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -34969,7 +34975,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -38111,7 +38117,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -40123,7 +40129,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -45212,7 +45218,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -47649,7 +47655,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -50323,7 +50329,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -50657,7 +50663,7 @@ aad aad aad aad -aad +bcV aad aad aad @@ -50854,7 +50860,7 @@ aad aad aad aad -aad +bcV aad aad aad diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 78b3e6f193b..0de805b12b2 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -12224,10 +12224,11 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator) "auy" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) +/obj/effect/landmark{ + name = "droppod_landing" + }, +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/outside/outside3) "auz" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -27924,6 +27925,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) +"aUu" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "aUx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -36596,7 +36602,7 @@ aac aac aac aac -aac +auy aac aac aac @@ -41753,7 +41759,7 @@ aac aac aac aac -aac +auy aac aac aac @@ -45573,7 +45579,7 @@ aNk aNl aNJ aNP -auy +aUu aKU abg aOk @@ -45715,7 +45721,7 @@ aNl aNl aNK aNP -auy +aUu aKU abg aOk @@ -45857,7 +45863,7 @@ aNm aNl aNK aNP -auy +aUu aKU abg aOk diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index ca516f15bbc..029798c96d9 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -102,8 +102,6 @@ spawnpoint_stayed = /datum/spawnpoint/cryo meteor_strike_areas = list(/area/tether/surfacebase/outside/outside3) - drop_pod_allowed_z = list(Z_LEVEL_SURFACE_HIGH) - unit_test_exempt_areas = list( /area/tether/surfacebase/outside/outside1, diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 833f733e5c2..fe0ef3972b6 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -59,7 +59,6 @@ var/list/all_maps = list() var/list/holomap_legend_x = list() var/list/holomap_legend_y = list() var/list/meteor_strike_areas // VOREStation Edit - Areas meteor strikes may choose to hit. - var/list/drop_pod_allowed_z // VOREStation Edit - Which z-levels to target with droppods? var/ai_shell_restricted = FALSE //VOREStation Addition - are there z-levels restricted? var/ai_shell_allowed_levels = list() //VOREStation Addition - which z-levels ARE we allowed to visit? diff --git a/vorestation.dme b/vorestation.dme index 48602742b64..a5999babbbb 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1932,8 +1932,8 @@ #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" #include "code\modules\food\food\snacks_vr.dm" -#include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\thecake.dm" +#include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" #include "code\modules\food\food\drinks\cup.dm" #include "code\modules\food\food\drinks\drinkingglass.dm"