From dd4c80d8204ce2d6528dd86d554d4c9551fd2944 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 28 Aug 2023 21:49:49 +0200 Subject: [PATCH] Gluttony Tweaks (#17158) --- code/_onclick/item_attack.dm | 2 +- code/modules/mob/mob_grab.dm | 2 +- html/changelogs/geeves-gluttony_tweaks.yml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-gluttony_tweaks.yml diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index ffe48989abb..b12f32ab3ba 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -56,7 +56,7 @@ avoid code duplication. This includes items that may sometimes act as a standard return I.attack(src, user, selected_zone) /mob/living/carbon/human/attackby(obj/item/I, mob/user) - if(user == src && zone_sel?.selecting == BP_MOUTH && can_devour(I, silent = TRUE)) + if(user == src && user.a_intent == I_GRAB && zone_sel?.selecting == BP_MOUTH && can_devour(I, silent = TRUE)) var/obj/item/blocked = src.check_mouth_coverage() if(blocked) to_chat(user, SPAN_WARNING("\The [blocked] is in the way!")) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 13f828fd2de..bca31281ccf 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -385,7 +385,7 @@ hair_pull(affecting, assailant) //clicking on yourself while grabbing them - if(M == assailant && state >= GRAB_AGGRESSIVE) + if(M == assailant && assailant.a_intent == I_GRAB && state >= GRAB_AGGRESSIVE) devour(affecting, assailant) /obj/item/grab/dropped() diff --git a/html/changelogs/geeves-gluttony_tweaks.yml b/html/changelogs/geeves-gluttony_tweaks.yml new file mode 100644 index 00000000000..15475d26867 --- /dev/null +++ b/html/changelogs/geeves-gluttony_tweaks.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Gluttonous mobs must now be on grab intent to devour items and creatures." \ No newline at end of file