diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm index 549a4e2c728..fe93264aca9 100644 --- a/code/modules/mob/living/simple_animal/slime/death.dm +++ b/code/modules/mob/living/simple_animal/slime/death.dm @@ -33,3 +33,10 @@ /mob/living/simple_animal/slime/gib() death(1) qdel(src) + + +/mob/living/simple_animal/slime/Destroy() + for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines) + if(src in X.stored_slimes) + X.stored_slimes -= src + return ..() \ No newline at end of file diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 994e10658aa..29c7ad87ed9 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -121,6 +121,8 @@ if(X.stored_slimes.len >= X.max_slimes) break if(!S.ckey) + if(S.buckled) + S.Feedstop(silent=1) S.visible_message("[S] vanishes in a flash of light!") S.loc = X X.stored_slimes += S @@ -138,7 +140,7 @@ var/obj/machinery/computer/camera_advanced/xenobio/X = target if(cameranet.checkTurfVis(remote_eye.loc)) - if(X.monkeys > 0) + if(X.monkeys >= 1) var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc) food.LAssailant = C X.monkeys --