diff --git a/archive/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm
index 18f27dfecf..6f3bddf6c0 100644
--- a/archive/maps/cynosure/cynosure_defines.dm
+++ b/archive/maps/cynosure/cynosure_defines.dm
@@ -13,8 +13,7 @@
 	full_name = "Cynosure Station"
 	path = "cynosure"
 
-	lobby_icon = 'icons/misc/title.dmi'
-	lobby_screens = list("mockingjay00") // New lobby screen if possible.
+	lobby_screens = list('html/lobby/mockingjay00.gif') // New lobby screen if possible.
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_STATION_ONE,
diff --git a/archive/maps/example/example_defines.dm b/archive/maps/example/example_defines.dm
index bec9639443..026236741f 100644
--- a/archive/maps/example/example_defines.dm
+++ b/archive/maps/example/example_defines.dm
@@ -6,8 +6,7 @@
 	full_name = "The Test Map"
 	path = "example"
 
-	lobby_icon = 'icons/misc/title_ch.dmi'	//CHOMPStation Edit TFF 24/12/19 - _ch.dmi
-	lobby_screens = list("mockingjay00")
+	lobby_screens = list('html/lobby/mockingjay00.gif')
 
 	zlevel_datum_type = /datum/map_z_level/example
 
diff --git a/archive/maps/northern_star/northern_star_defines.dm b/archive/maps/northern_star/northern_star_defines.dm
index 15090d646c..9a1b18da1b 100644
--- a/archive/maps/northern_star/northern_star_defines.dm
+++ b/archive/maps/northern_star/northern_star_defines.dm
@@ -11,8 +11,7 @@
 	full_name = "NCS Northern Star"
 	path = "northern_star"
 
-	lobby_icon = 'icons/misc/title.dmi'
-	lobby_screens = list("mockingjay00")
+	lobby_screens = list('html/lobby/mockingjay00.gif')
 
 	zlevel_datum_type = /datum/map_z_level/northern_star
 
@@ -157,4 +156,4 @@
 
 /datum/unit_test/zas_area_test/cargo_bay
 	name = "ZAS: Cargo Bay"
-	area_path = /area/quartermaster/storage
\ No newline at end of file
+	area_path = /area/quartermaster/storage
diff --git a/archive/maps/runtime_station/runtime_station_defines.dm b/archive/maps/runtime_station/runtime_station_defines.dm
index f26bb1cc3a..3878dd9c03 100644
--- a/archive/maps/runtime_station/runtime_station_defines.dm
+++ b/archive/maps/runtime_station/runtime_station_defines.dm
@@ -5,8 +5,7 @@
 	full_name = "Southern Cross"
 	path = "modular_chomp/maps/runtime/runtime_station"
 
-	lobby_icon = 'icons/misc/splash_screen.dmi'	//CHOMPStation Edit
-	lobby_screens = list() //CHOMPStation Edit - CHOMPStation image
+	lobby_screens = list('html/lobby/logo2.gif') // CHOMPEdit
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'	//CHOMPStation Edit - Job icons for off-duty/exploration
 
 	zlevel_datum_type = /datum/map_z_level/runtime_station
diff --git a/archive/maps/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm
index d699fd76f4..bc76086b2a 100644
--- a/archive/maps/southern_cross/southern_cross_defines.dm
+++ b/archive/maps/southern_cross/southern_cross_defines.dm
@@ -16,8 +16,7 @@
 	full_name = "Southern Cross"
 	path = "southern_cross"
 
-	lobby_icon = 'icons/misc/title.dmi'
-	lobby_screens = list("mockingjay00") // New lobby screen if possible.
+	lobby_screens = list('html/lobby/mockingjay00.gif') // New lobby screen if possible.
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_STATION_ONE,
diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm
index 454ac52c69..3d6ebe027e 100644
--- a/code/game/turfs/turf_changing.dm
+++ b/code/game/turfs/turf_changing.dm
@@ -74,7 +74,7 @@
 		if(S.zone) S.zone.rebuild()
 
 	cut_overlays(TRUE)
-	RemoveElement(/datum/element/turf_z_transparency)
+	// RemoveElement(/datum/element/turf_z_transparency)
 	changing_turf = TRUE
 	qdel(src)
 
diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm
index 5f249e354e..9e05548f87 100644
--- a/code/game/turfs/unsimulated.dm
+++ b/code/game/turfs/unsimulated.dm
@@ -6,9 +6,6 @@
 	flags = TURF_ACID_IMMUNE
 
 /turf/unsimulated/Initialize(mapload)
-	if(skip_init)
-		flags |= ATOM_INITIALIZED
-		return INITIALIZE_HINT_NORMAL
 	. = ..()
 
 //VOREStation Add
diff --git a/code/modules/asset_cache/assets/lobby.dm b/code/modules/asset_cache/assets/lobby.dm
index 46d61ef305..61aac514e1 100644
--- a/code/modules/asset_cache/assets/lobby.dm
+++ b/code/modules/asset_cache/assets/lobby.dm
@@ -6,5 +6,5 @@
 	)
 
 /datum/asset/simple/lobby_files/register()
-	assets["lobby_bg.gif"] = icon(using_map.lobby_icon, pick(using_map.lobby_screens))
+	assets["lobby_bg.gif"] = pick(using_map.lobby_screens)
 	. = ..()
diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm
index 4621e528cf..c477f7903a 100644
--- a/code/modules/multiz/turf.dm
+++ b/code/modules/multiz/turf.dm
@@ -58,7 +58,6 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
 	can_build_into_floor = TRUE
 	can_dirty = FALSE // It's open space
 	can_start_dirty = FALSE
-	turf_path_danger = TURF_PATH_DANGER_FALL //CHOMPEdit
 
 /turf/simulated/open/vacuum
 	oxygen = 0
diff --git a/html/lobby/above3b.gif b/html/lobby/above3b.gif
new file mode 100644
index 0000000000..8c15159cc1
Binary files /dev/null and b/html/lobby/above3b.gif differ
diff --git a/html/lobby/endo.gif b/html/lobby/endo.gif
new file mode 100644
index 0000000000..053270cfc1
Binary files /dev/null and b/html/lobby/endo.gif differ
diff --git a/html/lobby/gateway.gif b/html/lobby/gateway.gif
new file mode 100644
index 0000000000..c3c09d5625
Binary files /dev/null and b/html/lobby/gateway.gif differ
diff --git a/html/lobby/intothedark.gif b/html/lobby/intothedark.gif
new file mode 100644
index 0000000000..5b5587b3d6
Binary files /dev/null and b/html/lobby/intothedark.gif differ
diff --git a/html/lobby/logo1.gif b/html/lobby/logo1.gif
new file mode 100644
index 0000000000..2d739daf2b
Binary files /dev/null and b/html/lobby/logo1.gif differ
diff --git a/html/lobby/logo2.gif b/html/lobby/logo2.gif
new file mode 100644
index 0000000000..e90918c32e
Binary files /dev/null and b/html/lobby/logo2.gif differ
diff --git a/html/lobby/mockingjay00.gif b/html/lobby/mockingjay00.gif
new file mode 100644
index 0000000000..6c9d5e9e5b
Binary files /dev/null and b/html/lobby/mockingjay00.gif differ
diff --git a/html/lobby/rp2.gif b/html/lobby/rp2.gif
new file mode 100644
index 0000000000..b81b176a1f
Binary files /dev/null and b/html/lobby/rp2.gif differ
diff --git a/html/lobby/sparkles.gif b/html/lobby/sparkles.gif
new file mode 100644
index 0000000000..74da5482e8
Binary files /dev/null and b/html/lobby/sparkles.gif differ
diff --git a/html/lobby/tether.gif b/html/lobby/tether.gif
new file mode 100644
index 0000000000..f597cc3aea
Binary files /dev/null and b/html/lobby/tether.gif differ
diff --git a/html/lobby/tether2_dog.gif b/html/lobby/tether2_dog.gif
new file mode 100644
index 0000000000..76e044d9f5
Binary files /dev/null and b/html/lobby/tether2_dog.gif differ
diff --git a/html/lobby/tether2_love.gif b/html/lobby/tether2_love.gif
new file mode 100644
index 0000000000..fe6b1d2688
Binary files /dev/null and b/html/lobby/tether2_love.gif differ
diff --git a/html/lobby/tether2_night.gif b/html/lobby/tether2_night.gif
new file mode 100644
index 0000000000..ef7a8db116
Binary files /dev/null and b/html/lobby/tether2_night.gif differ
diff --git a/html/lobby/tether_future.gif b/html/lobby/tether_future.gif
new file mode 100644
index 0000000000..2047cf2ab8
Binary files /dev/null and b/html/lobby/tether_future.gif differ
diff --git a/html/lobby/tether_night.gif b/html/lobby/tether_night.gif
new file mode 100644
index 0000000000..ed38bfdc56
Binary files /dev/null and b/html/lobby/tether_night.gif differ
diff --git a/html/lobby/tether_perfect.gif b/html/lobby/tether_perfect.gif
new file mode 100644
index 0000000000..7ff8e0401f
Binary files /dev/null and b/html/lobby/tether_perfect.gif differ
diff --git a/html/lobby/title.gif b/html/lobby/title.gif
new file mode 100644
index 0000000000..865ef37a5f
Binary files /dev/null and b/html/lobby/title.gif differ
diff --git a/html/lobby/title_old.gif b/html/lobby/title_old.gif
new file mode 100644
index 0000000000..81d191502f
Binary files /dev/null and b/html/lobby/title_old.gif differ
diff --git a/html/lobby/virgo3C.gif b/html/lobby/virgo3C.gif
new file mode 100644
index 0000000000..3c8b406b3a
Binary files /dev/null and b/html/lobby/virgo3C.gif differ
diff --git a/html/lobby/youcanttaketheskyfromme.gif b/html/lobby/youcanttaketheskyfromme.gif
new file mode 100644
index 0000000000..dd7b169f82
Binary files /dev/null and b/html/lobby/youcanttaketheskyfromme.gif differ
diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm
index 1c0a3e12c2..53672aa703 100644
--- a/maps/groundbase/groundbase_defines.dm
+++ b/maps/groundbase/groundbase_defines.dm
@@ -26,11 +26,11 @@
 /datum/map/groundbase/New()
 	..()
 	var/choice = pickweight(list(
-		"virgo3C" = 200,
-		"rp2" = 200,
-		"logo1" = 20,
-		"logo2" = 20,
-		"gateway" = 5
+		'html/lobby/virgo3C.gif' = 200,
+		'html/lobby/rp2.gif' = 200,
+		'html/lobby/logo1.gif' = 20,
+		'html/lobby/logo2.gif' = 20,
+		'html/lobby/gateway.gif' = 5
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -48,8 +48,7 @@
 
 	zlevel_datum_type = /datum/map_z_level/groundbase
 
-	lobby_icon = 'icons/misc/title_vr.dmi'
-	lobby_screens = list("logo1")
+	lobby_screens = list('html/lobby/logo1.gif')
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 
diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm
index 701ad18d43..24c19f264f 100644
--- a/maps/stellar_delight/stellar_delight_defines.dm
+++ b/maps/stellar_delight/stellar_delight_defines.dm
@@ -23,12 +23,12 @@
 /datum/map/stellar_delight/New()
 	..()
 	var/choice = pickweight(list(
-		"logo1" = 50,
-		"logo2" = 50,
-		"gateway" = 5,
-		"youcanttaketheskyfromme" = 200,
-		"intothedark" = 200,
-		"above3b" = 200
+		'html/lobby/logo1.gif' = 50,
+		'html/lobby/logo2.gif' = 50,
+		'html/lobby/gateway.gif' = 5,
+		'html/lobby/youcanttaketheskyfromme.gif' = 200,
+		'html/lobby/intothedark.gif' = 200,
+		'html/lobby/above3b.gif' = 200,
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -46,8 +46,7 @@
 
 	zlevel_datum_type = /datum/map_z_level/stellar_delight
 
-	lobby_icon = 'icons/misc/title_vr.dmi' //remove the _2 after the event
-	lobby_screens = list("youcanttaketheskyfromme") //set back to youcanttaketheskyfromme
+	lobby_screens = list('html/lobby/youcanttaketheskyfromme.gif') //set back to youcanttaketheskyfromme
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index a6e806baf0..195294ea6b 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -32,16 +32,16 @@
 /datum/map/tether/New()
 	..()
 	var/choice = pickweight(list(
-		"title" = 10,
-		"tether" = 50,
-		"tether_night" = 50,
-		"tether2_night" = 50,
-		"tether2_dog" = 1,
-		"tether2_love" = 1,
-		"tether_future" = 10,
-		"logo1" = 20,
-		"logo2" = 20,
-		"gateway" = 5
+		'html/lobby/title.gif' = 10,
+		'html/lobby/tether.gif' = 50,
+		'html/lobby/tether_night.gif' = 50,
+		'html/lobby/tether2_night.gif' = 50,
+		'html/lobby/tether2_dog.gif' = 1,
+		'html/lobby/tether2_love.gif' = 1,
+		'html/lobby/tether_future.gif' = 10,
+		'html/lobby/logo1.gif' = 20,
+		'html/lobby/logo2.gif' = 20,
+		'html/lobby/gateway.gif' = 5
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -59,8 +59,7 @@
 
 	zlevel_datum_type = /datum/map_z_level/tether
 
-	lobby_icon = 'icons/misc/title_vr.dmi'
-	lobby_screens = list("tether2_night")
+	lobby_screens = list('html/lobby/tether2_night.gif')
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 	holomap_smoosh = list(list(
diff --git a/maps/virgo_minitest/virgo_minitest_defines.dm b/maps/virgo_minitest/virgo_minitest_defines.dm
index ec26a64351..7fa423a75a 100644
--- a/maps/virgo_minitest/virgo_minitest_defines.dm
+++ b/maps/virgo_minitest/virgo_minitest_defines.dm
@@ -6,8 +6,7 @@
 	full_name = "NSS Ade-testing"
 	path = "virgo_minitest"
 
-	lobby_icon = 'icons/misc/title_vr.dmi'
-	lobby_screens = list("logo2")
+	lobby_screens = list('html/lobby/logo2.gif')
 
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
@@ -78,4 +77,4 @@
 	new /datum/random_map/automata/cave_system(null, 1, 1, Z_LEVEL_MAIN_VIRGO_TESTING, world.maxx, world.maxy)
 	new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_MAIN_VIRGO_TESTING, 64, 64)
 */
-	return 1
\ No newline at end of file
+	return 1
diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index 517f312464..07fbf6c110 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -123,10 +123,7 @@ var/list/all_maps = list()
 
 	var/datum/skybox_settings/default_skybox // What skybox do we use if a zlevel doesn't have a custom one? Provide a type.
 
-	//CHOMPStation Edit Start TFF 24/12/19 - Chompers welcome screen message
-	var/lobby_icon = 'icons/misc/splash_screen.dmi' // The icon which contains the lobby image(s)
-	var/list/lobby_screens = list()				 // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
-	//CHOMPStation Edit End
+	var/list/lobby_screens = list('html/lobby/mockingjay00.gif')                 // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
 
 	var/default_law_type = /datum/ai_laws/nanotrasen // The default lawset use by synth units, if not overriden by their laws var.
 
diff --git a/modular_chomp/maps/relic_base/relicbase_defines.dm b/modular_chomp/maps/relic_base/relicbase_defines.dm
index 5a8560d2d0..f1e1061058 100644
--- a/modular_chomp/maps/relic_base/relicbase_defines.dm
+++ b/modular_chomp/maps/relic_base/relicbase_defines.dm
@@ -28,9 +28,8 @@
 	full_name = "NLS Relic Base"
 	path = "relicbase"
 
-	lobby_icon = 'icons/misc/splash_screen.dmi'
-	lobby_screens = list("thor") //CHOMPStation Edit TFF 24/12/19 - CHOMPStation image
-	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'	//CHOMPStation Edit 25/1/20 TFF - Job icons for off-duty/exploration
+	lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif')
+	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_UNDERGROUND,
diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm b/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm
index e8cf8d714f..d10ae402fd 100644
--- a/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm
+++ b/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm
@@ -38,9 +38,8 @@ but they don't actually change anything about the load order
 	full_name = "Soluna Nexus"
 	path = "soluna_nexus"
 
-	lobby_icon = 'icons/misc/splash_screen.dmi'	//CHOMPStation Edit
-	lobby_screens = list("southern_cross1") //CHOMPStation Edit - CHOMPStation image
-	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'	//CHOMPStation Edit - Job icons for off-duty/exploration
+	lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif')
+	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_STATION_ONE,
diff --git a/modular_chomp/maps/southern_cross/southern_cross_defines.dm b/modular_chomp/maps/southern_cross/southern_cross_defines.dm
index c8794b262b..57cf9d5164 100644
--- a/modular_chomp/maps/southern_cross/southern_cross_defines.dm
+++ b/modular_chomp/maps/southern_cross/southern_cross_defines.dm
@@ -38,9 +38,8 @@ but they don't actually change anything about the load order
 	full_name = "Southern Cross"
 	path = "southern_cross"
 
-	lobby_icon = 'icons/misc/splash_screen.dmi'	//CHOMPStation Edit
-	lobby_screens = list("southern_cross1") //CHOMPStation Edit - CHOMPStation image
-	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'	//CHOMPStation Edit - Job icons for off-duty/exploration
+	lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif')
+	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
 	holomap_smoosh = list(list(
 		Z_LEVEL_STATION_ONE,
diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm b/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm
index 837fda7354..7fa423a75a 100644
--- a/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm
+++ b/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm
@@ -6,8 +6,7 @@
 	full_name = "NSS Ade-testing"
 	path = "virgo_minitest"
 
-	lobby_icon = 'icons/misc/title_vr.dmi'
-	lobby_screens = list("logo2")
+	lobby_screens = list('html/lobby/logo2.gif')
 
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
diff --git a/modular_chomp/maps/~map_system/maps.dm b/modular_chomp/maps/~map_system/maps.dm
index 824c1afcda..66c13e5892 100644
--- a/modular_chomp/maps/~map_system/maps.dm
+++ b/modular_chomp/maps/~map_system/maps.dm
@@ -122,10 +122,7 @@ var/list/all_maps = list()
 
 	var/datum/skybox_settings/default_skybox // What skybox do we use if a zlevel doesn't have a custom one? Provide a type.
 
-	//CHOMPStation Edit Start TFF 24/12/19 - Chompers welcome screen message
-	var/lobby_icon = 'icons/misc/splash_screen.dmi' // The icon which contains the lobby image(s)
-	var/list/lobby_screens = list()				 // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
-	//CHOMPStation Edit End
+	var/list/lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif')				 // The list of lobby screen to pick() from. If left unset the first icon state is always selected.
 
 	var/default_law_type = /datum/ai_laws/nanotrasen // The default lawset use by synth units, if not overriden by their laws var.