diff --git a/archive/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm index 18f27dfecf6..6f3bddf6c05 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 49b1dbb5cb9..026236741fe 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.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 15090d646c5..9a1b18da1b7 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/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm index d699fd76f49..bc76086b2a0 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/modules/asset_cache/assets/lobby.dm b/code/modules/asset_cache/assets/lobby.dm index 46d61ef305d..61aac514e1b 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/html/lobby/above3b.gif b/html/lobby/above3b.gif new file mode 100644 index 00000000000..8c15159cc1f 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 00000000000..053270cfc12 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 00000000000..c3c09d5625d 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 00000000000..5b5587b3d67 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 00000000000..2d739daf2b8 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 00000000000..e90918c32e5 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 00000000000..6c9d5e9e5bd 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 00000000000..b81b176a1ff 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 00000000000..74da5482e8e 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 00000000000..f597cc3aeac 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 00000000000..76e044d9f54 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 00000000000..fe6b1d2688e 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 00000000000..ef7a8db1160 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 00000000000..2047cf2ab8a 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 00000000000..ed38bfdc563 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 00000000000..7ff8e0401f6 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 00000000000..865ef37a5f5 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 00000000000..81d191502f2 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 00000000000..3c8b406b3ac 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 00000000000..dd7b169f82d 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 02e04754002..49bb8000734 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -1,11 +1,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) @@ -23,8 +23,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 ca143b84a13..d6161cf3e2e 100644 --- a/maps/stellar_delight/stellar_delight_defines.dm +++ b/maps/stellar_delight/stellar_delight_defines.dm @@ -1,12 +1,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) @@ -24,8 +24,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 cc8f44b2764..8126bda18d0 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -1,16 +1,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) @@ -28,8 +28,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 ec26a643519..7fa423a75af 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 e697f5d2b4b..aaa8e01eefc 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -124,8 +124,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. - var/lobby_icon = 'icons/misc/title.dmi' // The icon which contains the lobby image(s) - var/list/lobby_screens = list("mockingjay00") // The list of lobby screen to pick() from. If left unset the first icon state is always selected. + 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.