Fixes Drake vore, sound Looping

Also help intent squirms work again anything else still escapes.
This commit is contained in:
Poojawa
2018-09-16 14:13:51 -05:00
parent 90ec68f095
commit cad43a6421
7 changed files with 78 additions and 97 deletions
@@ -1,6 +1,7 @@
/mob/living/simple_animal/hostile/megafauna/dragon
vore_active = TRUE
no_vore = FALSE
isPredator = TRUE
/mob/living/simple_animal/hostile/megafauna/dragon/Initialize()
// Create and register 'stomachs'
@@ -28,7 +29,7 @@
escapechance = 25
// From above, will transfer into gullet
transferchance = 25
autotransferchance = 66
autotransferchance = 90
autotransferwait = 200
/obj/belly/megafauna/dragon/gullet
@@ -39,7 +40,7 @@
vore_sound = "Squish2"
// From above, will transfer into gut
transferchance = 25
autotransferchance = 50
autotransferchance = 90
autotransferwait = 200
/obj/belly/megafauna/dragon/gut
@@ -50,4 +51,4 @@
digest_mode = DM_DRAGON
digest_burn = 5
swallow_time = 100 // costs extra time to eat directly to here
escapechance = 0
escapechance = 0
@@ -81,10 +81,19 @@
if(. && isliving(target))
var/mob/living/L = target
if(L.stat != DEAD)
if(!client && ranged && ranged_cooldown <= world.time)
if(vore_active == TRUE && L.devourable == TRUE)
dragon_feeding(src,L)
if(L.loc == src.contents)
L = null
else if(!client && ranged && ranged_cooldown <= world.time)
OpenFire()
else
devour(L)
else if(L.stat >= SOFT_CRIT)
if(vore_active == TRUE && L.devourable == TRUE)
dragon_feeding(src,L)
if(L.loc == src.contents)
L = null
else
devour(L)
/mob/living/simple_animal/hostile/megafauna/proc/devour(mob/living/L)
if(!L)
@@ -18,7 +18,7 @@
// Release belly contents beforey being gc'd!
/mob/living/simple_animal/Destroy()
release_vore_contents()
release_vore_contents(silent = TRUE)
prey_excludes.Cut()
. = ..()
@@ -54,7 +54,7 @@
*/
/mob/living/simple_animal/death()
release_vore_contents()
release_vore_contents(silent = TRUE)
. = ..()
// Simple animals have only one belly. This creates it (if it isn't already set up)