diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm index 937c8b98310..9cf0e42c042 100644 --- a/code/modules/mob/abstract/new_player/menu.dm +++ b/code/modules/mob/abstract/new_player/menu.dm @@ -99,52 +99,50 @@ hud = H ..() +/obj/screen/new_player/selection/MouseEntered(location, control, params) + var/matrix/M = matrix() + M.Scale(1.1, 1) + animate(src, color = color_rotation(30), transform = M, time = 3, easing = CUBIC_EASING) + return ..() + +/obj/screen/new_player/selection/MouseExited(location,control,params) + animate(src, color = null, transform = null, time = 3, easing = CUBIC_EASING) + return ..() + /obj/screen/new_player/selection/join_game name = "Join Game" icon_state = "unready" - screen_loc = "LEFT+1,CENTER" + screen_loc = "LEFT+0.1,CENTER-1" /obj/screen/new_player/selection/settings name = "Setup" icon_state = "setup" - screen_loc = "LEFT+1,CENTER-1" + screen_loc = "LEFT+0.1,CENTER-2" /obj/screen/new_player/selection/manifest name = "Crew Manifest" icon_state = "manifest" - screen_loc = "LEFT+1,CENTER-2" + screen_loc = "LEFT+0.1,CENTER-3" /obj/screen/new_player/selection/observe name = "Observe" icon_state = "observe" - screen_loc = "LEFT+1,CENTER-3" + screen_loc = "LEFT+0.1,CENTER-4" /obj/screen/new_player/selection/changelog name = "Changelog" icon_state = "changelog" - screen_loc = "LEFT+1,CENTER-4" + screen_loc = "LEFT+0.1,CENTER-5" /obj/screen/new_player/selection/polls name = "Polls" icon_state = "polls" - screen_loc = "LEFT+1,CENTER-5" + screen_loc = "LEFT+0.1,CENTER-6" /obj/screen/new_player/selection/lore_summary name = "Current Lore Summary" icon_state = "lore_summary" - screen_loc = "LEFT+1,CENTER-6" - -/obj/screen/new_player/selection/MouseEntered(location,control,params) //Yellow color for the font - color = "#ffb200" - var/matrix/M = matrix() - M.Scale(1.1, 1.1) - animate(src, transform = M, time = 1, easing = CUBIC_EASING) - return ..() - -/obj/screen/new_player/selection/MouseExited(location,control,params) - color = null - animate(src, transform = null, time = 1, easing = CUBIC_EASING) - return ..() + screen_loc = "LEFT+0.1,CENTER-7" /obj/screen/new_player/selection/join_game/Initialize() . = ..() diff --git a/html/changelogs/alberyk-menubuttons.yml b/html/changelogs/alberyk-menubuttons.yml new file mode 100644 index 00000000000..02492c2c642 --- /dev/null +++ b/html/changelogs/alberyk-menubuttons.yml @@ -0,0 +1,7 @@ +author: Alberyk, Kyres1, Geeves + +delete-after: True + +changes: + - rscadd: "Added new menu buttons icons." + - rscadd: "Added a new lobby screen." diff --git a/icons/misc/hudmenu.dmi b/icons/misc/hudmenu.dmi index c7fd9ded513..ab9b7678903 100644 Binary files a/icons/misc/hudmenu.dmi and b/icons/misc/hudmenu.dmi differ diff --git a/icons/misc/titlescreens/aurora/nss_aurora.dmi b/icons/misc/titlescreens/aurora/nss_aurora.dmi new file mode 100644 index 00000000000..ce317736a2a Binary files /dev/null and b/icons/misc/titlescreens/aurora/nss_aurora.dmi differ diff --git a/icons/misc/titlescreens/aurora/synthetics.dmi b/icons/misc/titlescreens/aurora/synthetics.dmi index 3c695a6a9f1..c73ce9940f6 100644 Binary files a/icons/misc/titlescreens/aurora/synthetics.dmi and b/icons/misc/titlescreens/aurora/synthetics.dmi differ diff --git a/icons/misc/titlescreens/aurora/tajara.dmi b/icons/misc/titlescreens/aurora/tajara.dmi index 6c8addc7602..d4855be3659 100644 Binary files a/icons/misc/titlescreens/aurora/tajara.dmi and b/icons/misc/titlescreens/aurora/tajara.dmi differ diff --git a/icons/misc/titlescreens/overlay_template.dmi b/icons/misc/titlescreens/overlay_template.dmi new file mode 100644 index 00000000000..bc6e54212ab Binary files /dev/null and b/icons/misc/titlescreens/overlay_template.dmi differ diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index 35c9521cf79..03b97166a8b 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -7,7 +7,7 @@ it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen." path = "aurora" - lobby_icons = list('icons/misc/titlescreens/aurora/humans.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/king_of_the_world.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi') + lobby_icons = list('icons/misc/titlescreens/aurora/nss_aurora.dmi', 'icons/misc/titlescreens/aurora/synthetics.dmi', 'icons/misc/titlescreens/aurora/tajara.dmi') lobby_transitions = 10 SECONDS station_levels = list(2, 3, 4, 5, 6, 7)