Merge pull request #10560 from Aurorablade/DemonVore

Fixes Tears and Demons
This commit is contained in:
variableundefined
2018-12-31 14:08:08 +08:00
committed by GitHub
2 changed files with 5 additions and 6 deletions
@@ -95,13 +95,12 @@
name = "pile of viscera"
desc = "A repulsive pile of guts and gore."
/mob/living/simple_animal/slaughter/death(gibbed)
/mob/living/simple_animal/slaughter/Destroy()
// Only execute the below if we successfully died
. = ..()
if(!.)
return FALSE
for(var/mob/living/M in consumed_mobs)
to_chat(world, "[M]")
release_consumed(M)
. = ..()
/mob/living/simple_animal/slaughter/proc/release_consumed(mob/living/M)
M.forceMove(get_turf(src))
+2 -2
View File
@@ -1,4 +1,4 @@
/datum/event/tear
/datum/event/tear/honk
var/obj/effect/tear/honk/HE //i could just inherit but its being finicky.
/datum/event/tear/honk/announce()
@@ -9,7 +9,7 @@
if(T)
HE = new /obj/effect/tear/honk(T.loc)
/datum/event/tear/end()
/datum/event/tear/honk/end()
if(HE)
qdel(HE)