From 8d742c94167a8ed6a053b663edcb0527ffd2d8b1 Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 15 Feb 2021 17:51:59 +0200 Subject: [PATCH] Fixes devourable vore pref check placement Now it's no longer limited to only affect reinforced grab type voring, but any type in general. --- code/modules/vore/eating/living_vr.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 6404df13cdb..db781017df9 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -105,11 +105,6 @@ ///// If user clicked on themselves if(src == G.assailant && is_vore_predator(src)) - if(!G.affecting.devourable) - to_chat(user, "They aren't able to be devoured.") - log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(G.affecting)] against their prefs ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])") - return FALSE - if(feed_grabbed_to_self(src, G.affecting)) qdel(G) return TRUE @@ -489,6 +484,11 @@ if(user_to_pred > 1 || user_to_prey > 1) return FALSE + if(!prey.devourable) + to_chat(user, "They aren't able to be devoured.") + log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(prey)] against their prefs ([prey ? ADMIN_JMP(prey) : "null"])") + return FALSE + // Prepare messages if(user == pred) //Feeding someone to yourself attempt_msg = "[pred] is attempting to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!"