From c14cab9a6934de91bdefebb5b049b432b54115b2 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Wed, 8 Feb 2017 15:12:55 -0400 Subject: [PATCH] This commit changes the re-sprite mechanic to use a pen instead of crayonbox (as per the convention pointed out by Fox). Removes no longer needed contents checks and re-orders incapacitation check. --- .../crates_lockers/closets/cardboardbox.dm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 39f2cc93789..abc1496b595 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -65,31 +65,24 @@ M.show_message("\The [src] has been cut apart by [user] with \the [WC].", 3, "You hear cutting.", 2) qdel(src) return - if(istype(W, /obj/item/weapon/storage/fancy/crayons)) - if(W.contents.len < 6) - to_chat(user, "You must have a full box of crayons to perform this action") - return + if(istype(W, /obj/item/weapon/pen)) var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield", "Brig Physician", "Captain", - "Cargo", "Chief Engineer", "Chaplain", "Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP", - "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot", - "Prisoner", "Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology") + "Cargo", "Chief Engineer", "Chaplain", "Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP", + "HOS", "Hydroponics", "Internal Affairs Agent", "Janitor", "Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot", + "Prisoner", "Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology") if(!decalselection) return if(user.incapacitated()) - to_chat(user, "You're in no condition for the fine arts") + to_chat(user, "You're in no condition to perform this action.") return if(W != user.get_active_hand()) - to_chat(user, "You must be holding the box of crayons to perform this action.") + to_chat(user, "You must be holding the pen to perform this action.") return if(! Adjacent(user)) to_chat(user, "You have moved too far away from the cardboard box.") return - if(W.contents.len < 6) - to_chat(user, "You must have a full box of crayons to perform this action.") - return decalselection = replacetext(decalselection, " ", "_") decalselection = lowertext(decalselection) icon_opened = ("cardboard_open_"+decalselection) icon_closed = ("cardboard_"+decalselection) update_icon() // a proc declared in the closets parent file used to update opened/closed sprites on normal closets - qdel(W)