cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 18:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #712 from Miniature/master

Browse Source 
More custom items, first two for Fniff, last one for Asanadas. Now with added not destroying ears.
This commit is contained in:
CIB
2012-03-20 05:59:46 -07:00
parent 824c0603ca ddc9798af9
commit a014b99dbc
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/customitems/item_defines.dm
View File

@@ -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<6E> 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"

7
code/modules/recycling/disposal.dm
View File

@@ -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)