From 09e8cd2d95046833c25be291a0b39fa47bea400b Mon Sep 17 00:00:00 2001 From: Verkister Date: Sun, 21 Jan 2018 21:35:59 +0200 Subject: [PATCH] Couple janihound processor fixes. -Fixes ingested decal type remains becoming uncleanable. -Fixes nonhuman mobs giving human charge. (mouse overload) -Fixes janigut not swelling up when reaching the limit. --- .../mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index a235c6e16a..f9cca4d988 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -322,7 +322,7 @@ hound.sleeper_g = FALSE //Couldn't find anyone, and not cleaning - else if(!cleaning && !patient) + else if(!cleaning && !patient && !length(contents)) hound.sleeper_r = FALSE hound.sleeper_g = FALSE @@ -391,10 +391,9 @@ if(T.stat == DEAD) if(ishuman(target)) message_admins("[key_name(hound)] has digested [key_name(T)] as a dogborg. ([hound ? "JMP" : "null"])") - + src.drain(mob_energy) //Fueeeeellll to_chat(hound, "You feel your belly slowly churn around [T], breaking them down into a soft slurry to be used as power for your systems.") to_chat(T, "You feel [hound]'s belly slowly churn around your form, breaking you down into a soft slurry to be used as power for [hound]'s systems.") - src.drain(mob_energy) //Fueeeeellll var/deathsound = pick( 'sound/vore/death1.ogg', 'sound/vore/death2.ogg', @@ -448,6 +447,9 @@ items_preserved |= T else hound.cell.charge += (50 * digested) + if(istype(target,/obj/effect/decal/remains)) + qdel(target) + hound.cell.charge += 50 else items_preserved |= target