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 15a006ecb2..36aa13a90f 100644 Binary files a/icons/obj/syndieweapons.dmi and b/icons/obj/syndieweapons.dmi differ 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