shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13669 from Arturlang/sacrifice_tweaks

Browse Source 
Makes cult sacrifice not permakill people anymore.
This commit is contained in:
silicons
2020-11-11 11:16:15 -07:00
committed by GitHub
parent 0b6d2f8982 8ce058a593
commit 0001a2edca
16 changed files with 93 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/halloween/halloween.dm
+8 -8
View File
@@ -86,7 +86,7 @@
else if(trapped == HOWLING_GHOST)
visible_message("<span class='userdanger'><font size='5'>[pick("OooOOooooOOOoOoOOooooOOOOO", "BooOOooOooooOOOO", "BOO!", "WoOOoOoooOooo")]</font></span>")
playsound(loc, 'sound/spookoween/ghosty_wind.ogg', 300, 1)
new /mob/living/simple_animal/shade/howling_ghost(loc)
new /mob/living/simple_animal/hostile/construct/shade/howling_ghost(loc)
trapped = 0
else if(trapped == SCARY_BATS)
@@ -123,7 +123,7 @@
//Spookoween Ghost//
////////////////////
/mob/living/simple_animal/shade/howling_ghost
/mob/living/simple_animal/hostile/construct/shade/howling_ghost
name = "ghost"
real_name = "ghost"
icon = 'icons/mob/mob.dmi'
@@ -137,13 +137,13 @@
layer = 4
var/timer = 0
/mob/living/simple_animal/shade/howling_ghost/Initialize()
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/Initialize()
. = ..()
icon_state = pick("ghost","ghostian","ghostian2","ghostking","ghost1","ghost2")
icon_living = icon_state
timer = rand(1,15)
/mob/living/simple_animal/shade/howling_ghost/Life()
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/Life()
..()
timer--
if(prob(20))
@@ -152,16 +152,16 @@
spooky_ghosty()
timer = rand(1,15)
/mob/living/simple_animal/shade/howling_ghost/proc/EtherealMove(direction)
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/proc/EtherealMove(direction)
forceMove(get_step(src, direction))
setDir(direction)
/mob/living/simple_animal/shade/howling_ghost/proc/roam()
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/proc/roam()
if(prob(80))
var/direction = pick(NORTH,SOUTH,EAST,WEST,NORTHEAST,NORTHWEST,SOUTHEAST,SOUTHWEST)
EtherealMove(direction)
/mob/living/simple_animal/shade/howling_ghost/proc/spooky_ghosty()
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/proc/spooky_ghosty()
if(prob(20)) //haunt
playsound(loc, pick('sound/spookoween/ghosty_wind.ogg','sound/spookoween/ghost_whisper.ogg','sound/spookoween/chain_rattling.ogg'), 300, 1)
if(prob(10)) //flickers
@@ -175,7 +175,7 @@
step(I,direction)
return
/mob/living/simple_animal/shade/howling_ghost/CanPass(atom/movable/mover, turf/target)
/mob/living/simple_animal/hostile/construct/shade/howling_ghost/CanPass(atom/movable/mover, turf/target)
return 1
///////////////////////////