From 4f74a681cf6489c5989f93a7e3daacc5627604e4 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 13 Nov 2015 18:01:43 -0500 Subject: [PATCH] Removing Shadow haunt, keeping sound shadow hallucination was runtiming, keeping in code for future use. --- code/modules/flufftext/Hallucination.dm | 7 +++++++ code/modules/paperwork/photography.dm | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index cce5b3f1aa7..c49da02d6c7 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -774,6 +774,12 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite image_icon = 'icons/mob/mob.dmi' image_state = "shadow" +/obj/effect/hallucination/simple/shadowman/New(loc,var/mob/living/carbon/T) + ..() + name = "Strange Shadow" + return + + /obj/effect/hallucination/shadow_scare var/obj/effect/hallucination/simple/shadowman/s = null @@ -788,4 +794,5 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite for(var/i = 0,i<11,i++) sleep(5) s.loc = get_step(get_turf(s),get_dir(s,shadow_direction)) + s.Show() qdel(s) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index a9ea8070ff5..c9b97bf8ccc 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -530,14 +530,10 @@ ///hauntings, like hallucinations but more spooky -/obj/item/device/camera/proc/handle_haunt(var/mob/living/carbon/H) - switch(rand(1,2)) - if(1)//just some spooky sounds.... +/obj/item/device/camera/proc/handle_haunt(mob/user as mob) var/list/creepyasssounds = list('sound/effects/ghost.ogg', 'sound/effects/ghost2.ogg', 'sound/effects/Heart Beat.ogg', 'sound/effects/screech.ogg',\ 'sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/far_noise.ogg', 'sound/hallucinations/growl1.ogg', 'sound/hallucinations/growl2.ogg',\ 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') - src << pick(creepyasssounds) - if(2) - new /obj/effect/hallucination/shadow_scare(H.loc,H) + user << pick(creepyasssounds)