diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 4e24a8e270..8738c3e65f 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -55,7 +55,7 @@ var/datum/subsystem/ticker/ticker /datum/subsystem/ticker/New() NEW_SS_GLOBAL(ticker) - login_music = pickweight(list('sound/ambience/title1.ogg' = 31, 'sound/ambience/title2.ogg' = 31, 'sound/ambience/title3.ogg' = 31, 'sound/ambience/title4.ogg' = 31, 'sound/ambience/title5.ogg' = 31, 'sound/ambience/title6.ogg' = 31, 'sound/ambience/clown.ogg' = 7)) // choose title music! + login_music = pickweight(list('sound/ambience/title1.ogg' = 30, 'sound/ambience/title2.ogg' = 30, 'sound/ambience/title3.ogg' = 30, 'sound/ambience/title4.ogg' = 30, 'sound/ambience/title5.ogg' = 30, 'sound/ambience/title6.ogg' = 30, 'sound/ambience/title7.ogg' = 30, 'sound/ambience/clown.ogg' = 3)) // choose title music! if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS]) login_music = 'sound/ambience/clown.ogg' @@ -553,4 +553,3 @@ var/datum/subsystem/ticker/ticker /datum/subsystem/ticker/proc/send_gamemode_vote(var/) SSvote.initiate_vote("roundtype","server") - diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 1e05ee1833..5a8d40bd8d 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -104,7 +104,7 @@ var/list/teleportlocs = list() power_environ = 0 valid_territory = 0 outdoors = 1 - ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',) + ambientsounds = list('sound/ambience/ambispace.ogg','sound/ambience/title3.ogg',) blob_allowed = 0 //Eating up space doesn't count for victory as a blob. /area/space/nearstation diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 8b3a445b43..03e2ecd45c 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -24,14 +24,13 @@ /turf/closed/indestructible/splashscreen name = "Space Station 13" icon = 'icons/misc/fullscreen.dmi' - icon_state = "title" + icon_state = "title1" layer = FLY_LAYER - var/titlescreen = TITLESCREEN + /turf/closed/indestructible/splashscreen/New() ..() - if(titlescreen) - icon_state = titlescreen + icon_state = pick("title1","title2","title3","title4","title5") /turf/closed/indestructible/riveted icon_state = "riveted" @@ -79,4 +78,4 @@ name = "iced rock" desc = "Extremely densely-packed sheets of ice and rock, forged over the years of the harsh cold." icon = 'icons/turf/walls.dmi' - icon_state = "icerock" \ No newline at end of file + icon_state = "icerock" diff --git a/icons/misc/fullscreen.dmi b/icons/misc/fullscreen.dmi index 70e27e9e69..4bf628bd41 100644 Binary files a/icons/misc/fullscreen.dmi and b/icons/misc/fullscreen.dmi differ diff --git a/sound/ambience/title1.ogg b/sound/ambience/title1.ogg index 6d689d475f..019e6b8975 100644 Binary files a/sound/ambience/title1.ogg and b/sound/ambience/title1.ogg differ diff --git a/sound/ambience/title2.ogg b/sound/ambience/title2.ogg index af8cc5caae..22442e55da 100644 Binary files a/sound/ambience/title2.ogg and b/sound/ambience/title2.ogg differ diff --git a/sound/ambience/title3.ogg b/sound/ambience/title3.ogg index 9632d259e1..c7969071b3 100644 Binary files a/sound/ambience/title3.ogg and b/sound/ambience/title3.ogg differ diff --git a/sound/ambience/title5.ogg b/sound/ambience/title5.ogg index d8111c52db..18d6e93660 100644 Binary files a/sound/ambience/title5.ogg and b/sound/ambience/title5.ogg differ diff --git a/sound/ambience/title6.ogg b/sound/ambience/title6.ogg index 64cf41500e..d1a3c8fe5f 100644 Binary files a/sound/ambience/title6.ogg and b/sound/ambience/title6.ogg differ diff --git a/sound/ambience/title7.ogg b/sound/ambience/title7.ogg new file mode 100644 index 0000000000..78a44e62ea Binary files /dev/null and b/sound/ambience/title7.ogg differ