From 62d6876b95801b39fb0ddaa06f7a0a6a47cbf776 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Wed, 25 Apr 2012 00:50:05 +0100 Subject: [PATCH] TG: renamed "scary" to "hallucination", organization is the key to success - also switched the adminhelp notification to a cute kitten meowing as per tsaricide's request Revision: r3223 Author: LastBatt...@hotmail.com --- baystation12.dme | 2 +- code/modules/mob/transform_procs.dm | 1 + icons/obj/syndieweapons.dmi | Bin 895 -> 1037 bytes .../{scary => hallucinations}/behind_you1.ogg | Bin .../{scary => hallucinations}/behind_you2.ogg | Bin sound/{scary => hallucinations}/far_noise.ogg | Bin sound/{scary => hallucinations}/growl1.ogg | Bin sound/{scary => hallucinations}/growl2.ogg | Bin sound/{scary => hallucinations}/growl3.ogg | Bin sound/{scary => hallucinations}/i_see_you1.ogg | Bin sound/{scary => hallucinations}/i_see_you2.ogg | Bin sound/{scary => hallucinations}/im_here1.ogg | Bin sound/{scary => hallucinations}/im_here2.ogg | Bin sound/{scary => hallucinations}/look_up1.ogg | Bin sound/{scary => hallucinations}/look_up2.ogg | Bin sound/{scary => hallucinations}/over_here1.ogg | Bin sound/{scary => hallucinations}/over_here2.ogg | Bin sound/{scary => hallucinations}/over_here3.ogg | Bin .../{scary => hallucinations}/turn_around1.ogg | Bin .../{scary => hallucinations}/turn_around2.ogg | Bin .../veryfar_noise.ogg | Bin sound/{scary => hallucinations}/wail.ogg | Bin 22 files changed, 2 insertions(+), 1 deletion(-) rename sound/{scary => hallucinations}/behind_you1.ogg (100%) rename sound/{scary => hallucinations}/behind_you2.ogg (100%) rename sound/{scary => hallucinations}/far_noise.ogg (100%) rename sound/{scary => hallucinations}/growl1.ogg (100%) rename sound/{scary => hallucinations}/growl2.ogg (100%) rename sound/{scary => hallucinations}/growl3.ogg (100%) rename sound/{scary => hallucinations}/i_see_you1.ogg (100%) rename sound/{scary => hallucinations}/i_see_you2.ogg (100%) rename sound/{scary => hallucinations}/im_here1.ogg (100%) rename sound/{scary => hallucinations}/im_here2.ogg (100%) rename sound/{scary => hallucinations}/look_up1.ogg (100%) rename sound/{scary => hallucinations}/look_up2.ogg (100%) rename sound/{scary => hallucinations}/over_here1.ogg (100%) rename sound/{scary => hallucinations}/over_here2.ogg (100%) rename sound/{scary => hallucinations}/over_here3.ogg (100%) rename sound/{scary => hallucinations}/turn_around1.ogg (100%) rename sound/{scary => hallucinations}/turn_around2.ogg (100%) rename sound/{scary => hallucinations}/veryfar_noise.ogg (100%) rename sound/{scary => hallucinations}/wail.ogg (100%) diff --git a/baystation12.dme b/baystation12.dme index 64959e6b60..1162f91e05 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -200,12 +200,12 @@ #define FILE_DIR "sound/ambience" #define FILE_DIR "sound/announcer" #define FILE_DIR "sound/effects" +#define FILE_DIR "sound/hallucinations" #define FILE_DIR "sound/items" #define FILE_DIR "sound/machines" #define FILE_DIR "sound/mecha" #define FILE_DIR "sound/misc" #define FILE_DIR "sound/piano" -#define FILE_DIR "sound/scary" #define FILE_DIR "sound/voice" #define FILE_DIR "sound/weapons" // END_FILE_DIR diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 3a6ee96ea1..8b20858d69 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -8,6 +8,7 @@ update_clothing() monkeyizing = 1 canmove = 0 + stunned = 1 icon = null invisibility = 101 var/atom/movable/overlay/animation = new /atom/movable/overlay( loc ) diff --git a/icons/obj/syndieweapons.dmi b/icons/obj/syndieweapons.dmi index 15a006ecb22019d51dbdd4f82d9f447d54a42fed..36aa13a90f09dfd4040a99e31b61fecd85a75b8e 100644 GIT binary patch delta 1028 zcmV+f1pE8{28{@i7k_{V0{{R3^x%>C0000~P)t-sz`(#tN=j8#Re*qiz`(#rNJszx z0Dyo%F)=Zbkw`5qEdc)j{|^s9KtQjrUukJHOG_n>kB|Q=D}Vq1CnqN`Mk*K>7&T8Y z6%`diUp*!{AsQza&1}6_00001bW%=J06^y0W&i*Hyn0kvbbmx;b7OL8aCB*JZU6vy zoRyKm4uUWYhR@qmEO2!O+^${>#Bh*TFb%7)I3U>;iEru zqv<>vEEF2JKY!bs>6}8}ci?-w&gP9TSS{g|(baW+M0{>1Ci_V~gjm0wBnR7~`a8V= zTjRRqBf9RuG0V&B_4Ef$HjXNBn!&;V00N&$L_t(|ob8+4lAACLh53nX90+!IZ3yuG z?^)T&_9h5*s(5Lq`Xe^J*>dw**F_Hwx#R-m*orkq~4?O_2* zcU@<%*Q+k0S8xF?ZG&Z3T6aoyT@LaZBI|vBtPcaK1Gn~8*Y#~bzp-PNvTL0W&c9jD zKnGf+1IC)G9bpmLI`6eM{=NFMfc6J=513Jn24X<*-ng9vO#L@HpvF<9ufl!oUR%i3 z=?>%o)_=QafY(dR)5#80M%fg=K=ID++{0Y`Q2^cnK*1u?3jBWcY`r?}K$RBZAOI?} zb*ck^I;j2~I?;h|;0BzTUl0UA5QJkIVy{qKCyZ-pJzM9a3QOzBI=6N8@xjyoJU(m~ zo2G6)Ke0BI*3*WuzO_wr!FG+M^>j)D_Pxe0RDWrm-nW<5N#{~pmkvk=qyy)7fb{RB zbwLmWK@fzqu|^rAoGYc1`NvV^4-$c^lbG@G^wA&zxH=GYj1g5;*C}h^h`k=b)FJ&e zP4oSJM^5PU7bWx%w4Oqkrd-7CDaJajly(+*_?Ps)Kh}o<(c`>KDZAGBux@(+Mx&vB zW`D#IF!VUb`@BFC^t^7H)^V=@_2^-TwV0#FB`gtYfW>cdMGAl~r<(}9#vDD)VOc^- z4ZnjGxdi_C62Si34?O)*z`U)`0`~G({_BqfOTf`%m{S1}7Qb%T@6>yhKZwlK12iFZ zVB1~&cM!u01)P;V6V6+`AP9mW2!im7zkPke;Ml*@I&;E+^6!++n=r`!z3)-~p7mik z@b|n41IoYC{+>5sK>2st-!mr+DF06Td**}z<=<(4&zvxz{5$RMxf2GIf2aLDd%}S7 y@3g=_xK4n0Zuq{#()t30000%9<7k^*~0{{R3;-rdu00012P)t-sz`(#rNJszx0Dyo%CnqN`Mk+Be zF_Do-EiEk=7#KBAFclRQ0RI604-c=eUukJHOG_m}Up*!{AsQzaRaI4hfPlcjz)DI= z|0^qi002NhK#z})z`(%p8{Y^30004WQchC3q&PP*Cnw%OiHkEOv#1y-XvoExR+N~V3Sna^HN>tIXhlkDPGTiUSO-;K zPGV7dDsfgolz){^VGU1zLg2!dS73a)-G z;HUurAX0TXkEkdd0006UNklPe;8=z>C3>+{!~HLu|P@Y`{Cf4aJe;YG+=4? zX+FNDiiU_23_snU#0@PWZeZR||2;%c1yYpHt(nL`nv+z@{Yl)Urx%GtB9TZW`Ui5} zySMgVmc_rkO9(F2B=}`{`37Q>)R@70ABvBUe18Ry-w~%KX#>u=;66WduOXk`F{dVe zNq%YT8dmSzvZlJn{C>M7^ZUl{_au)k{2D??H6ZQ?hlD|t-x1$L8_3?Z3`hAL=KDtj z|0{dfG92Z1nD5bqh@<=t^F5jnag^V2z6TRRj`I5x`JT0b0_S&}?^zotaDK=6p0|Ml z=WchznHxAkD~ZEJB9TZW61`U_zjHb45Ar*gL!tc6 zKVu=6-%sFJ-2e6L|NY!#1CtLlARCYk$OhiM0d~HZ{4WxT{#?HSqb5eza|XgX00000 LNkvXXu0mjf*Ib|y diff --git a/sound/scary/behind_you1.ogg b/sound/hallucinations/behind_you1.ogg similarity index 100% rename from sound/scary/behind_you1.ogg rename to sound/hallucinations/behind_you1.ogg diff --git a/sound/scary/behind_you2.ogg b/sound/hallucinations/behind_you2.ogg similarity index 100% rename from sound/scary/behind_you2.ogg rename to sound/hallucinations/behind_you2.ogg diff --git a/sound/scary/far_noise.ogg b/sound/hallucinations/far_noise.ogg similarity index 100% rename from sound/scary/far_noise.ogg rename to sound/hallucinations/far_noise.ogg diff --git a/sound/scary/growl1.ogg b/sound/hallucinations/growl1.ogg similarity index 100% rename from sound/scary/growl1.ogg rename to sound/hallucinations/growl1.ogg diff --git a/sound/scary/growl2.ogg b/sound/hallucinations/growl2.ogg similarity index 100% rename from sound/scary/growl2.ogg rename to sound/hallucinations/growl2.ogg diff --git a/sound/scary/growl3.ogg b/sound/hallucinations/growl3.ogg similarity index 100% rename from sound/scary/growl3.ogg rename to sound/hallucinations/growl3.ogg diff --git a/sound/scary/i_see_you1.ogg b/sound/hallucinations/i_see_you1.ogg similarity index 100% rename from sound/scary/i_see_you1.ogg rename to sound/hallucinations/i_see_you1.ogg diff --git a/sound/scary/i_see_you2.ogg b/sound/hallucinations/i_see_you2.ogg similarity index 100% rename from sound/scary/i_see_you2.ogg rename to sound/hallucinations/i_see_you2.ogg diff --git a/sound/scary/im_here1.ogg b/sound/hallucinations/im_here1.ogg similarity index 100% rename from sound/scary/im_here1.ogg rename to sound/hallucinations/im_here1.ogg diff --git a/sound/scary/im_here2.ogg b/sound/hallucinations/im_here2.ogg similarity index 100% rename from sound/scary/im_here2.ogg rename to sound/hallucinations/im_here2.ogg diff --git a/sound/scary/look_up1.ogg b/sound/hallucinations/look_up1.ogg similarity index 100% rename from sound/scary/look_up1.ogg rename to sound/hallucinations/look_up1.ogg diff --git a/sound/scary/look_up2.ogg b/sound/hallucinations/look_up2.ogg similarity index 100% rename from sound/scary/look_up2.ogg rename to sound/hallucinations/look_up2.ogg diff --git a/sound/scary/over_here1.ogg b/sound/hallucinations/over_here1.ogg similarity index 100% rename from sound/scary/over_here1.ogg rename to sound/hallucinations/over_here1.ogg diff --git a/sound/scary/over_here2.ogg b/sound/hallucinations/over_here2.ogg similarity index 100% rename from sound/scary/over_here2.ogg rename to sound/hallucinations/over_here2.ogg diff --git a/sound/scary/over_here3.ogg b/sound/hallucinations/over_here3.ogg similarity index 100% rename from sound/scary/over_here3.ogg rename to sound/hallucinations/over_here3.ogg diff --git a/sound/scary/turn_around1.ogg b/sound/hallucinations/turn_around1.ogg similarity index 100% rename from sound/scary/turn_around1.ogg rename to sound/hallucinations/turn_around1.ogg diff --git a/sound/scary/turn_around2.ogg b/sound/hallucinations/turn_around2.ogg similarity index 100% rename from sound/scary/turn_around2.ogg rename to sound/hallucinations/turn_around2.ogg diff --git a/sound/scary/veryfar_noise.ogg b/sound/hallucinations/veryfar_noise.ogg similarity index 100% rename from sound/scary/veryfar_noise.ogg rename to sound/hallucinations/veryfar_noise.ogg diff --git a/sound/scary/wail.ogg b/sound/hallucinations/wail.ogg similarity index 100% rename from sound/scary/wail.ogg rename to sound/hallucinations/wail.ogg