From c2d294ac748e26f5a7517b30106776268ed11473 Mon Sep 17 00:00:00 2001
From: Abbie Fland <34605836+AbbieFland@users.noreply.github.com>
Date: Wed, 17 Jan 2018 16:42:27 +0000
Subject: [PATCH] Prevent stalls in dogborg self-clean cycle
When something unexpected (such as mice, which are neither humans nor
items) is in a scrubpup's garbage compactor, it could stall forever when
performing a self-clean. This changes it to treat anything it doesn't
know how to digest as an indigestible item, treating it like other
indigestible items such as ID cards.
This also changes the self-clean damage ticks to harm anything living,
rather than just human.
---
.../silicon/robot/dogborg/dog_sleeper_vr.dm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 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 c7629ee0f8..a235c6e16a 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
@@ -372,7 +372,7 @@
if(air_master.current_cycle%3==1 && length(touchable_items))
//Burn all the mobs or add them to the exclusion list
- for(var/mob/living/carbon/human/T in (touchable_items))
+ for(var/mob/living/T in (touchable_items))
if((T.status_flags & GODMODE) || !T.digestable)
src.items_preserved += T
else
@@ -384,12 +384,14 @@
var/atom/target = pick(touchable_items)
//Handle the target being a mob
- if(ishuman(target))
- var/mob/living/carbon/human/T = target
+ if(isliving(target))
+ var/mob/living/T = target
//Mob is now dead
- if(T.stat & DEAD)
- message_admins("[key_name(hound)] has digested [key_name(T)] as a dogborg. ([hound ? "JMP" : "null"])")
+ if(T.stat == DEAD)
+ if(ishuman(target))
+ message_admins("[key_name(hound)] has digested [key_name(T)] as a dogborg. ([hound ? "JMP" : "null"])")
+
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
@@ -432,7 +434,7 @@
if(UI_open == TRUE)
sleeperUI(hound)
- //Handle the target being anything but a /mob/living/carbon/human
+ //Handle the target being anything but a /mob/living
else
var/obj/item/T = target
if(istype(T))
@@ -446,6 +448,8 @@
items_preserved |= T
else
hound.cell.charge += (50 * digested)
+ else
+ items_preserved |= target
if(UI_open == TRUE)
src.update_patient()