From b635a7d95ff599ef2ed176a9f0507c859852b4c9 Mon Sep 17 00:00:00 2001 From: Miniature Date: Mon, 19 Mar 2012 11:28:07 +1030 Subject: [PATCH 1/3] More custom items, first two for Fniff, last one for Asanadas. --- code/modules/customitems/item_defines.dm | 17 +++++++++++++++++ icons/mob/eyes.dmi | Bin 6516 -> 6848 bytes icons/obj/custom_items.dmi | Bin 852 -> 2749 bytes 3 files changed, 17 insertions(+) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 465c70d2037..f1639460d1e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -17,3 +17,20 @@ 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" + icon_state = "meson_specs" \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index b269d173cd113243ed262be89d01f2fa740e4adf..51d9aeb6c46adda3aad01b49b45992cb30a08843 100644 GIT binary patch literal 6848 zcmb7IXFwENvTm{>NKill$#9*xGE)KoK&_#!Yybd6 zq2Oh8jvUm~hF3wr2SF@LK^~^F>kYRHI5xJ>R*MxR20rgq~^j#XyEH}N@+g2W)CJHQocjfIpW!|aYf*_UB(hL zAGA(eri%_?(i0UC; zT{bf*_$8mNWma+Ra&|(xNS~R&gR@Wv&+ZvM&na2Pk_+L+s)>{qy2K$S>ty!gKeQX~ zW*Iyk=?qOmj?4P@g|X6Ic8=z}EMgKngb&MfOElL?#0NuXF$cS%Nso3hk7l>c*i;NP=H zD;tb!Af~lIwZ=(fmGj9eCw(+kjPHEUMux&S4CWS2@y>u}KD81Q6tsPP5i9lR$D;6} z{Erou?ZKl%sV`qXZDqU|LM|&0PU$E2W8#Mrk4b9>yZ86s935P!x}4bxEj}rbx-5Ibev9)WZqmwzY3afaC5ZXY3&JPqxQ~bmJ{&%B)6q3`3tZ+Bx8#YK_dC#r_ z4egAsE%J#IZ_CfCf0eW!UYe(+4Wzpm>52flb6j2PF^U{?z|ZbZ={jidk`9{d6u#J;&^-ZC^1M zOzmn>d7+%??Y`jD%%=zHmOhEwED=IsYzaK{#YRV`w>g`Z#>}z_vMZarW%CfY?!l zkwvPuqoqS+(~})6$9%rW>~60RDKJ;_ER)=3 z@VRjRyw4q$kOZwuzc5p688Oh8-)U**!n<6Wg0%+HZOY}J#{htwUBG;EioN6=iH#6j zI2kE;p#5$>y@IsEgC-oYyKqi`82G7>KTu;JMJL~|&OLDs=&+7tzZs9$nt^*vc6EI( zx!^1J?zFb(O3Vfkxb#iJ?O&|_pSw(%fHl6+TG3&~z2UY~vZH6@O$hA_`Jklp5oY2+ z$HnKNvlT5oHsB#|%#Tl~DvY?G%&5kdgK~S_t-Uq;PVC9A&G$G;yMcJ;mBExH28JAq z6YE9I83IUH_-oKF&_PFjI0pIJts3CTxL&8-O!)Tg+oJnrRJ#!CsWS^i&oZ1t;6{K#)=CKOlIO~?8XC?2%LH6B7uU|o zmhue#RhQP(H3YxSB7XMBV4Ps`D@`71Ty#ltY!;}v+^h1-O{aER_l=B}HfLJViz_Q} z&0BkGBRO#q*!``Moc1X7d-sx7@DjHrW$Wwf1(iDDP#q2W4zJfXKPU}kZ?I!GS+jmF zh+ex5*o3W(NTqwOunjnL*kWV=;Opvi6GgVZgO=)$=Whh4s`=M=#dcv`PNhwoj4oRF zO_aK$qvK$R5zEKUV~WiCl@Dy?LzYswh_Xt0(*VEaukwP&=*N!L518Kb(_H&C=E~T# zd!x1rgKJ6*O`!MWCv#m8p1%iBv1W3q!RJc)#AW*Cq_h7dp4i3*7%= zc~gtel6?Xiq3HH-T3;A6*&}>7Ly2B4V}jMGpumU%NoY^Ou*2Lbso@I{@9Gcv{=&H- z1w!BWtw$b^yOo8TrABZ6TJi^aT_q$WRFw;xnkILvn^B{qSD@>prjI{ds*9sQ3f~~H zI^NSMuGl0aSYj|c;OjxktPh@JJ0N^|dV160Vwm9&X4!ArZ?(m4hnk6ZYrSYEIfgvB zZ_m%(7D!HM5^B4WBz)qEPZ?ve){$~rp>c@kw)x1dDX1kp5k`Y4p zaJ$w`tnqhOVNI^Bm0R0n-NRpM#2zc?o144pW=V5y`%SNVBI<|BFGT7nSuf~gy8O&S z@cZ{^dM2*KMR@vVeDpo|9D(5L8z|CR9D8^0J^*?sC_2N%#Wa(_<34zH^a6ROoS5(* zkjvyKaPv{hTy~gd@35=kix48{0YG1Wn?06!ZCTJa6LofS0r`nP{mNDaC6J(%+kr;2 z|JIN=SrupXbGOU4!9?1(sw^v*Uo#9r~wzSNB%4$E+-l`Vs7u?h- zdT|D~0Y^b=cWX9{JnIFf|?1~~w z;IkiV>xV{A)A?uoapCL|Nj=kX847eUsxeXO#%aArRl#(0qI%|+S57rLf3UxAkFywoshR1q}u;$E|mbfWpqYGh!v+cjc89W&{-?|KpdC7>$UfbIUIgQ{}6DCst zhuMNNCL+8_UE+cSt_=rq)ec2PO`lckiMs-U;_y6JTi{5K$EHab_I{qBnrC~3Knm^5iFS(Chp~uG zJJ8YlKsD&(qxm7O` zE?vc@pxxVp0-T-8R~9TxO&tx!2>b&i4>2rK7RS7-7Ths0=>Goxo>8U20rF<2vFp1> zH>#6gB31P)Ux1qr{MiE~pQqIaV|h{_`aV=4Z*3nnNF8zCos~6t$Ji2+5Qz4%4E8Wb zbuDb?dw&IcdeG<|IdYjxV8&O|7wt)Cxc@EA=yQn1L=_x2tT@%0pViU=p~Mt4tiQ>I zWk(!0l&t^uyABpxURfzIh)-H{M)MbCY09BCxFN)VzST$KgwhL?W8-R0q(J;aMn*=~ zY(d=ig6Ru{GxqNL$~pwr6g%-Ktys)&FjL<#nPnBgBC><^^z_pZ^mBzf=Nb%NN{ z*i2}>ysn_Ujm+mOZ!wCGjg1voR}a1UfK|h*^CZ^lHZNH?fvMkoNpthm;jj{z(1Szx zni^0N;fqaQ$wz9QJQ~T8@yu8cSdVmrGEL3(OBa?e7~^gBA^XeVfTSyt$2tB(0qRvL z@3G!G!ZFTb(o&ZnTyuAy72Rtgu*E97VkpX6=kDEv&8hl+jW*X7VJPUy#rZW)S7mTb z7vEG!)TWuOyj0X-p`a)_88dcHa>w0m0nyh*Xj0CpV&v9AIgQk1r&kCBPK=z}`3OHP z9z6*of(Z`()$G`bIIp%=tbAn?<})H`PxqV`W2SSRxC8W>kgbUti3VJ#F6f)~4E85-p|hdO(!zgPmI1bazK!$dj*!?2k=_+&DTtFu;^7vjTvXG(!OB z*u#H?lZr6|0lzl4Hw&07w~nk35FXMt7G#wVoPhTXGXC&JrRUcK zZ+GV}?Jj?TPozLN5li3lDd0NISvZ?@%5kW0#57~lm5rYJd(^j3&8N{(jc`SGxj-(D z5kzrBt;djyVgRs>nDtrgX6lv+He-_wG#Rfl-&o^t!89A;Ymi+gLzz-~1Xb47s(#B; zr?_gbW@Y6pT;YDc;y4ruG05|vYnK{o0*(7=>==~x}<|M zjrrmEMsJ?}LZ=~pCTsI;@AdaD1*%2%PSrO|)vjv?7L5pT^(&j4$&IsFu0@$KZ;)a) zX1m*QH1?@cAL?7aO+PVq9k#7jH13F~f=YqB5_oNOW4|77ZC6O4xA2vw>gr1k(Ybt@eEeI=u;~xC~ z@mB@tV2Up7Bw~44e6dG_6p&kClkLi+86U7&$Ymq~wt{fz$FE+y`Vti}Mn%1KZ9t#n zAqH{+R{Qw7Cu=%=SoGH;X&5xqJae&2ztdG?Bcqto;QPAd zQfo0=Z)x-_lT8s=gI%Q7a&wj7_3Me|Ej}`R2-kz95-=9szAbqXVhTlyx9pGTVW|3K>GU)Ds=OK#&xV6<;oX`oJa9s_VOfPQAm+|jME+z6vd z0i?%|tpMP|n4oMhO%EH96{{E<;Et`@^A11x=FEO%dJ*tYMUq$@6Sx!Vylw%I95*42{>lKSXx;_r(U$3gwiUAg}&CAJ zkjZ3172uov@~vC9?B)j6(uT6`;C7HPERk-Ay1GL#wv?0vV*iu7sGE&< z7g>y+@*g!|+g!E-sOsX5`tAh@>!r)7P}(hra1-<=i_KNhJ!d<|xpHF%JDaA)hlJ1+ zv&oCv-`jhem`Kl$*|JVZ0S)rDu|kfN6nHEBSD23_F$aD0TXmktU@av><_^H|vAU@M z`8lnW!@}263e_uNa7EZq+>+wC5^h@Mw~fV8`Q5(2yI~K{0w+mU(}F>_hiVeN12<5( zp@TMul?x`7^xE?UA$?c`kLUrnX=<|_g*bP^?(8Ees8tKKfRTv!?Boud-vyD7C`?4_ zyAURKN_LGcWK`masbRv6L^E4%%>HyOYzyti%?nl;^eKyAlqUjYZ$5$1>++%!tSyT) zR+$TA{dIMQWo2d3tfa6M@JGWvmOgj5;u<-qK%+B#{8QeS;nG3`_%~HKw~&qfN!itd z3-I^%f3wkC{5_#4$I>?sY>?jOBO@d4c9aae&wT2oUqtA$ag219R|MJaVF8rb>RkDnOFTj#id%d2Z^qO8QkBHwJ#)ExofMq;P& zJh`8&s8@jJ(SW`pj$yz`ugv=F9Qj2eqCcx6?w`5d*0A*qH3Bnd0MJm;RjyLBdj4N_ Cm|5)r literal 6516 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 PIiRC?Lj$L7_u#((QYo@? diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index c38ced0696c892ff93f770bb66094d13831a92b3..f5364924b63778423c6aabed023de63f458b6896 100644 GIT binary patch literal 2749 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 Dbp}o= literal 852 zcmV-a1FQUrP)kSsa~$%R zHTS)J^|5FFq)6~oHvh~sjg5_&nVD*8Y9u5iC@3iZ+;QLE-}w0WHa0f=#f$(m|HZ|{ zF)=avm<25@Ei-2S5fKqSK0bbaerrAs+yDS7Dk`D?019KL8UO$Q0d!JMQvg8b*k%9# z0E2o|Sad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1wKPRy$Gu}{%i!&v&s2C`0$i<@pkX|-$Cuq}YqkDHtM9a4Z@$nH zz=mYxf-@yY$>29ioAr1!izG>7+$&tke4V=V4O3Cglhm$EQEj^?oT-r z0w@tcp0!N?#1B{=!1$fG6JR0#+{CJ?Ypky8y4r>SRSFHOROmn$Sb_$CxqL$WLzsI| zYV*_R5?jEGxi?0I4ysxO*`4z|r+_56(?Y zOaUFtA@*%JK1WkP2dDk%lycw!1B4j!%$T$8Xk!2n8k}LG2MXp0Jz#taF#w1K}Rjob)itQiJIC2c} zIJ&>ixv&TDIDcpr0f0J=ZzF^l_VEEMM1TugZ?elT)&KNb&%ACq7c!Cpc Date: Mon, 19 Mar 2012 11:37:42 +1030 Subject: [PATCH 2/3] Oh, THAT's how that works. --- code/modules/customitems/item_defines.dm | 3 +-- icons/mob/eyes.dmi | Bin 6848 -> 6854 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index f1639460d1e..faaa9c311bb 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -32,5 +32,4 @@ 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" - icon_state = "meson_specs" \ No newline at end of file + icon_state = "book_berner_1" \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 51d9aeb6c46adda3aad01b49b45992cb30a08843..25233d4b08a6962cc15b8808e0846035496cf253 100644 GIT binary patch delta 395 zcmV;60d)SrHO4iNB!6#uR9JLGWpiV4X>fFDZ*Bkpc$}4#O>V+45JuO@DMqlZswV9= zn+jC1fGb2M8Dh7N9eJEq+`bD!3y8=cOH0qs^W&K%y{|tuJ6dfw`8NkK-cdzw&o6oQ zW7?>xqSrFdG@DMx(?Oz&OcgCUt3+7psEu3XS!;q&MQ?d_2!E<)p^A$8aQROc_h}g& zragmcWzXW%zPjWYRn^`0W_VMRR2$m= zE%U5ptBzDr@qcuCWyU;rX9^149MIB0_61&DxUgxZW@V$+WBOzNkwC)SjKRbsqP<|@ zL4=18X$=(Q=%Dz9F$_R>Ck$S=rXQ?wG2QkX9_YRqByy_n>;uwTN! prZ=684vqYZo|P|Yy<5?0yUBk6k;i;v6%NfC000>hNwb>)B^i)>zls0= delta 395 zcmV;60d)SxHNZ8HB!6joR9JLGWpiV4X>fFDZ*Bkpc$}4#!EVAZ42I9`Q&@1FrqOZj zWdcn-z$;W)Ynn`HQpM>e-hKxP14NadW27&i9Xs}tKDM9Lo;JHG|KT9UJ1S}Y`j%(E zrj43PdN1-!v*~m^9VDvARMMieN`$43+PFoYwI&Faw9d0bP=7rOm9%;c7ytC?F)gFR zv}Z7_>{)!;*Ryz6%fO9bEExEtOv6!g=#@>zo;V=7iX04JJcDWFmo=_Ec-tnO7ZS+R zJKtEY5$(hlxA2UZk36W@Xso2(HI|=1(+{)i;6s;oPFz~pJvVpH4W2Wdj*q29p0#Y% zkxE*<++Ue7&wt&Sl0vrzv@noefmatUY+9*V*{JoH{@521crZ6(F!6|JuUL2x;UPp? z10^{+D8FG01CZVcgBPyp2di96xBZR>x^D)F9BTAm-SO!F-|U2)Xw?GtYZ%z{rjya3 pncvW}@+EEe8`|uu{0~6%dvSKPUPk}`84^iEK~#90?X#x=9~u6?!HfU^ From ddc9798af9c38e6a822cc75f431e27fd894dac7e Mon Sep 17 00:00:00 2001 From: Miniature Date: Mon, 19 Mar 2012 21:43:55 +1030 Subject: [PATCH 3/3] Made disposals not kill people's ears mk2 --- code/modules/recycling/disposal.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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)