From 1a4d49d42201585a022a97165862bad278404bce Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 28 Jul 2021 23:06:59 -0400 Subject: [PATCH 1/2] Merge pull request #11293 from VOREStation/upstream-merge-8174 [MIRROR] Custom poster fix --- code/game/objects/effects/decals/posters/posters.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm index 9f3496b4ff..44bdb935ea 100644 --- a/code/game/objects/effects/decals/posters/posters.dm +++ b/code/game/objects/effects/decals/posters/posters.dm @@ -28,7 +28,7 @@ else src.poster_decl = get_poster_decl(/decl/poster, FALSE) - name += " - No. [src.poster_decl.name]" + name += " - [src.poster_decl.name]" return ..() //Places the poster on a wall @@ -99,13 +99,14 @@ var/mob/M = usr var/list/options = list() - for(var/decl/poster/posteroption in decls_repository.get_decls_of_type(/decl/poster)) - options[posteroption.listing_name] = posteroption + var/list/decl/poster/posters = decls_repository.get_decls_of_type(/decl/poster) + for(var/option in posters) + options[posters[option].listing_name] = posters[option] var/choice = tgui_input_list(M, "Choose a poster!", "Customize Poster", options) if(src && choice && !M.stat && in_range(M,src)) poster_decl = options[choice] - name = "rolled-up poly-poster - No.[poster_decl.icon_state]" + name = "rolled-up poly-poster - [src.poster_decl.name]" to_chat(M, "The poster is now: [choice].") @@ -204,4 +205,4 @@ // Non-Random Posters /obj/structure/sign/poster/custom - roll_type = /obj/item/poster/custom \ No newline at end of file + roll_type = /obj/item/poster/custom