Changes to drones and z-macros (#7068)

Turns the z-level restriction procs into macros
Changes z-level restrictions to use the macros
Use contact_levels for announcements (instead of player_levels)
Restricts the teleporter to station_levels instead of player_levels
Restricts AI tracking to station_levels instead of player_levels
Mechs only get tracking beacons if they are on station_levels (instead of player_levels)
Construction Drones gib if they enter a station level
Mining Drones gib if they leave the station levels
Removes the mining equipment vendor from the scrapheap
This commit is contained in:
Werner
2019-11-06 18:55:14 +01:00
committed by GitHub
parent daf29bf016
commit 9c2f225718
46 changed files with 138 additions and 75 deletions
+6 -6
View File
@@ -27,7 +27,7 @@ datum/unit_test/apc_area_test/start_test()
var/list/exempt_from_apc = typecacheof(current_map.ut_apc_exempt_areas)
for(var/area/A in typecache_filter_list_reverse(all_areas, exempt_areas))
if(A.z in current_map.station_levels)
if(isStationLevel(A.z))
area_test_count++
var/area_good = 1
var/bad_msg = "[ascii_red]--------------- [A.name]([A.type])"
@@ -70,7 +70,7 @@ datum/unit_test/wire_test/start_test()
for(C in world)
T = get_turf(C)
if(T && T.z in current_map.station_levels)
if(T && isStationLevel(T.z))
cable_turfs |= get_turf(C)
for(T in cable_turfs)
@@ -132,7 +132,7 @@ datum/unit_test/wire_test/start_test()
var/ladders_blocked = 0
for (var/obj/structure/ladder/ladder in world)
if (ladder.z in current_map.admin_levels)
if (isAdminLevel(ladder.z))
continue
ladders_total++
@@ -219,7 +219,7 @@ datum/unit_test/wire_test/start_test()
//all plumbing - yes, some things might get stated twice, doesn't matter.
for (var/obj/machinery/atmospherics/plumbing in world)
if(!(plumbing.z in current_map.station_levels))
if(isNotStationLevel(plumbing.z))
continue
checks++
if (plumbing.nodealert)
@@ -228,7 +228,7 @@ datum/unit_test/wire_test/start_test()
//Manifolds
for (var/obj/machinery/atmospherics/pipe/manifold/pipe in world)
if(!(pipe.z in current_map.station_levels))
if(isNotStationLevel(pipe.z))
continue
checks++
if (!pipe.node1 || !pipe.node2 || !pipe.node3)
@@ -237,7 +237,7 @@ datum/unit_test/wire_test/start_test()
//Pipes
for (var/obj/machinery/atmospherics/pipe/simple/pipe in world)
if(!(pipe.z in current_map.station_levels))
if(isNotStationLevel(pipe.z))
continue
checks++
if (!pipe.node1 || !pipe.node2)