Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Loading Lobby Art #6684

Merged
merged 7 commits into from
Jul 25, 2024
Merged

Loading Lobby Art #6684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1bf434
lobby art loading
blackcrystall Jul 11, 2024
a1ec5f4
ow, misc
blackcrystall Jul 11, 2024
aa07339
map around
blackcrystall Jul 11, 2024
3a869ca
Merge branch 'master' into loaddding
blackcrystall Jul 11, 2024
f6f105b
remember, no russians here
blackcrystall Jul 11, 2024
4aa6e1d
Merge branch 'master' into loaddding
blackcrystall Jul 18, 2024
366d232
Merge branch 'master' into loaddding
blackcrystall Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/controllers/subsystem/init/lobby_art.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ SUBSYSTEM_DEF(lobby_art)
/datum/controller/subsystem/lobby_art/Initialize()
var/list/lobby_arts = CONFIG_GET(str_list/lobby_art_images)
if(length(lobby_arts))
force_lobby_art(rand(1,length(lobby_arts)))
force_lobby_art(rand(1, length(lobby_arts)))
return SS_INIT_SUCCESS
20 changes: 11 additions & 9 deletions code/game/turfs/walls/wall_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,28 +297,30 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen)
/turf/closed/wall/indestructible/splashscreen
name = "Lobby Art"
desc = "Assorted artworks."
icon = 'icons/lobby/title.dmi'
icon_state = ""
// icon_state = "title_holiday"
icon = 'icons/lobby/title_loading.dmi'
icon_state = "title"
layer = FLY_LAYER
special_icon = 1
special_icon = TRUE

/turf/closed/wall/indestructible/splashscreen/Initialize()
. = ..()
tag = "LOBBYART"

/proc/force_lobby_art(art_id)
GLOB.displayed_lobby_art = art_id
var/turf/closed/wall/indestructible/splashscreen/SS = locate("LOBBYART")
var/turf/closed/wall/indestructible/splashscreen/lobby_art = locate("LOBBYART")
var/list/lobby_arts = CONFIG_GET(str_list/lobby_art_images)
var/list/lobby_authors = CONFIG_GET(str_list/lobby_art_authors)
SS.icon_state = lobby_arts[GLOB.displayed_lobby_art]
SS.desc = "Artwork by [lobby_authors[GLOB.displayed_lobby_art]]"
for(var/client/C in GLOB.clients)
lobby_art.icon = 'icons/lobby/title.dmi'
lobby_art.icon_state = lobby_arts[GLOB.displayed_lobby_art]
lobby_art.desc = "Artwork by [lobby_authors[GLOB.displayed_lobby_art]]"
lobby_art.pixel_x = -288
lobby_art.pixel_y = -288
for(var/client/player in GLOB.clients)
if(GLOB.displayed_lobby_art != -1)
var/author = lobby_authors[GLOB.displayed_lobby_art]
if(author != "Unknown")
to_chat_forced(C, SPAN_ROUNDBODY("<hr>This round's lobby art is brought to you by [author]<hr>"))
to_chat_forced(player, SPAN_ROUNDBODY("<hr>This round's lobby art is brought to you by [author]<hr>"))

/turf/closed/wall/indestructible/other
icon_state = "r_wall"
Expand Down
Binary file added icons/lobby/title_loading.dmi
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions maps/map_files/generic/Admin_level.dmm
View file
Open in desktop
blackcrystall marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,7 @@ hp
hp
hp
hp
kx
hp
"}
(2,1,1) = {"
aa
Expand Down Expand Up @@ -3570,7 +3570,7 @@ hp
hp
hp
hp
hp
kx
hp
hp
hp
Expand Down
Loading