From a52796b914c64e4f1a9f9e1ac61e64c070817c2f Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Sat, 4 Feb 2017 16:22:54 -0400 Subject: [PATCH 01/11] Adds boxes.dmi file which contains the cardboard box decals in addition to being the new location for the old default cardboard box sprite. --- icons/obj/Boxes.dmi | Bin 0 -> 25542 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/Boxes.dmi diff --git a/icons/obj/Boxes.dmi b/icons/obj/Boxes.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2e11b28cb03f64c2bc5fac2e8002b9b55d805cdc GIT binary patch literal 25542 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 z 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 literal 0 HcmV?d00001 From 7432e80d5119bb43ed8577a89463754fa75451f1 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Sat, 4 Feb 2017 16:25:38 -0400 Subject: [PATCH 02/11] This commit modifies cardboardbox.dm in order to have boxes pull sprites from the ew DMI file, and also to trigger the re-spriting option when open boxes are struck with a box of crayons. --- .../crates_lockers/closets/cardboardbox.dm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index e859c0348f1..7cee6eb3cc2 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -1,6 +1,7 @@ /obj/structure/closet/cardboard name = "large cardboard box" desc = "Just a box..." + icon = 'icons/obj/boxes.dmi' icon_state = "cardboard" icon_opened = "cardboard_open" icon_closed = "cardboard" @@ -43,7 +44,7 @@ /mob/living/proc/do_alert_animation(atom/A) var/image/I - I = image('icons/obj/closet.dmi', A, "cardboard_special", A.layer+1) + I = image('icons/obj/boxes.dmi', A, "cardboard_special", A.layer+1) var/list/viewing = list() for(var/mob/M in viewers(A)) if(M.client) @@ -52,7 +53,8 @@ I.alpha = 0 animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING) -/obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params) + +obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(src.opened) if(istype(W, /obj/item/weapon/weldingtool)) return @@ -62,3 +64,16 @@ for(var/mob/M in viewers(src)) 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)) /////addendum by flimflamm + var/decalselection = input("Please select a decal") in list("atmos", "bar", "barber", "blueshield", "brigphysician", "captain", + "cargo", "ce", "caplain", "chef", "chemist", "civilian", "clown", "cmo", "coroner", "detective", "engineering", "genetics", "hop", + "hos", "hydroponics", "ia", "janitor", "magistrate", "mechanic", "medical", "mime", "mining", "ntrep", "paramedic", "podpilot", + "prisoner", "rd", "security", "syndicate", "therapist", "virology", "warden", "xenobiology") + + icon_opened = addtext("cardboard_open_", decalselection) + icon_closed = addtext("cardboard_", decalselection) + update_icon() // a proc declared in the closets parent file used to update opened/closed sprites on normal closets + + return + return \ No newline at end of file From d01e4c30237742d0526efe369cd31f8d4cb03c7b Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Sat, 4 Feb 2017 21:51:18 -0400 Subject: [PATCH 03/11] readds a forward slash which was removed in error --- .../objects/structures/crates_lockers/closets/cardboardbox.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 7cee6eb3cc2..f8bc9a8907b 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -54,7 +54,7 @@ animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING) -obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params) +/obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(src.opened) if(istype(W, /obj/item/weapon/weldingtool)) return From ce75e7370d12d93bfd2725babca57e2fcb0c1cde Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Sun, 5 Feb 2017 22:49:46 -0400 Subject: [PATCH 04/11] this commit renames several sprites (in and along with de-capializing Boxes.dmi) in order to make them more suitable for display in a list (saves on lists) --- icons/obj/Boxes.dmi | Bin 25542 -> 25585 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/Boxes.dmi b/icons/obj/Boxes.dmi index 2e11b28cb03f64c2bc5fac2e8002b9b55d805cdc..3ef52c11bfbbca1dc8997bf8ea967719323e1c51 100644 GIT binary patch delta 525 zcmV+o0`mRF#{u!j0gxnr>v~jJbVOxyV{&P5bZKvH004NLrP#l28!-$9@Y(kiLb4Za z)74AiAn=g9!huKePApD;Kq+?o_8o$DYKM>BY`{N#Hcd*xJ%*ppFXy*#dOc4Uv97g* zWBBpq>vXtk94Q>b)A#9+M7K0P-}FI4!ZAEBSzIbvoK3oraeA144pFU#WB4{5R--JR zum3@6lj3nwHZ3BiWkb_^G)q*b9Sy@-7k)P#H#EuNvKB}EV3lssYO6)Lqgg)6d%YGk z3Pr!D=%|Lq;EYDDy(KY6{hXG`wh9*zM4YJYr1&3&yGBM?qB5H0f&EsZG7W(z*a5R< zI0rPG@m7EcQyZRtK7d)O4c>qtk}AH#LFCU#IY%{N$M$p20-RLVzsDy&woc7Svi5=J zp{$wqTJT@ya8ZWv&{vpT?rpB+-*{1IL;}D8%d0sqcJ>i*Tu*jHS|EMOZ61d z;Xb6)MeANS_`d0*oMd%OGGfY@O`1uUGRQMy_bjmN@6wZh${x{Fm(()E3hgtkE2;IF zHYxB#+`USsP5Us%oyR4)nrENJ*+Mp?L_Ep^uVhi+4F*;hHP^g5T&rvX%JunL= zD)<%O;TE#R)f1RnOt-nETUU0RJZ{~aup*Bvz;E`yk3WXzw^KO1o~Pd~DdYVL!kSLPDeTJ;*@N=^PfA|kHNeOqKo}T}lU(@O3yj;YGT1&_D z`{BoOxN4py9n<5l-7$GyjXeK#8A8tGZaHLs^^uP0=W=*+s`B;u z8)98r#7WzqU1Zd{l6^Ns}2kqXTXhaq5A_h`?P}ClAyx0^L@N6fxjFq}i&r+XmkiW0Z@$1tu9W zZMwi48%68>E~BXI@M;Z7B{T*Sl{OvI1GkTmWb??L#o0 Date: Sun, 5 Feb 2017 23:24:50 -0400 Subject: [PATCH 05/11] This commit adds a cancel option to the decal selection list and spruces up the names to make them more legible --- .../crates_lockers/closets/cardboardbox.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index f8bc9a8907b..21fb78c9eff 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -66,13 +66,14 @@ qdel(src) return if(istype(W, /obj/item/weapon/storage/fancy/crayons)) /////addendum by flimflamm - var/decalselection = input("Please select a decal") in list("atmos", "bar", "barber", "blueshield", "brigphysician", "captain", - "cargo", "ce", "caplain", "chef", "chemist", "civilian", "clown", "cmo", "coroner", "detective", "engineering", "genetics", "hop", - "hos", "hydroponics", "ia", "janitor", "magistrate", "mechanic", "medical", "mime", "mining", "ntrep", "paramedic", "podpilot", - "prisoner", "rd", "security", "syndicate", "therapist", "virology", "warden", "xenobiology") - - icon_opened = addtext("cardboard_open_", decalselection) - icon_closed = addtext("cardboard_", decalselection) + var/decalselection = input("Please select a decal") in list( "cancel", "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") + if(decalselection == "cancel") + return + 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 return From 25f5df4ba3e14aacdd1a97d5f6de51d3690cf3c2 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Mon, 6 Feb 2017 22:04:33 -0400 Subject: [PATCH 06/11] This commit adds adjacency check, item-still-in-hands check, now properly handles null input, and consumes the crayon box upon completion. Everything compiles, and everything works on local environment. --- .../crates_lockers/closets/cardboardbox.dm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 21fb78c9eff..f5e0bd02819 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -66,15 +66,20 @@ qdel(src) return if(istype(W, /obj/item/weapon/storage/fancy/crayons)) /////addendum by flimflamm - var/decalselection = input("Please select a decal") in list( "cancel", "atmospherics", "bartender", "barber", "blueshield", "brig_physician", "captain", + 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") - if(decalselection == "cancel") + if(!decalselection) + return + if(user.incapacitated()) + return + if(W == user.get_active_hand() & src.Adjacent(usr)) + 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) return - 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 - return - return \ No newline at end of file + return + From 6ede4c9ef8a4f789f00f411525dc94229a337c84 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Tue, 7 Feb 2017 03:22:13 -0400 Subject: [PATCH 07/11] This commit improves again the legibility of the list of decal options presented to the user, fixes a minor syntactical error involving ampersands, and deletes superfluous returns at the end of attackby proc. --- .../crates_lockers/closets/cardboardbox.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index f5e0bd02819..f6dd2b97b1a 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -65,21 +65,20 @@ 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)) /////addendum by flimflamm - 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") + if(istype(W, /obj/item/weapon/storage/fancy/crayons)) + 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") if(!decalselection) return if(user.incapacitated()) return - if(W == user.get_active_hand() & src.Adjacent(usr)) + if(W == user.get_active_hand() && Adjacent(usr)) + 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) - return - return - return From 47427c5aecdb14fb8e59c0369f73519b1490ef6e Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Wed, 8 Feb 2017 00:26:19 -0400 Subject: [PATCH 08/11] This commit adds checks to make sure the box is filled with 6 crayons (of any subtype) before the input selection window is presented, and after a choice is made (to prevent people using crayon-less boxes) --- .../crates_lockers/closets/cardboardbox.dm | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index f6dd2b97b1a..63f311d92f3 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -66,19 +66,32 @@ qdel(src) return if(istype(W, /obj/item/weapon/storage/fancy/crayons)) - 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") - if(!decalselection) - return - if(user.incapacitated()) - return - if(W == user.get_active_hand() && Adjacent(usr)) - 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) - + var/list/contents = W.contents + var/crayoncount = 0 + for(var/C in contents) + if(istype(C, /obj/item/toy/crayon)) + crayoncount += 1 + continue + if(crayoncount == 6) + 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") + if(!decalselection) + return + if(user.incapacitated()) + return + if(W == user.get_active_hand() && Adjacent(usr)) + contents = W.contents + crayoncount = 0 + for(var/C in contents) + if(istype(C, /obj/item/toy/crayon)) + crayoncount += 1 + continue + if(crayoncount == 6) + 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) From 2abbbc7a40345a80bbb116f384f68a6b63766ac2 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Wed, 8 Feb 2017 10:08:06 -0400 Subject: [PATCH 09/11] This commit removes the loop used to check contents and instead uses W.contents.len in order to compare the ccurrent number of items in the crayon box against it's max storage capacity (6) to ensure the crayon box is full. Also better usage of returns in order to preserve indentation on code and make it more readable. --- .../crates_lockers/closets/cardboardbox.dm | 56 +++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 63f311d92f3..39f2cc93789 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -66,32 +66,30 @@ qdel(src) return if(istype(W, /obj/item/weapon/storage/fancy/crayons)) - var/list/contents = W.contents - var/crayoncount = 0 - for(var/C in contents) - if(istype(C, /obj/item/toy/crayon)) - crayoncount += 1 - continue - if(crayoncount == 6) - 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") - if(!decalselection) - return - if(user.incapacitated()) - return - if(W == user.get_active_hand() && Adjacent(usr)) - contents = W.contents - crayoncount = 0 - for(var/C in contents) - if(istype(C, /obj/item/toy/crayon)) - crayoncount += 1 - continue - if(crayoncount == 6) - 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) + if(W.contents.len < 6) + to_chat(user, "You must have a full box of crayons to perform this action") + return + 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") + if(!decalselection) + return + if(user.incapacitated()) + to_chat(user, "You're in no condition for the fine arts") + return + if(W != user.get_active_hand()) + to_chat(user, "You must be holding the box of crayons 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) From c14cab9a6934de91bdefebb5b049b432b54115b2 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Wed, 8 Feb 2017 15:12:55 -0400 Subject: [PATCH 10/11] 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) From ebed2adc55dde70e1b24d31e1968eb172fc24a88 Mon Sep 17 00:00:00 2001 From: FlimFlamm Date: Thu, 9 Feb 2017 02:08:39 -0400 Subject: [PATCH 11/11] This commit updates the name of the new "cardboard_boxes.dmi" file (from boxes.dmi) to prevent future confusion with regular boxes. --- .../crates_lockers/closets/cardboardbox.dm | 4 ++-- icons/obj/{Boxes.dmi => cardboard_boxes.dmi} | Bin 2 files changed, 2 insertions(+), 2 deletions(-) rename icons/obj/{Boxes.dmi => cardboard_boxes.dmi} (100%) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index abc1496b595..89aef25f24f 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -1,7 +1,7 @@ /obj/structure/closet/cardboard name = "large cardboard box" desc = "Just a box..." - icon = 'icons/obj/boxes.dmi' + icon = 'icons/obj/cardboard_boxes.dmi' icon_state = "cardboard" icon_opened = "cardboard_open" icon_closed = "cardboard" @@ -44,7 +44,7 @@ /mob/living/proc/do_alert_animation(atom/A) var/image/I - I = image('icons/obj/boxes.dmi', A, "cardboard_special", A.layer+1) + I = image('icons/obj/cardboard_boxes.dmi', A, "cardboard_special", A.layer+1) var/list/viewing = list() for(var/mob/M in viewers(A)) if(M.client) diff --git a/icons/obj/Boxes.dmi b/icons/obj/cardboard_boxes.dmi similarity index 100% rename from icons/obj/Boxes.dmi rename to icons/obj/cardboard_boxes.dmi