From 96bef781bf041415da40c1f3cc3130bb9a0141b3 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 7 Mar 2021 08:01:30 +1000 Subject: [PATCH] Includes the check for pickup preference in grabstep --- code/modules/vore/eating/living_vr.dm | 6 ++++++ code/modules/vore/resizing/resize_vr.dm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 30a7550115b..ab89e773cd3 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -234,6 +234,8 @@ P.show_vore_fx = src.show_vore_fx P.can_be_drop_prey = src.can_be_drop_prey P.can_be_drop_pred = src.can_be_drop_pred + P.step_mechanics_pref = src.step_mechanics_pref + P.pickup_pref = src.pickup_pref var/list/serialized = list() for(var/belly in src.vore_organs) @@ -266,6 +268,8 @@ show_vore_fx = P.show_vore_fx can_be_drop_prey = P.can_be_drop_prey can_be_drop_pred = P.can_be_drop_pred + step_mechanics_pref = P.step_mechanics_pref + pickup_pref = P.pickup_pref if(bellies) release_vore_contents(silent = TRUE) @@ -847,6 +851,8 @@ dispvoreprefs += "Healbelly permission: [permit_healbelly ? "Allowed" : "Disallowed"]
" dispvoreprefs += "Spontaneous vore prey: [can_be_drop_prey ? "Enabled" : "Disabled"]
" dispvoreprefs += "Spontaneous vore pred: [can_be_drop_pred ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Can be stepped on/over: [step_mechanics_pref ? "Allowed" : "Disallowed"]
" + dispvoreprefs += "Can be picked up: [pickup_pref ? "Allowed" : "Disallowed"]
" user << browse("Vore prefs: [src]
[dispvoreprefs]
", "window=[name]mvp;size=200x300;can_resize=0;can_minimize=0") onclose(user, "[name]") return diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 284d564e02b..074c892379c 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -310,8 +310,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 tail = pred.tail_style if(a_intent == I_GRAB) - // You can only grab prey if you have no shoes on. - if(pred.shoes) + // You can only grab prey if you have no shoes on. And both of you are cool with it. + if(pred.shoes || !(pickup_pref && tmob.pickup_pref)) message_pred = "You step down onto [prey], squishing them and forcing them down to the ground!" message_prey = "[pred] steps down and squishes you with their foot, forcing you down to the ground!" if(tail)