diff --git a/.gitignore b/.gitignore
index 44537f0a6b7..47ee524374b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,6 +176,7 @@ Temporary Items
 #extra map stuff
 /_maps/**/backup/
 /_maps/templates.dm
+/maps/**/backup/
 
 #dmdoc default folder
 /dmdoc
diff --git a/code/__DEFINES/machinery.dm b/code/__DEFINES/machinery.dm
index 06cc25cffea..9e8f1f391d4 100644
--- a/code/__DEFINES/machinery.dm
+++ b/code/__DEFINES/machinery.dm
@@ -101,6 +101,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manu
 //! Station Specific Camera Networks
 #define NETWORK_TRIUMPH "Triumph"
 #define NETWORK_TETHER "Tether"
+#define NETWORK_LYTHIOS "Rift"
 
 // Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them.
 var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret", NETWORK_COMMUNICATORS)
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 8a0c6853069..e295548c398 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -134,6 +134,12 @@ var/global/list/engineering_networks = list(
 /obj/machinery/camera/network/tether
 	network = list(NETWORK_TRIUMPH)
 
+/obj/machinery/camera/network/triumph
+	network = list(NETWORK_TRIUMPH)
+
+/obj/machinery/camera/network/rift
+	network = list(NETWORK_LYTHIOS)
+
 /obj/machinery/camera/network/tcomms
 	network = list(NETWORK_TCOMMS)
 
diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm
index 21c836b6457..b5aae5509a7 100644
--- a/code/game/mecha/combat/fighter.dm
+++ b/code/game/mecha/combat/fighter.dm
@@ -164,7 +164,10 @@
 
 // No falling if we've got our boosters on
 /obj/mecha/combat/fighter/can_fall()
-	return (stabilization_enabled && has_charge(step_energy_drain))
+	if(stabilization_enabled && has_charge(step_energy_drain))
+		return FALSE
+	else
+		return TRUE
 
 /obj/mecha/combat/fighter/proc/consider_gravity(var/moved = FALSE)
 	var/gravity = has_gravity()
diff --git a/code/game/mecha/space/hoverpod.dm b/code/game/mecha/space/hoverpod.dm
index 0c1a2021637..c622b45d36c 100644
--- a/code/game/mecha/space/hoverpod.dm
+++ b/code/game/mecha/space/hoverpod.dm
@@ -79,7 +79,10 @@
 
 // No falling if we've got our boosters on
 /obj/mecha/working/hoverpod/can_fall()
-	return (stabilization_enabled && has_charge(step_energy_drain))
+	if(stabilization_enabled && has_charge(step_energy_drain))
+		return FALSE
+	else
+		return TRUE
 
 /*	// One horrific bastardization of glorious inheritence dead. A billion to go. ~Mech
 //these three procs overriden to play different sounds
diff --git a/code/game/turfs/simulated/flooring/_flooring.dm b/code/game/turfs/simulated/flooring/_flooring.dm
index 1b45f62dd3d..46df3063fbd 100644
--- a/code/game/turfs/simulated/flooring/_flooring.dm
+++ b/code/game/turfs/simulated/flooring/_flooring.dm
@@ -293,6 +293,9 @@ var/list/flooring_types
 /decl/flooring/tiling/new_tile/monotile
 	icon_base = "monotile"
 
+/decl/flooring/tiling/new_tile/monowhite
+	icon_base = "monowhite"
+
 /decl/flooring/tiling/new_tile/steel_grid
 	icon_base = "steel_grid"
 
diff --git a/code/game/turfs/simulated/flooring/flooring_decals.dm b/code/game/turfs/simulated/flooring/flooring_decals.dm
index edc9e14711a..53bcda38055 100644
--- a/code/game/turfs/simulated/flooring/flooring_decals.dm
+++ b/code/game/turfs/simulated/flooring/flooring_decals.dm
@@ -596,6 +596,11 @@ var/list/floor_decals = list()
 	name = "loading area"
 	icon_state = "loadingarea"
 
+/obj/effect/floor_decal/industrial/halfstair
+	name = "half stairs"
+	icon = 'icons/turf/structures.dmi' //These weren't used anywhere except for snowflake instances, lets change them into a decal.
+	icon_state = "ramptop"
+
 /obj/effect/floor_decal/plaque
 	name = "plaque"
 	icon_state = "plaque"
@@ -1102,6 +1107,9 @@ var/list/floor_decals = list()
 /obj/effect/floor_decal/steeldecal/steel_decals5
 	icon_state = "steel_decals5"
 
+/obj/effect/floor_decal/steeldecal/steel_decals5white
+	icon_state = "steel_decals5white"
+
 /obj/effect/floor_decal/steeldecal/steel_decals6
 	icon_state = "steel_decals6"
 
diff --git a/code/game/turfs/simulated/flooring/flooring_premade.dm b/code/game/turfs/simulated/flooring/flooring_premade.dm
index e64c8d52950..e8af0aca7ec 100644
--- a/code/game/turfs/simulated/flooring/flooring_premade.dm
+++ b/code/game/turfs/simulated/flooring/flooring_premade.dm
@@ -129,6 +129,12 @@
 	icon_state = "monotile"
 	initial_flooring = /decl/flooring/tiling/new_tile/monotile
 
+/turf/simulated/floor/tiled/monowhite
+	name = "floor"
+	icon = 'icons/turf/flooring/tiles_vr.dmi'
+	icon_state = "monowhite"
+	initial_flooring = /decl/flooring/tiling/new_tile/monowhite
+
 /turf/simulated/floor/tiled/steel_grid
 	name = "floor"
 	icon = 'icons/turf/flooring/tiles_vr.dmi'
diff --git a/code/game/turfs/simulated/floors/snow.dm b/code/game/turfs/simulated/floors/snow.dm
index c4ff91c2dd1..de024f3b836 100644
--- a/code/game/turfs/simulated/floors/snow.dm
+++ b/code/game/turfs/simulated/floors/snow.dm
@@ -62,3 +62,10 @@
 	icon_state = "ice"
 	desc = "Looks slippery."
 	movement_cost = 4
+
+// Ice that is safe to walk on.
+/turf/simulated/floor/outdoors/safeice
+	name = "ice"
+	icon_state = "ice"
+	desc = "Seems safe enough to walk on."
+	movement_cost = 2
diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm
index 30ffbcd1537..ba83221e85a 100644
--- a/code/game/turfs/unsimulated/sky_vr.dm
+++ b/code/game/turfs/unsimulated/sky_vr.dm
@@ -80,3 +80,17 @@
 /turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload)
 	skyfall_levels = list(z+1)
 	. = ..()
+
+/turf/unsimulated/floor/sky/depths
+	name = "darkness"
+	desc = "A straight drop down into the depths below."
+	skyfall_levels = "Western Caverns"
+	color ="#303030"
+
+/turf/unsimulated/floor/sky/depths/Initialize(mapload)
+	. = ..()
+	set_light(0, 0, "#FFFFFF")
+
+/turf/unsimulated/floor/sky/depths/Initialize(mapload)
+	skyfall_levels = list(z + 1)
+	. = ..()
diff --git a/maps/nsv_triumph/submaps/_triumph_submaps.dm b/maps/nsv_triumph/submaps/_triumph_submaps.dm
index 0d21f56f3e6..f509e52d5e1 100644
--- a/maps/nsv_triumph/submaps/_triumph_submaps.dm
+++ b/maps/nsv_triumph/submaps/_triumph_submaps.dm
@@ -277,6 +277,17 @@
 	if(!src:target_z)
 		return
 
+	if(isobserver(A) || A.anchored)
+		return
+	if(A.throwing)
+		return
+	if(!A.can_fall())
+		return
+	if(isliving(A))
+		var/mob/living/L = A
+		if(L.is_floating || L.flying)
+			return //Flyers/nograv can ignore it
+
 	var/attempts = 100
 	var/turf/simulated/T
 	while(attempts && !T)
diff --git a/maps/nsv_triumph/triumph_turfs.dm b/maps/nsv_triumph/triumph_turfs.dm
index 915ebe704e6..dbb1011e311 100644
--- a/maps/nsv_triumph/triumph_turfs.dm
+++ b/maps/nsv_triumph/triumph_turfs.dm
@@ -154,6 +154,7 @@
 	name = "bluespace"
 	icon = 'icons/turf/space.dmi'
 	icon_state = "bluespace"
+
 /turf/space/bluespace/Initialize(mapload)
 	. = ..()
 	icon = 'icons/turf/space.dmi'
@@ -164,6 +165,7 @@
 	name = "sand transit"
 	icon = 'icons/turf/transit_vr.dmi'
 	icon_state = "desert_ns"
+
 /turf/space/sandyscroll/Initialize(mapload)
 	. = ..()
 	icon_state = "desert_ns"
@@ -175,7 +177,6 @@
 
 /turf/simulated/sky/triumph/Initialize(mapload)
 	. = ..()
-	SSplanets.addTurf(src)
 	set_light(2, 2, "#FFBBBB")
 
 /turf/simulated/sky/triumph/north