cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removing Shadow haunt, keeping sound

Browse Source 
shadow hallucination was runtiming, keeping in code for future use.
This commit is contained in:
Aurorablade
2015-11-13 18:01:43 -05:00
parent f10c43f442
commit 4f74a681cf
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/flufftext/Hallucination.dm
+7
View File
@@ -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)
code/modules/paperwork/photography.dm
+2 -6
View File
@@ -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)