diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 465c70d2037..faaa9c311bb 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -17,3 +17,19 @@ for(var/mob/O in viewers(user, null)) O.show_message(text("[] shows you: \icon[] [].", user, src, src.name), 1) src.add_fingerprint(user) + +/obj/item/fluff/sarah_calvera_1 + name = "Old Photo" + desc = "Looks like it was made on a really old, cheap camera. Low quality. The camera shows a young hispanic looking girl with red hair wearing a white dress is standing in front of an old looking wall. On the back there is a note in black marker that reads \"Sara, Siempre pensé que eras tan linda con ese vestido. Tu hermano, Carlos.\"" + icon_state = "sarah_calvera_1" + +/obj/item/fluff/angelo_wilkerson_1 + name = "Fancy Watch" + desc = "An old and expensive pocket watch. Engraved on the bottom is \"Odium est Source De Dolor\". On the back, there is an engraving that does not match the bottom and looks more recent. \"Angelo, If you find this, you shall never see me again. Please, for your sake, go anywhere and do anything but stay. I'm proud of you and I will always love you. Your father, Jacob Wilkerson.\" Jacob Wilkerson... Wasn't he that serial killer?" + icon_state = "angelo_wilkerson_1" + +/obj/item/clothing/glasses/meson/fluff/book_berner_1 + name = "Bespectacled Mesonic Surveyors" + desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts." + icon = 'custom_items.dmi' + icon_state = "book_berner_1" \ No newline at end of file diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 77c7e5caf3f..3b991972214 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1285,6 +1285,7 @@ var/active = 0 var/turf/target // this will be where the output objects are 'thrown' to. var/playing_sound = 0 + var/playing_buzzer = 0 New() ..() @@ -1297,7 +1298,11 @@ proc/expel(var/obj/structure/disposalholder/H) flick("outlet-open", src) - playsound(src, 'warning-buzzer.ogg', 50, 0, 0) + if(!playing_buzzer) + playing_buzzer = 1 + playsound(src, 'warning-buzzer.ogg', 50, 0, 0) + spawn(30) + playing_buzzer = 0 sleep(20) //wait until correct animation frame if(!playing_sound) diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index b269d173cd1..25233d4b08a 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index c38ced0696c..f5364924b63 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ