diff --git a/archive/maps/cynosure/cynosure_defines.dm b/archive/maps/cynosure/cynosure_defines.dm index 6f3bddf6c0..1ed8e45479 100644 --- a/archive/maps/cynosure/cynosure_defines.dm +++ b/archive/maps/cynosure/cynosure_defines.dm @@ -13,7 +13,7 @@ full_name = "Cynosure Station" path = "cynosure" - lobby_screens = list('html/lobby/mockingjay00.gif') // New lobby screen if possible. + lobby_screens = list('html/lobby/mockingjay00.webp') // 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 026236741f..f700532fd6 100644 --- a/archive/maps/example/example_defines.dm +++ b/archive/maps/example/example_defines.dm @@ -6,7 +6,7 @@ full_name = "The Test Map" path = "example" - lobby_screens = list('html/lobby/mockingjay00.gif') + lobby_screens = list('html/lobby/mockingjay00.webp') 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 9a1b18da1b..c4062cec60 100644 --- a/archive/maps/northern_star/northern_star_defines.dm +++ b/archive/maps/northern_star/northern_star_defines.dm @@ -11,7 +11,7 @@ full_name = "NCS Northern Star" path = "northern_star" - lobby_screens = list('html/lobby/mockingjay00.gif') + lobby_screens = list('html/lobby/mockingjay00.webp') zlevel_datum_type = /datum/map_z_level/northern_star diff --git a/archive/maps/old_yw/yw/cryogaia_defines.dm b/archive/maps/old_yw/yw/cryogaia_defines.dm index 3a6ddaa033..c5564a21f1 100644 --- a/archive/maps/old_yw/yw/cryogaia_defines.dm +++ b/archive/maps/old_yw/yw/cryogaia_defines.dm @@ -44,8 +44,8 @@ overmap_event_areas = 10 usable_email_tlds = list("cryogaia.nt") - lobby_icon = 'icons/misc/title_yw.dmi' - lobby_screens = list("cryogaia") + + lobby_screens = list('modular_chomp/html/lobby/cryogaia.webp') id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' holomap_smoosh = list(list( diff --git a/archive/maps/southern_cross/southern_cross_defines.dm b/archive/maps/southern_cross/southern_cross_defines.dm index bc76086b2a..de6b27c40c 100644 --- a/archive/maps/southern_cross/southern_cross_defines.dm +++ b/archive/maps/southern_cross/southern_cross_defines.dm @@ -16,7 +16,7 @@ full_name = "Southern Cross" path = "southern_cross" - lobby_screens = list('html/lobby/mockingjay00.gif') // New lobby screen if possible. + lobby_screens = list('html/lobby/mockingjay00.webp') // 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 61aac514e1..9bec9203c5 100644 --- a/code/modules/asset_cache/assets/lobby.dm +++ b/code/modules/asset_cache/assets/lobby.dm @@ -6,5 +6,6 @@ ) /datum/asset/simple/lobby_files/register() + // not actually a gif assets["lobby_bg.gif"] = pick(using_map.lobby_screens) . = ..() diff --git a/html/lobby/above3b.gif b/html/lobby/above3b.gif deleted file mode 100644 index 8c15159cc1..0000000000 Binary files a/html/lobby/above3b.gif and /dev/null differ diff --git a/html/lobby/above3b.png b/html/lobby/above3b.png new file mode 100644 index 0000000000..c5106e785c Binary files /dev/null and b/html/lobby/above3b.png differ diff --git a/html/lobby/endo.gif b/html/lobby/endo.gif deleted file mode 100644 index 053270cfc1..0000000000 Binary files a/html/lobby/endo.gif and /dev/null differ diff --git a/html/lobby/endo.png b/html/lobby/endo.png new file mode 100644 index 0000000000..56ced0f7eb Binary files /dev/null and b/html/lobby/endo.png differ diff --git a/html/lobby/gateway.gif b/html/lobby/gateway.gif deleted file mode 100644 index c3c09d5625..0000000000 Binary files a/html/lobby/gateway.gif and /dev/null differ diff --git a/html/lobby/gateway.png b/html/lobby/gateway.png new file mode 100644 index 0000000000..f5f4ebfd2f Binary files /dev/null and b/html/lobby/gateway.png differ diff --git a/html/lobby/intothedark.gif b/html/lobby/intothedark.gif deleted file mode 100644 index 5b5587b3d6..0000000000 Binary files a/html/lobby/intothedark.gif and /dev/null differ diff --git a/html/lobby/intothedark.png b/html/lobby/intothedark.png new file mode 100644 index 0000000000..78dfbfde4c Binary files /dev/null and b/html/lobby/intothedark.png differ diff --git a/html/lobby/logo1.gif b/html/lobby/logo1.gif deleted file mode 100644 index 2d739daf2b..0000000000 Binary files a/html/lobby/logo1.gif and /dev/null differ diff --git a/html/lobby/logo1.png b/html/lobby/logo1.png new file mode 100644 index 0000000000..3987c655f7 Binary files /dev/null and b/html/lobby/logo1.png differ diff --git a/html/lobby/logo2.gif b/html/lobby/logo2.gif deleted file mode 100644 index e90918c32e..0000000000 Binary files a/html/lobby/logo2.gif and /dev/null differ diff --git a/html/lobby/logo2.png b/html/lobby/logo2.png new file mode 100644 index 0000000000..92a93b1024 Binary files /dev/null and b/html/lobby/logo2.png differ diff --git a/html/lobby/mockingjay00.gif b/html/lobby/mockingjay00.gif deleted file mode 100644 index 6c9d5e9e5b..0000000000 Binary files a/html/lobby/mockingjay00.gif and /dev/null differ diff --git a/html/lobby/mockingjay00.webp b/html/lobby/mockingjay00.webp new file mode 100644 index 0000000000..eb1622bfd3 Binary files /dev/null and b/html/lobby/mockingjay00.webp differ diff --git a/html/lobby/rp2.gif b/html/lobby/rp2.gif deleted file mode 100644 index b81b176a1f..0000000000 Binary files a/html/lobby/rp2.gif and /dev/null differ diff --git a/html/lobby/rp2.png b/html/lobby/rp2.png new file mode 100644 index 0000000000..1088ec0002 Binary files /dev/null and b/html/lobby/rp2.png differ diff --git a/html/lobby/tether.gif b/html/lobby/tether.gif deleted file mode 100644 index f597cc3aea..0000000000 Binary files a/html/lobby/tether.gif and /dev/null differ diff --git a/html/lobby/tether.png b/html/lobby/tether.png new file mode 100644 index 0000000000..c54a891ebc Binary files /dev/null and b/html/lobby/tether.png differ diff --git a/html/lobby/tether2_dog.gif b/html/lobby/tether2_dog.gif deleted file mode 100644 index 76e044d9f5..0000000000 Binary files a/html/lobby/tether2_dog.gif and /dev/null differ diff --git a/html/lobby/tether2_dog.png b/html/lobby/tether2_dog.png new file mode 100644 index 0000000000..ba12b9ba8f Binary files /dev/null and b/html/lobby/tether2_dog.png differ diff --git a/html/lobby/tether2_love.gif b/html/lobby/tether2_love.gif deleted file mode 100644 index fe6b1d2688..0000000000 Binary files a/html/lobby/tether2_love.gif and /dev/null differ diff --git a/html/lobby/tether2_love.png b/html/lobby/tether2_love.png new file mode 100644 index 0000000000..4415dceea0 Binary files /dev/null and b/html/lobby/tether2_love.png differ diff --git a/html/lobby/tether2_night.gif b/html/lobby/tether2_night.gif deleted file mode 100644 index ef7a8db116..0000000000 Binary files a/html/lobby/tether2_night.gif and /dev/null differ diff --git a/html/lobby/tether2_night.png b/html/lobby/tether2_night.png new file mode 100644 index 0000000000..66624284e7 Binary files /dev/null and b/html/lobby/tether2_night.png differ diff --git a/html/lobby/tether_future.gif b/html/lobby/tether_future.gif deleted file mode 100644 index 2047cf2ab8..0000000000 Binary files a/html/lobby/tether_future.gif and /dev/null differ diff --git a/html/lobby/tether_future.png b/html/lobby/tether_future.png new file mode 100644 index 0000000000..de837511db Binary files /dev/null and b/html/lobby/tether_future.png differ diff --git a/html/lobby/tether_night.gif b/html/lobby/tether_night.gif deleted file mode 100644 index ed38bfdc56..0000000000 Binary files a/html/lobby/tether_night.gif and /dev/null differ diff --git a/html/lobby/tether_night.png b/html/lobby/tether_night.png new file mode 100644 index 0000000000..37a9ea48c2 Binary files /dev/null and b/html/lobby/tether_night.png differ diff --git a/html/lobby/title.gif b/html/lobby/title.gif deleted file mode 100644 index 865ef37a5f..0000000000 Binary files a/html/lobby/title.gif and /dev/null differ diff --git a/html/lobby/title.png b/html/lobby/title.png new file mode 100644 index 0000000000..52474d81ff Binary files /dev/null and b/html/lobby/title.png differ diff --git a/html/lobby/title_old.gif b/html/lobby/title_old.gif deleted file mode 100644 index 81d191502f..0000000000 Binary files a/html/lobby/title_old.gif and /dev/null differ diff --git a/html/lobby/title_old.webp b/html/lobby/title_old.webp new file mode 100644 index 0000000000..78318f9f8f Binary files /dev/null and b/html/lobby/title_old.webp differ diff --git a/html/lobby/virgo3C.gif b/html/lobby/virgo3C.gif deleted file mode 100644 index 3c8b406b3a..0000000000 Binary files a/html/lobby/virgo3C.gif and /dev/null differ diff --git a/html/lobby/virgo3C.png b/html/lobby/virgo3C.png new file mode 100644 index 0000000000..fcde7d0297 Binary files /dev/null and b/html/lobby/virgo3C.png differ diff --git a/html/lobby/youcanttaketheskyfromme.gif b/html/lobby/youcanttaketheskyfromme.gif deleted file mode 100644 index dd7b169f82..0000000000 Binary files a/html/lobby/youcanttaketheskyfromme.gif and /dev/null differ diff --git a/html/lobby/youcanttaketheskyfromme.png b/html/lobby/youcanttaketheskyfromme.png new file mode 100644 index 0000000000..1fc5e42c47 Binary files /dev/null and b/html/lobby/youcanttaketheskyfromme.png differ diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 53672aa703..3d30f62ebc 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( - '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 + 'html/lobby/virgo3C.png' = 200, + 'html/lobby/rp2.png' = 200, + 'html/lobby/logo1.png' = 20, + 'html/lobby/logo2.png' = 20, + 'html/lobby/gateway.png' = 5 )) if(choice) lobby_screens = list(choice) @@ -48,7 +48,7 @@ zlevel_datum_type = /datum/map_z_level/groundbase - lobby_screens = list('html/lobby/logo1.gif') + lobby_screens = list('html/lobby/logo1.png') 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 24c19f264f..48d5b988de 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( - '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, + 'html/lobby/logo1.png' = 50, + 'html/lobby/logo2.png' = 50, + 'html/lobby/gateway.png' = 5, + 'html/lobby/youcanttaketheskyfromme.png' = 200, + 'html/lobby/intothedark.png' = 200, + 'html/lobby/above3b.png' = 200, )) if(choice) lobby_screens = list(choice) @@ -46,7 +46,7 @@ zlevel_datum_type = /datum/map_z_level/stellar_delight - lobby_screens = list('html/lobby/youcanttaketheskyfromme.gif') //set back to youcanttaketheskyfromme + lobby_screens = list('html/lobby/youcanttaketheskyfromme.png') //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 195294ea6b..949a8f1501 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( - '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 + 'html/lobby/title.png' = 10, + 'html/lobby/tether.png' = 50, + 'html/lobby/tether_night.png' = 50, + 'html/lobby/tether2_night.png' = 50, + 'html/lobby/tether2_dog.png' = 1, + 'html/lobby/tether2_love.png' = 1, + 'html/lobby/tether_future.png' = 10, + 'html/lobby/logo1.png' = 20, + 'html/lobby/logo2.png' = 20, + 'html/lobby/gateway.png' = 5 )) if(choice) lobby_screens = list(choice) @@ -59,7 +59,7 @@ zlevel_datum_type = /datum/map_z_level/tether - lobby_screens = list('html/lobby/tether2_night.gif') + lobby_screens = list('html/lobby/tether2_night.png') 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 7fa423a75a..00b384c969 100644 --- a/maps/virgo_minitest/virgo_minitest_defines.dm +++ b/maps/virgo_minitest/virgo_minitest_defines.dm @@ -6,7 +6,7 @@ full_name = "NSS Ade-testing" path = "virgo_minitest" - lobby_screens = list('html/lobby/logo2.gif') + lobby_screens = list('html/lobby/logo2.png') id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 07fbf6c110..725b25332a 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -123,7 +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. - 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/list/lobby_screens = list('html/lobby/mockingjay00.webp') // 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/html/lobby/chompstation.webp b/modular_chomp/html/lobby/chompstation.webp new file mode 100644 index 0000000000..8392d0fb7d Binary files /dev/null and b/modular_chomp/html/lobby/chompstation.webp differ diff --git a/icons/misc/CHOMPSTATION_BG_eggman.gif b/modular_chomp/html/lobby/chompstation_eggman.gif similarity index 100% rename from icons/misc/CHOMPSTATION_BG_eggman.gif rename to modular_chomp/html/lobby/chompstation_eggman.gif diff --git a/modular_chomp/html/lobby/chompstation_old.png b/modular_chomp/html/lobby/chompstation_old.png new file mode 100644 index 0000000000..8e64252a58 Binary files /dev/null and b/modular_chomp/html/lobby/chompstation_old.png differ diff --git a/modular_chomp/html/lobby/cryogaia.webp b/modular_chomp/html/lobby/cryogaia.webp new file mode 100644 index 0000000000..834831bd94 Binary files /dev/null and b/modular_chomp/html/lobby/cryogaia.webp differ diff --git a/modular_chomp/html/lobby/cryogaia_static.png b/modular_chomp/html/lobby/cryogaia_static.png new file mode 100644 index 0000000000..d7a5718ee0 Binary files /dev/null and b/modular_chomp/html/lobby/cryogaia_static.png differ diff --git a/icons/misc/splash_screen.dmi b/modular_chomp/icons/misc/splash_screen.dmi similarity index 100% rename from icons/misc/splash_screen.dmi rename to modular_chomp/icons/misc/splash_screen.dmi diff --git a/icons/misc/title_ch.dmi b/modular_chomp/icons/misc/title_ch.dmi similarity index 100% rename from icons/misc/title_ch.dmi rename to modular_chomp/icons/misc/title_ch.dmi diff --git a/icons/misc/title_yw.dmi b/modular_chomp/icons/misc/title_yw.dmi similarity index 100% rename from icons/misc/title_yw.dmi rename to modular_chomp/icons/misc/title_yw.dmi diff --git a/modular_chomp/maps/relic_base/relicbase_defines.dm b/modular_chomp/maps/relic_base/relicbase_defines.dm index f1e1061058..0c9e83b051 100644 --- a/modular_chomp/maps/relic_base/relicbase_defines.dm +++ b/modular_chomp/maps/relic_base/relicbase_defines.dm @@ -28,7 +28,7 @@ full_name = "NLS Relic Base" path = "relicbase" - lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif') + lobby_screens = list('modular_chomp/html/lobby/chompstation.webp') id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' holomap_smoosh = list(list( diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm b/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm index d10ae402fd..d476c26ffc 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus_defines.dm @@ -38,7 +38,7 @@ but they don't actually change anything about the load order full_name = "Soluna Nexus" path = "soluna_nexus" - lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif') + lobby_screens = list('modular_chomp/html/lobby/chompstation.webp') id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' holomap_smoosh = list(list( diff --git a/modular_chomp/maps/southern_cross/southern_cross_defines.dm b/modular_chomp/maps/southern_cross/southern_cross_defines.dm index 57cf9d5164..b182360209 100644 --- a/modular_chomp/maps/southern_cross/southern_cross_defines.dm +++ b/modular_chomp/maps/southern_cross/southern_cross_defines.dm @@ -38,7 +38,7 @@ but they don't actually change anything about the load order full_name = "Southern Cross" path = "southern_cross" - lobby_screens = list('icons/misc/CHOMPSTATION_BG_eggman.gif') + lobby_screens = list('modular_chomp/html/lobby/chompstation.webp') id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' holomap_smoosh = list(list( diff --git a/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm b/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm index 7fa423a75a..7bfe250969 100644 --- a/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm +++ b/modular_chomp/maps/virgo_minitest/virgo_minitest_defines.dm @@ -6,7 +6,7 @@ full_name = "NSS Ade-testing" path = "virgo_minitest" - lobby_screens = list('html/lobby/logo2.gif') + lobby_screens = list('modular_chomp/html/lobby/chompstation_eggman.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 66c13e5892..6738adf2b4 100644 --- a/modular_chomp/maps/~map_system/maps.dm +++ b/modular_chomp/maps/~map_system/maps.dm @@ -122,7 +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. - 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/list/lobby_screens = list('modular_chomp/html/lobby/chompstation.webp') // 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.