From cf1e38ce902f39e74aaaed44b135c78a28ef89bc Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 9 Jul 2016 14:19:49 +0100 Subject: [PATCH] Bug fixes for cardboard cutouts - Laughter and slaughter demons can actually be selected - You can't use a capped spraycan I swear I made these changes, must have forgotten to push. --- code/game/objects/items/cardboard_cutouts.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 06b540061c1..6be0b791f13 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -80,6 +80,9 @@ return if(crayon.check_empty(user)) return + if(crayon.is_capped) + user << "Take the cap off first!" + return var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances if(!new_appearance || !crayon || !user.canUseTopic(src)) return @@ -155,12 +158,12 @@ name = "Ian" desc = "A cardboard cutout of the HoP's beloved corgi." icon_state = "cutout_ian" - if("slaughter demon") + if("Slaughter Demon") name = "slaughter demon" desc = "A cardboard cutout of a slaughter demon." icon = 'icons/mob/mob.dmi' icon_state = "daemon" - if("laughter demon") + if("Laughter Demon") name = "laughter demon" desc = "A cardboard cutout of a laughter demon." icon = 'icons/mob/mob.dmi'