mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Makes the station Z level into a list instead of a single define (#30297)
* Makes Station Z Levels a global list * Things didnt get committed * Define * Removes files * Fix mind.dm * Wrong list name * ( * Fixes rev checks and signpost * Makes it actually compile * Signpost fix * I hate these sign posts * Never use the web editor
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
|
||||
var/has_alert = 0
|
||||
var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list())
|
||||
var/alarm_z = list(ZLEVEL_STATION,ZLEVEL_LAVALAND)
|
||||
var/alarm_z = list(ZLEVEL_STATION_PRIMARY,ZLEVEL_LAVALAND)
|
||||
|
||||
/datum/computer_file/program/alarm_monitor/process_tick()
|
||||
..()
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
//var/valid_z_levels = (GetConnectedZlevels(T.z) & using_map.station_levels)
|
||||
for(var/obj/machinery/power/supermatter_shard/S in GLOB.machines)
|
||||
// Delaminating, not within coverage, not on a tile.
|
||||
if(!(S.z == ZLEVEL_STATION || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/))
|
||||
if(!(S.z in GLOB.station_z_levels || S.z == ZLEVEL_MINING || S.z == T.z) || !istype(S.loc, /turf/))
|
||||
continue
|
||||
supermatters.Add(S)
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
if(holder)
|
||||
|
||||
var/turf/T = get_turf(holder)
|
||||
if((T && istype(T)) && (T.z == ZLEVEL_STATION || T.z == ZLEVEL_MINING))
|
||||
if((T && istype(T)) && ((T.z in GLOB.station_z_levels) || T.z == ZLEVEL_MINING))
|
||||
// Computer is on station. Low/High signal depending on what type of network card you have
|
||||
if(long_range)
|
||||
return 2
|
||||
|
||||
Reference in New Issue
Block a user