From 6a67c9c8f67765cf250fec564a51e65f17ff4e02 Mon Sep 17 00:00:00 2001 From: lm40 Date: Sun, 28 May 2023 12:36:55 -0400 Subject: [PATCH] No spawning maws or asses. --- .../objects/effects/decals/posters/posters.dm | 18 +++++++++++------- .../effects/decals/posters/voreposters_vr.dm | 12 ++++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm index 44bdb935ea..4f18d66c78 100644 --- a/code/game/objects/effects/decals/posters/posters.dm +++ b/code/game/objects/effects/decals/posters/posters.dm @@ -3,7 +3,7 @@ if(exact) return decls_repository.get_decl(path) else - var/list/L = decls_repository.get_decls_of_type(path) + var/list/L = decls_repository.get_decls_of_type(path) return L[pick(L)] return null @@ -27,7 +27,9 @@ src.poster_decl = get_poster_decl(poster_decl, TRUE) else src.poster_decl = get_poster_decl(/decl/poster, FALSE) - + while (istype(src.poster_decl, /decl/poster/lewd)) + src.poster_decl = get_poster_decl(/decl/poster, FALSE) + name += " - [src.poster_decl.name]" return ..() @@ -58,8 +60,8 @@ if (locate(/obj/structure/sign/poster) in T) stuff_on_wall = 1 break - - if(stuff_on_wall) + + if(stuff_on_wall) to_chat(user, "There is already a poster there!") return FALSE @@ -71,7 +73,7 @@ to_chat(user, "You place the poster!") qdel(src) return TRUE - + P.roll_and_drop(P.loc) qdel(src) return FALSE @@ -101,7 +103,7 @@ var/list/options = list() 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] + options[posters[option].name] = posters[option] var/choice = tgui_input_list(M, "Choose a poster!", "Customize Poster", options) if(src && choice && !M.stat && in_range(M,src)) @@ -156,7 +158,9 @@ else if(ispath(P)) src.poster_decl = get_poster_decl(P, TRUE) else - src.poster_decl = get_poster_decl(target_poster_decl_path, FALSE) + src.poster_decl = get_poster_decl(/decl/poster, FALSE) + while (istype(src.poster_decl, /decl/poster/lewd)) + src.poster_decl = get_poster_decl(/decl/poster, FALSE) name = "[initial(name)] - [poster_decl.name]" desc = "[initial(desc)] [poster_decl.desc]" diff --git a/code/game/objects/effects/decals/posters/voreposters_vr.dm b/code/game/objects/effects/decals/posters/voreposters_vr.dm index 03af8416e4..335366aedc 100644 --- a/code/game/objects/effects/decals/posters/voreposters_vr.dm +++ b/code/game/objects/effects/decals/posters/voreposters_vr.dm @@ -1,8 +1,12 @@ +/decl/poster/lewd + desc = "You shouldn't see this." + listing_name = "N/A" + /decl/poster/vore_1 icon_state = "sbsposter1" name = "Best Girl Pip" desc = "A poster of the official NT Best Girl Mascot, Pip" -/decl/poster/vore_2 +/decl/poster/lewd/vore_2 icon_state = "sbsposter2" name = "AroButt" desc = "A lewd view of KHI's cutest fops." @@ -18,7 +22,7 @@ icon_state = "sbsposter5" name = "The Inn" desc = "A poster of a certain black-eyed shadekin." -/decl/poster/vore_6 +/decl/poster/lewd/vore_6 icon_state = "sbsposter6" name = "Mawletta" desc = "The best view in the system." @@ -98,7 +102,7 @@ icon_state = "sbsposter16" name = "Borgar" desc = "What do you want from Space McDonalds?" -/decl/poster/vore_28 +/decl/poster/lewd/vore_28 icon_state = "sbsposter17" name = "DiveIn" desc = "A limited edition holographic poster that seems to feature subliminal suggestions and conditioning." @@ -389,4 +393,4 @@ /decl/poster/vore_101 icon_state = "cafejoanposter" name = "Cafe Risu" - desc = "A poster depicting a familiar face readying to slurp a big mug of coffee. The face of addiction is not always unpleasant. Sometimes it takes the form of a pretty squirrel partaking of her morning treat..." \ No newline at end of file + desc = "A poster depicting a familiar face readying to slurp a big mug of coffee. The face of addiction is not always unpleasant. Sometimes it takes the form of a pretty squirrel partaking of her morning treat..."