diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 5645ac54c3c..936b18f35c5 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -325,5 +325,5 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/proc/print_label(tag_name, tag_index) var/obj/item/shippingPackage/sp = new /obj/item/shippingPackage(get_turf(src)) sp.sortTag = tag_index - sp.desc += " The label says \"Deliver to [tag_name]\"." + sp.update_desc() print_cooldown = world.time + 600 //1 minute cooldown before you can print another label, but you can still configure the next one during this time diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 4e808c362df..4468cc6ebee 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -363,11 +363,10 @@ name = "Shipping package" desc = "A pre-labeled package for shipping an item to coworkers." icon = 'icons/obj/storage.dmi' - icon_state = "idOld" + icon_state = "shippack" var/obj/item/wrapped = null var/sortTag = 0 var/sealed = 0 - var/original_name = "Shipping package" /obj/item/shippingPackage/attackby(obj/O, mob/user, params) if(sealed) @@ -377,7 +376,7 @@ to_chat(user, "Invalid text.") return user.visible_message("[user] addresses [src] to [str].") - name = "[original_name] (RE: [str])" + name = "Shipping package (RE: [str])" return if(wrapped) to_chat(user, "[src] already contains \a [wrapped].") @@ -410,10 +409,19 @@ wrapped = null if("Seal Package") to_chat(user, "You seal [src], preparing it for delivery.") + icon_state = "shippack_sealed" sealed = 1 + update_desc() else if(alert("Do you want to tear up the package?",, "Yes", "No") == "Yes") to_chat(user, "You shred [src].") playsound(loc, 'sound/items/poster_ripped.ogg', 50, 1) user.unEquip(src) qdel(src) + +/obj/item/shippingPackage/proc/update_desc() + desc = "A pre-labeled package for shipping an item to coworkers." + if(sortTag) + desc += " The label says \"Deliver to [TAGGERLOCATIONS[sortTag]]\"." + if(!sealed) + desc += " The package is not sealed." \ No newline at end of file diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index bd09b38dcd4..76286c26373 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ