MultiZ WIP/Staging

_maps/multiz_test.dm

@@ -0,0 +1,21 @@
+#if !defined(MAP_FILE)
+
+		// MultiZ Station
+
+		#define TITLESCREEN "title"
+
+		#define MINETYPE "lavaland"
+
+        #include "map_files\debug\multiz_test.dmm"
+
+		#define MAP_PATH "map_files/debug"
+        #define MAP_FILE "multiz_test.dmm"
+        #define MAP_NAME "MultiZ Station"
+
+		#define MAP_TRANSITION_CONFIG list(MAIN_STATION = UNAFFECTED)
+
+#elif !defined(MAP_OVERRIDE)
+
+	#warn a map has already been included, ignoring MultiZ Station.
+
+#endif

code/__DEFINES/atmospherics.dm

@@ -169,4 +169,7 @@
 #define ATMOS_PASS_NO 0
 #define ATMOS_PASS_PROC -1 //ask CanAtmosPass()
 #define ATMOS_PASS_DENSITY -2 //just check density
-#define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) )
+#define CANATMOSPASS(A, O) ( A.CanAtmosPass == ATMOS_PASS_PROC ? A.CanAtmosPass(O) : ( A.CanAtmosPass == ATMOS_PASS_DENSITY ? !A.density : A.CanAtmosPass ) )
+
+//MultiZ / Atmos Spreading
+#define ATMOS_DIRS cardinal+list(UP,DOWN)

code/__HELPERS/icon_smoothing.dm

@@ -259,7 +259,7 @@
 		A.cut_overlay(A.bottom_left_corner)
 		A.bottom_left_corner = se
 		LAZYADD(New, se)
-	
+
 	if(New)
 		A.add_overlay(New)
 
@@ -394,3 +394,10 @@
 	icon_state = "smooth"
 	smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL|SMOOTH_BORDER
 	canSmoothWith = null
+
+
+
+//Called by SSicon_smooth after this atom has smoothed
+/atom/proc/post_smooth()
+	if(zshadow)
+		zshadow.SyncAppearance()

code/controllers/subsystem/air.dm

@@ -278,6 +278,13 @@ var/datum/subsystem/air/SSair
 		add_to_active(T)
 	queued_for_activation.Cut()
 
+	//Recalculated, for Multi-Z (In an ideal world I'd move setup_allturfs() here
+	//but it's sadly not that simple)
+	for(var/t in block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz)))
+		var/turf/T = t
+		T.CalculateAdjacentTurfs()
+		CHECK_TICK
+
 /datum/subsystem/air/proc/setup_allturfs()
 	var/list/turfs_to_init = block(locate(1, 1, 1), locate(world.maxx, world.maxy, world.maxz))
 	var/list/active_turfs = src.active_turfs

code/controllers/subsystem/icon_smooth.dm

@@ -32,6 +32,7 @@ var/datum/subsystem/icon_smooth/SSicon_smooth
 		if(!A || A.z <= 2)
 			continue
 		smooth_icon(A)
+		A.post_smooth()
 		CHECK_TICK
 
 	..()

code/controllers/subsystem/multiz.dm

@@ -0,0 +1,20 @@
+var/datum/subsystem/z_levels/SSz
+
+/datum/subsystem/z_levels
+	name = "Z Levels"
+	flags = SS_NO_FIRE
+	init_order = 12 //before SSatoms
+	var/list/vertical_connections //assoc list of "[Z number]" = list("[Other Z Number]" = TRUE/FALSE)
+	var/list/zshadows
+
+/datum/subsystem/z_levels/New()
+	NEW_SS_GLOBAL(SSz)
+
+
+/datum/subsystem/z_levels/stat_entry()
+	var/c = 0
+	for(var/z in vertical_connections)
+		var/list/L = vertical_connections[z]
+		if(L)
+			c += L.len //this will count A<->B twice, since it's A->B and B->A
+	..("ZP:[c], ZS:[LAZYLEN(zshadows)]") //"Z Pairs", "Z Shadows"

code/modules/atmospherics/environmental/LINDA_system.dm

@@ -14,18 +14,18 @@
 /turf/open/CanAtmosPass(turf/T)
 	var/R
 	if(blocks_air || T.blocks_air)
-		R = 1
+		R = TRUE
 
 	for(var/obj/O in contents+T.contents)
 		var/turf/other = (O.loc == src ? T : src)
 		if(!CANATMOSPASS(O, other))
-			R = 1
+			R = TRUE
 			if(O.BlockSuperconductivity()) 	//the direction and open/closed are already checked on CanAtmosPass() so there are no arguments
 				var/D = get_dir(src, T)
 				atmos_supeconductivity |= D
 				D = get_dir(T, src)
 				T.atmos_supeconductivity |= D
-				return 0						//no need to keep going, we got all we asked
+				return FALSE						//no need to keep going, we got all we asked
 
 	atmos_supeconductivity &= ~get_dir(src, T)
 	T.atmos_supeconductivity &= ~get_dir(T, src)
@@ -39,10 +39,19 @@
 
 /turf/proc/CalculateAdjacentTurfs()
 	var/list/atmos_adjacent_turfs = src.atmos_adjacent_turfs
-	for(var/direction in cardinal)
+	for(var/direction in ATMOS_DIRS)
 		var/turf/T = get_step(src, direction)
 		if(!T)
 			continue
+
+		if(direction == UP)
+			if(!T.z_open)
+				continue
+
+		else if(direction == DOWN)
+			if(!z_open)
+				continue
+
 		if(CANATMOSPASS(T, src))
 			LAZYINITLIST(atmos_adjacent_turfs)
 			LAZYINITLIST(T.atmos_adjacent_turfs)
@@ -76,7 +85,7 @@
 		var/matchingDirections = 0
 		var/turf/S = get_step(curloc, direction)
 
-		for (var/checkDirection in cardinal)
+		for (var/checkDirection in ATMOS_DIRS)
 			var/turf/checkTurf = get_step(S, checkDirection)
 			if(!S.atmos_adjacent_turfs || !S.atmos_adjacent_turfs[checkTurf])
 				continue

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -91,7 +91,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
 	icon = 'icons/effects/tile_effects.dmi'
 	mouse_opacity = 0
 	layer = FLY_LAYER
-	appearance_flags = TILE_BOUND
+	appearance_flags = TILE_BOUND|RESET_COLOR|RESET_ALPHA
 
 /obj/effect/overlay/gas/New(state)
 	. = ..()

code/modules/atmospherics/machinery/atmosmachinery.dm

@@ -67,7 +67,7 @@ Pipelines + Other Objects -> Pipe network
 		node_connects.len = device_type
 
 		for(DEVICE_TYPE_LOOP)
-			for(var/D in cardinal)
+			for(var/D in ATMOS_DIRS)
 				if(D & GetInitDirections())
 					if(D in node_connects)
 						continue

code/modules/atmospherics/machinery/other/zvent.dm

@@ -1,3 +1,15 @@
+
+/*
+	Remie note:
+	I added proper multiZ, but this thing is ancient
+	I "updated" it, and it DOES work, but it's
+	not in RPDs, pipe dispensers etc and some of its
+	content (on/off, volume_rate) aren't implemented.
+
+	Use this for ruins and stuff I guess, or fix it up proper.
+*/
+
+
 /obj/machinery/zvent
 	name = "interfloor air transfer system"
 
@@ -21,9 +33,13 @@
 
 	//all this object does, is make its turf share air with the ones above and below it, if they have a vent too.
 	if(isturf(loc)) //if we're not on a valid turf, forget it
-		for (var/new_z in list(-1,1))  //change this list if a fancier system of z-levels gets implemented
-			var/turf/open/zturf_conn = locate(x,y,z+new_z)
+		var/turf/T = loc
+		for (var/ddir in list(DOWN,UP))  //change this list if a fancier system of z-levels gets implemented //meow
+			var/turf/open/zturf_conn = get_step(loc, ddir)
 			if (istype(zturf_conn))
+				if(!AreZsConnected(zturf_conn.z, T.z))
+					continue
+
 				var/obj/machinery/zvent/zvent_conn= locate(/obj/machinery/zvent) in zturf_conn
 				if (istype(zvent_conn))
 					//both floors have simulated turfs, share()

code/modules/atmospherics/machinery/pipes/multiz.dm

@@ -0,0 +1,26 @@
+
+//where for art thou duncathan
+
+/obj/machinery/atmospherics/pipe/simple/multiz
+	icon = 'icons/obj/atmospherics/pipes/multiz.dmi'
+	var/basestate
+
+/obj/machinery/atmospherics/pipe/simple/multiz/update_icon()
+	icon_state = "[basestate][invisibility ? "-f" : "" ]"
+
+
+/obj/machinery/atmospherics/pipe/simple/multiz/up
+	initialize_directions = SOUTH|UP
+	basestate = "up"
+
+/obj/machinery/atmospherics/pipe/simple/multiz/up/SetInitDirections()
+	initialize_directions = dir|UP
+
+
+/obj/machinery/atmospherics/pipe/simple/multiz/down
+	initialize_directions = SOUTH|DOWN
+	basestate = "down"
+
+/obj/machinery/atmospherics/pipe/simple/multiz/down/SetInitDirections()
+	initialize_directions = dir|DOWN
+

code/modules/multiz/atoms.dm

@@ -0,0 +1,119 @@
+
+/atom
+	var/atom/movable/zshadow/zshadow
+
+
+//TODO: Simplify for base atoms? (their shadows would never move, so they don't need a zshadow movable atom)
+/atom/proc/CreateZShadow()
+	if(!zshadow) //if one exists, just sync it
+		zshadow = new()
+	zshadow.owner = src
+	zshadow.Sync()
+	return zshadow
+
+
+//Can we fall through to the Z below? (regardless of open turfs, etc.)
+//This is so mobs with jetpacks, thrown items, etc. can ignore falling
+/atom/proc/CanFallThroughZ()
+	if(!has_gravity())
+		return FALSE
+	return TRUE
+
+
+/atom/movable/CanFallThroughZ()
+	. = ..()
+	if(.)
+		if(throwing)
+			return FALSE
+
+
+/mob/CanFallThroughZ()
+	. = ..()
+	if(.)
+		var/obj/item/weapon/tank/jetpack/J = get_jetpack()
+		if(istype(J) && J.allow_thrust(0.01, src)) //working jetpack
+			return FALSE
+
+
+
+//Hooks:
+//TODO: move to existing locations
+
+/atom/proc/SetupZShadow(mapload = FALSE)
+	if(mapload) //This is before SSz, so we can't rely on connections yet
+		var/turf/U = get_step(src, UP)
+		if(U && U.z_open)
+			CreateZShadow()
+	else if(GetAboveConnectedTurf(src))
+		CreateZShadow()
+
+/atom/Initialize(mapload)
+	..()
+	SetupZShadow(mapload)
+
+/turf/Initialize(mapload)
+	..()
+	if(z_open)
+		var/turf/D = get_step(src, DOWN)
+		if(D)
+			ConnectVerticalZs(z, D.z)
+			D.SetupZShadow()
+			for(var/a in D)
+				var/atom/A = a
+				A.SetupZShadow(mapload)
+
+	SetupZShadow(mapload)
+
+/atom/setDir(dir)
+	..()
+	if(zshadow)
+		zshadow.setDir(dir) //dir is not an appearance var, so we can update it quickly
+
+/atom/Destroy()
+	. = ..()
+	if(zshadow)
+		qdel(zshadow)
+
+/atom/movable/Moved()
+	..()
+	if(zshadow)
+		zshadow.SyncLoc()
+	else
+		if(GetAboveConnectedTurf(src))
+			CreateZShadow()
+
+
+//Get this to cascade somehow...
+/obj/update_icon()
+	..()
+	if(zshadow)
+		zshadow.SyncAppearance()
+
+//Cascade somehow.
+/mob/update_icons()
+	..()
+	if(zshadow)
+		zshadow.SyncAppearance()
+
+/turf/AfterChange()
+	..()
+	if(zshadow)
+		zshadow.SyncAppearance()
+
+
+/turf/add_decal(decal,group)
+	..()
+	if(zshadow)
+		zshadow.SyncAppearance()
+
+
+/turf/remove_decal(group)
+	..()
+	if(zshadow)
+		zshadow.SyncAppearance()
+
+
+/turf/open/update_visuals()
+	..()
+	if(zshadow)
+		zshadow.SyncAppearance()

code/modules/multiz/turfs.dm

@@ -0,0 +1,31 @@
+
+/turf
+	var/z_open = FALSE //are we see the Z below us through this turf? (true/false)
+
+
+/turf/open/open_z
+ 	icon = null
+ 	icon_state = ""
+ 	desc = ""
+ 	name = "zopen"
+ 	invisibility = 101 //Not real!!
+ 	z_open = TRUE
+
+
+/turf/open/open_z/Entered(atom/movable/AM, atom/oloc)
+	..()
+	var/turf/T = GetBelowConnectedTurf(src)
+	if(AtomCanFallThrough(AM) && T)
+		AM.forceMove(T)
+
+
+/turf/open/open_z/proc/AtomCanFallThrough(atom/movable/AM)
+	. = FALSE
+	if(AM.CanFallThroughZ())
+		. = TRUE
+	if(locate(/obj/structure/lattice/catwalk) in src)
+		. = FALSE
+
+
+/turf/open/open_z/CreateZShadow() //just no
+  	return