diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c8987cccad0..33829def3b5 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1225,4 +1225,18 @@ component_parts += V component_parts += new /obj/item/weapon/vending_refill/clothing(0) component_parts += new /obj/item/weapon/vending_refill/clothing(0) - component_parts += new /obj/item/weapon/vending_refill/clothing(0) \ No newline at end of file + component_parts += new /obj/item/weapon/vending_refill/clothing(0) + +/obj/machinery/vending/artvend + name = "ArtVend" + desc = "A vending machine for art supplies." + product_slogans = "Stop by for all your artistic needs!;Color the floors with crayons, not blood!;Don't be a starving artist, use ArtVend. ;Don't fart, do art!" + product_ads = "Just like Kindergarten!;Now with 1000% more vibrant colors!;Screwing with the janitor was never so easy!;Creativity is at the heart of every spessman." + vend_delay = 34 + icon_state = "artvend" + products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/device/camera = 4,/obj/item/device/camera_film = 6, + /obj/item/weapon/storage/photo_album = 2,/obj/item/stack/wrapping_paper = 4,/obj/item/stack/packageWrap = 4, + /obj/item/weapon/storage/fancy/crayons = 4,/obj/item/weapon/paper = 10,/obj/item/weapon/c_tube = 10, + /obj/item/weapon/pen = 5,/obj/item/weapon/pen/blue = 5,/obj/item/weapon/pen/red = 5) + contraband = list(/obj/item/toy/crayon/mime = 1,/obj/item/toy/crayon/rainbow = 1) + premium = list(/obj/item/weapon/contraband/poster = 5) \ No newline at end of file diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 6a6ffdc2d55..d9dcfd5cfc6 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -26,11 +26,13 @@ /obj/item/weapon/pen/blue + name = "blue-ink pen" desc = "It's a normal blue ink pen." icon_state = "pen_blue" colour = "blue" /obj/item/weapon/pen/red + name = "red-ink pen" desc = "It's a normal red ink pen." icon_state = "pen_red" colour = "red" diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 43772939fd0..f5cd9ab48be 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -11,6 +11,7 @@ /obj/structure/bigDelivery/attack_hand(mob/user as mob) + playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) qdel(src) /obj/structure/bigDelivery/Destroy() @@ -74,7 +75,7 @@ user.put_in_hands(wrapped) else wrapped.loc = get_turf(src) - + playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1) qdel(src) diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 37ef8e659b7..85aabb43b75 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index d3a759ed95c..3368ccb5331 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ