From 66654ec03e8ea99789b321ef02b30ad6edb5cceb Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sun, 7 Apr 2019 16:47:30 +0200 Subject: [PATCH 1/2] Adding sizecheck to edible code While a full sized deathclaw can smack your ass down, a shrunk deathclaw shouldnt be able to, lets reflect that in code. --- code/modules/vore/eating/belly_obj_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 6ebb3a56ab..edd6ff2471 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -258,7 +258,7 @@ /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user) if(owner.stat == DEAD) return - if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U + if(!prey.isEdible && prey.size_multiplier >= 1) //CHOMPEDIT: Trying to make pred mobs prey? N O U var/mob/living/simple_animal/preydator = prey if(preydator.icon_state == preydator.icon_living) From ca1ef9672d1e0bfc87f7a6a9ab33803a607b62dd Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Sun, 7 Apr 2019 17:07:23 +0200 Subject: [PATCH 2/2] Update belly_obj_vr.dm --- code/modules/vore/eating/belly_obj_vr.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index edd6ff2471..6a45b64488 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -258,10 +258,11 @@ /obj/belly/proc/nom_mob(var/mob/prey, var/mob/user) if(owner.stat == DEAD) return - if(!prey.isEdible && prey.size_multiplier >= 1) //CHOMPEDIT: Trying to make pred mobs prey? N O U + if(!prey.isEdible) //CHOMPEDIT: Trying to make pred mobs prey? N O U var/mob/living/simple_animal/preydator = prey - if(preydator.icon_state == preydator.icon_living) + + if(preydator.icon_state == preydator.icon_living && preydator.size_multiplier >= 1) user.visible_message("\the [user] promptly gets tackled by \the [prey] for trying to break their prefs! !!") user.Weaken(5) if (preydator.will_eat(user))