From 6a41afd0bd8b5999239757c95e80670b5f4ff035 Mon Sep 17 00:00:00 2001 From: SonixApache Date: Thu, 11 Jan 2024 06:43:22 +0100 Subject: [PATCH] Painting/scoreboard maintenance (#35737) + printed paintings no longer show up on the scoreboard + admemes can now actually artistban people + painting ban var moved from painting object to custom painting datum (so VV there if you want to ban a painting) --- code/game/gamemodes/endgame/scoreboard/misc_score.dm | 2 +- code/modules/admin/topic.dm | 6 ++++++ .../html_interface/paintTool/custom_painting_datum.dm | 2 ++ code/modules/painting/paintings_custom.dm | 1 - 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/endgame/scoreboard/misc_score.dm b/code/game/gamemodes/endgame/scoreboard/misc_score.dm index 781a7e0ed07b..b9c524801679 100644 --- a/code/game/gamemodes/endgame/scoreboard/misc_score.dm +++ b/code/game/gamemodes/endgame/scoreboard/misc_score.dm @@ -7,7 +7,7 @@ if(gallery.len) //the list of all artworks var/list/artworks = list() //list of authors, for sorting later for(var/obj/structure/painting/custom/painting in gallery) - if(painting.show_on_scoreboard && !painting.painting_data.is_blank()) + if(painting.painting_data.show_on_scoreboard && !painting.painting_data.is_blank()) var/painting_author = painting.painting_data.author if(!painting_author) painting_author = "Anonymous" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index d43021188392..0aba0a34f2bc 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1377,6 +1377,12 @@ jobs += "Cluwne" else jobs += "Cluwne" + + if(jobban_isbanned(M, "artist")) //so people can't make paintings + jobs += "Artist" + else + jobs += "Artist" + jobs += "" body = "[jobs]" diff --git a/code/modules/html_interface/paintTool/custom_painting_datum.dm b/code/modules/html_interface/paintTool/custom_painting_datum.dm index 8d74b8d13ec6..ef86bec76506 100644 --- a/code/modules/html_interface/paintTool/custom_painting_datum.dm +++ b/code/modules/html_interface/paintTool/custom_painting_datum.dm @@ -172,6 +172,7 @@ var/title = "" var/description = "" var/contributing_artists = list() + var/show_on_scoreboard = TRUE var/copy = 0 @@ -493,6 +494,7 @@ painting.author = author painting.description = description painting.copy = 1 + painting.show_on_scoreboard = FALSE //sorry, OC only return painting #undef PENCIL_STRENGTH_MAX diff --git a/code/modules/painting/paintings_custom.dm b/code/modules/painting/paintings_custom.dm index 43f9d3d6efce..5c0a18bb90c6 100644 --- a/code/modules/painting/paintings_custom.dm +++ b/code/modules/painting/paintings_custom.dm @@ -26,7 +26,6 @@ var/base_icon_state = "blank" var/frame_icon = 'icons/obj/painting_items.dmi' var/frame_icon_state = "frame" - var/show_on_scoreboard = TRUE var/image/nanomap