From b44554ae5de613aa42e5dc6c5e58f371c2ca7829 Mon Sep 17 00:00:00 2001 From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com> Date: Wed, 3 Jun 2020 17:06:10 +0800 Subject: [PATCH] Bigger ready up panel (#8964) --- .../mob/abstract/new_player/new_player.dm | 28 ++++++------- html/changelogs/wezzy_better_newplayer.yml | 41 +++++++++++++++++++ maps/aurora/code/aurora.dm | 7 ++-- 3 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 html/changelogs/wezzy_better_newplayer.yml diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index 9b295d81000..be2b6cada54 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -27,25 +27,15 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) new_player_panel_proc() /mob/abstract/new_player/proc/new_player_panel_proc() - var/output = "
Welcome to the [station_name()]!
" + var/output = "
Welcome to the [station_name()]!
" var/character_name = client.prefs.real_name - if(character_name) - output += "You will board as [character_name].
" if(current_map.description) output += "[current_map.description]
" output += "Setup Character " - - if(ROUND_IS_STARTED) - output += "Join the Game! " - output += "View the Crew Manifest " - else - if(ready) - output += "Un-Ready " - else - output += "Ready Up " - output += "Observe " + if(ROUND_IS_STARTED) + output += "View the Crew Manifest " if(!IsGuestKey(src.key)) establish_db_connection(dbcon) @@ -66,9 +56,19 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) else output += "Show Player Polls" + if(character_name) + output += "
You will board as [character_name]
" + if(ROUND_IS_STARTED) + output += "Join the Game " + else + if(ready) + output += "Un-Ready " + else + output += "Ready Up " + output += "
" send_theme_resources(src) - src << browse(enable_ui_theme(src, output),"window=playersetup;size=400x280;can_close=0") + src << browse(enable_ui_theme(src, output),"window=playersetup;size=560x280;can_close=0") /mob/abstract/new_player/Stat() ..() diff --git a/html/changelogs/wezzy_better_newplayer.yml b/html/changelogs/wezzy_better_newplayer.yml new file mode 100644 index 00000000000..5c6eeb47642 --- /dev/null +++ b/html/changelogs/wezzy_better_newplayer.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Makes the ready up panel bigger. Tweaks the primer." diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index 4de829dbdcd..b76d2fe06a2 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -1,9 +1,10 @@ /datum/map/aurora name = "Aurora" full_name = "NSS Aurora" - description = "The NSS Aurora is a phoron research and extraction station. It houses facilities for studying all manner of ways to acquire phoron, \ - even ways one may think impossible to be related to acquiring the element. It is located on the 361224 Colossus asteroid, \ - known for its anomalous and phoron rich nature, partly due to its own location in the Romanovich Cloud." + description = "You're aboard the NSS Aurora, a state-of-the-art station specializing in phoron research and acquisition. \ + It is staffed by Nanotrasen personnel and contractors from competing megacorporations. \ + Orbiting at the very edge of the Tau Ceti system, approximately 12 light-years away from Sol, \ + it is under the joint administration of the Republic of Biesel and the trans-stellar corporate conglomerate NanoTrasen." path = "aurora" lobby_screens = list("aurora_asteroid", "aurora_postcard")