From d3c2022b051d7dd52216e6e2233057357ad68ed4 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 26 Jun 2022 14:03:56 -0400 Subject: [PATCH 1/2] Merge pull request #13169 from Heroman3003/small-dropnom Fixes dropnoms with pred without bellies breaking falling --- code/modules/multiz/movement_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index 49dd8eab97..a8dde43ee9 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -43,16 +43,16 @@ var/mob/living/prey = src var/fallloc = prey.loc - if(pred.can_be_drop_pred && prey.can_be_drop_prey && pred.drop_vore && prey.drop_vore) + if(pred.vore_selected && pred.can_be_drop_pred && prey.can_be_drop_prey && pred.drop_vore && prey.drop_vore) pred.feed_grabbed_to_self_falling_nom(pred,prey) pred.loc = fallloc if(!safe_fall) pred.Weaken(8) pred.visible_message("\The [pred] falls right onto \the [prey]!") - else if(prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore) + else if(prey.vore_selected && prey.can_be_drop_pred && pred.can_be_drop_prey && pred.drop_vore && prey.drop_vore) prey.feed_grabbed_to_self_falling_nom(prey,pred) - pred.Weaken(4) - pred.visible_message("\The [pred] falls right into \the [prey]!") + prey.Weaken(4) + prey.visible_message("\The [pred] falls right into \the [prey]!") else pred.loc = prey.loc if(!safe_fall)