From da31e890ab7801ac5449f65b89ea4263c2b82fea Mon Sep 17 00:00:00 2001 From: TehZombehz Date: Tue, 29 Mar 2016 01:06:37 -0500 Subject: [PATCH] Changes Kor requested #1 --- .../objects/items/weapons/storage/boxes.dm | 62 ++++++++++-------- icons/obj/storage.dmi | Bin 55523 -> 55550 bytes 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3dfc9e4a502..16a492ef5ab 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -595,14 +595,20 @@ new /obj/item/ammo_casing/shotgun/beanbag(src) new /obj/item/ammo_casing/shotgun/beanbag(src) +#define NODESIGN "None" +#define NANOTRASEN "NanotrasenStandard" +#define SYNDI "SyndiSnacks" +#define HEART "Heart" +#define SMILE "SmileyFace" + /obj/item/weapon/storage/box/papersack name = "paper sack" desc = "A sack neatly crafted out of paper." - icon_state = "paperbag" - item_state = "paperbag" + icon_state = "paperbag_None" + item_state = "paperbag_None" burn_state = FLAMMABLE foldable = null - var/design = 0 /* 0 = No design, 1 = Nanotrasen Standard, 2 = Syndisnacks, 3 = Heart, 4 = Smiley Face */ + var/design = NODESIGN /obj/item/weapon/storage/box/papersack/update_icon() if(contents.len == 0) @@ -615,46 +621,46 @@ if(contents.len) user << "You can't modify this [src] with items still inside!" return - var/list/designs = list("None", "Nanotrasen Standard", "SyndiSnacks", "Heart", "Smiley Face", "Cancel") - var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[design + 1]) in designs + var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILE, "Cancel") + var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) in designs if(get_dist(usr, src) > 1) usr << "You have moved too far away!" return - design = designs.Find(switchDesign) - 1 - if(design < 5) - usr << "You make some modifications to the [src] using your pen." - switch(design) - if(0) - icon_state = "paperbag" - item_state = "paperbag" + var/choice = designs.Find(switchDesign) + if(design == designs[choice] || designs[choice] == "Cancel") + return 0 + usr << "You make some modifications to the [src] using your pen." + design = designs[choice] + icon_state = "paperbag_[design]" + item_state = "paperbag_[design]" + switch(designs[choice]) + if(NODESIGN) desc = "A sack neatly crafted out of paper." - if(1) - icon_state = "paperbag_nt" - item_state = "paperbag_nt" - desc = "A Nanotrasen standard paper lunch sack for loyal employees on the go." - if(2) - icon_state = "paperbag_syndi" - item_state = "paperbag_syndi" - desc = "The design on this paper sack is a remnant of the secrative 'SydiSnacks' program." - if(3) - icon_state = "paperbag_heart" - item_state = "paperbag_heart" + if(NANOTRASEN) + desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go." + if(SYNDI) + desc = "The design on this paper sack is a remnant of the secrative 'SyndieSnacks' program." + if(HEART) desc = "A paper sack with a heart etched onto the side." - if(4) - icon_state = "paperbag_smile" - item_state = "paperbag_smile" + if(SMILE) desc = "A paper sack with a crude smile etched onto the side." return 0 else if(W.is_sharp()) if(!contents.len) - if(item_state == "paperbag") + if(item_state == "paperbag_None") user.show_message("You cut eyeholes into the [src].", 1) new /obj/item/clothing/head/papersack(user.loc) qdel(src) return 0 - else if(item_state == "paperbag_smile") + else if(item_state == "paperbag_SmileyFace") user.show_message("You cut eyeholes into the [src] and modify the design.", 1) new /obj/item/clothing/head/papersack/smiley(user.loc) qdel(src) return 0 return ..() + +#undef NODESIGN +#undef NANOTRASEN +#undef SYNDI +#undef HEART +#undef SMILE diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 63ebd420114da7c6a96060881af0aa98634095d6..c41513cc686691cd21d13f8bebdbd35d576060cd 100644 GIT binary patch delta 1063 zcmV+?1larIu>=0G1CS$s1P6LlSad{Xb7OL8aCB*JZU6vyoTZt;a^p4(hR^X+Xm*cH zI&n7H>BX0A(l&=pJIw=lKnjvjQKU*zw$-QaA(msO_Tbm_X3u;-Nq_(dQlE=&Prp9D z6p!DZ7aNXAf-hFZ{g1bctF4r|DOSaoyTw(*QaAbSPs)_JSQVdt4B56P+kRSHl@e32 zDwd0@DpJR9zu&>IQyFr?eh&EaP*q8#o1sPqHBq>-lvpLD1d!jIPMJ`ShHBk}+EGfZ zbG z`;znxV>?8B)>2ZtZbdgFQKgTTsN!3QGUutg#Z}3U#$r`}EFZ3y52vEk)1_RxKN4Oq zub0=yHU^K`XkFNP=n(I?6iW_b6Wbw59wFFLpGm+)1ka-(y%v=0WW#Z^k$^MoK)aAw zciM#aWLv8FVXokQu0Sv29|U@p{vcTDZHQEPo>xy4m}ieAuy@ahbPt~q>0Uk~(mj1f zqiqwH&8Y)s0wVW)CAQfdsoNd;EN`S_Z-G4AgTefToZI;AcFV5h zI48qz80gF=wgWo7iM0*u9-H8r^&8;CW*`?Qb|ZR7Ol)F{8%I6NHY4sdA0qCw$`R58 zzr%VmTZwi6+Rlzka#;DCP<%|ifd2W%)1y9~bl6!}4pjx*6W_3#H2P9z(n#K%2&n4< zs@V5`-|z%LnD5aU%SNimv|bms`f5$Uj!4^Z2Z1$vEF5y!LEJ`SfWU9B>&pTA)7d`o zv=_9a;ke$vQvk0IgE1Ua6Y?7BTR1o5VBC=R;1TnV-XJd`M>zKCAqGg>Hbepr7aOTJ zApijvnR}$uXawlUo8U(5S%z}Ml5{SI4seQp_!@kGlHAbW1Mqrdg?$b#)EBM+$2Xqa zeURTBhk3^?17YIX#^6IIHUMR0h+Zz$riU}Rcf2*eMJ{^2)z8(QdX9$b^-J*j?wrtT z>q0_a*bXA{AxBE=Uo-iV;{Vdlp8j?8rM!BwE%3?XjA-_RzcEEUEl%<3=1CS$s1MGTKSad{Xb7OL8aCB*JZU6vyoSm4>a^p4($ItOoXm*cH zI&n7X^y14lnNAM7?X(Zz0VzmCO_3@|*-@XqhggZ6+JnD(vuA#Q2oPVy=j!Xzug~AB z$8XQ8J*O-&RGaGl$J^D_LF(eFP4(q&b>&!ES6=_*LWQeM^~sQb-SuR5pH^43q+D&P z_3Elg)bZ=@cQC%F40++O1pH-anyk`pXc46*2{)E9tEAKb@|)Kw6YJ4XtDDez%9(Yp z7w-{U8%enkV24RV(H&yaQ20*8qJ+|MD9G^`J|cx8CB8^N$)%bnUN`WAz!y~@Q4ODF z#_A`T!TKrsA@v@AcX-r4Z}=ZhdQr$@lF;h$)p*LzP-yjBr%>CWX;jctVLeZB;UpfY z2wm?92<$EnnMg3t(+u zlYU`rhopbCmb}~UL^mW;qif65@GV4{^VHqys%B4PwW-#B57+C5Q=#0`rChq730|+S z*Vl6!W58^*J{|(p#5=CVl84yLc1Ti22)5K067Uc)@MuV{1vPuwa~f?TpohKDK4#XP zHsL+l9ku+hRN#K8fL_Kw2Foym}&md3G)Wd-sfx?%^{+x|h!g>7G6# zql8>u4Gd3`+Sr!^64k=Ahsfh`9t97=qFxV@wZfnWdJUJlrw&(49T zv!ERfr|of10c;-zV>o3O%NCkjxH$4KZYTt>#k`|8$VOy_V_Od~K-%tNBA~h0M7@a- z2)M-DBa?;`U?O+XkJwsb(G HHU!AjMDP%S