cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 15:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11553 from PsiOmegaDelta/151201-RandomLobby

Browse Source 
Adds the ability to have random lobby screens.
This commit is contained in:
GinjaNinja32
2015-12-01 23:58:08 +00:00
parent f9c513a3dd a32be3f359
commit 8303404678
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/configuration.dm
View File

@@ -6,6 +6,8 @@ var/list/gamemode_cache = list()
var/nudge_script_path = "nudge.py" // where the nudge.py script is located var/nudge_script_path = "nudge.py" // where the nudge.py script is located
var/list/lobby_screens = list("title") // Which lobby screens are available
var/log_ooc = 0 // log OOC channel var/log_ooc = 0 // log OOC channel
var/log_access = 0 // log login/logout var/log_access = 0 // log login/logout
var/log_say = 0 // log client say var/log_say = 0 // log client say
@@ -699,6 +701,9 @@ var/list/gamemode_cache = list()
if(values.len > 0) if(values.len > 0)
language_prefixes = values language_prefixes = values
if ("lobby_screens")
config.lobby_screens = text2list(value, ";")
else else
log_misc("Unknown setting in configuration: '[name]'") log_misc("Unknown setting in configuration: '[name]'")

19
code/modules/mob/new_player/login.dm
View File

@@ -1,5 +1,22 @@
/var/obj/effect/lobby_image = new/obj/effect/lobby_image()
/var/atom/movable/lobby_image = new /atom/movable{icon = 'icons/misc/title.dmi'; icon_state = "title"; screen_loc = "1,1"; name = "Baystation12"} /obj/effect/lobby_image
name = "Baystation12"
desc = "This shouldn't be read"
icon = 'icons/misc/title.dmi'
screen_loc = "WEST,SOUTH"
/obj/effect/lobby_image/initialize()
var/list/known_icon_states = icon_states(icon)
for(var/lobby_screen in config.lobby_screens)
if(!(lobby_screen in known_icon_states))
error("Lobby screen '[lobby_screen]' did not exist in the icon set [icon].")
config.lobby_screens -= lobby_screen
if(config.lobby_screens.len)
icon_state = pick(config.lobby_screens)
else
icon_state = known_icon_states[1]
/mob/new_player /mob/new_player
var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled

4
config/example/config.txt
View File

@@ -385,3 +385,7 @@ STARLIGHT 0
## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , # and - ## Default language prefix keys, separated with spaces. Only single character keys are supported. If unset, defaults to , # and -
# DEFAULT_LANGUAGE_PREFIXES , # - # DEFAULT_LANGUAGE_PREFIXES , # -
## A ; separated list of lobby screens to randomly pick from. The listed screens must exist as icon states in '/icons/misc/title.dmi'.
## Defaults to 'title' if left unset.
# LOBBY_SCREENS title