diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index a40316ecb98..f21299d8978 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -394,12 +394,19 @@ if(!do_after(user, checktime(user, affecting), target = affecting)) return user.visible_message("[user] devours \the [affecting]!") + if(affecting.mind) + affecting.attack_log += "\[[time_stamp()]\] Has been devoured by [attacker.name] ([attacker.ckey])" + attacker.attack_log += "\[[time_stamp()]\] Devoured [affecting.name] ([affecting.ckey])" + msg_admin_attack("[key_name(attacker)] devoured [key_name(affecting)]") affecting.loc = user attacker.stomach_contents.Add(affecting) qdel(src) /obj/item/weapon/grab/proc/checkvalid(var/mob/attacker, var/mob/prey) //does all the checking for the attack proc to see if a mob can eat another with the grab + if(ishuman(attacker) && (/datum/dna/gene/basic/grant_spell/mattereater in attacker.active_genes)) // MATTER EATER CARES NOT OF YOUR FORM + return 1 + if(ishuman(attacker) && (FAT in attacker.mutations) && iscarbon(prey) && !isalien(prey)) //Fat people eating carbon mobs but not xenos return 1 diff --git a/html/changelogs/crazylemon-mateat_tweak.yml b/html/changelogs/crazylemon-mateat_tweak.yml new file mode 100644 index 00000000000..21d1b4b136d --- /dev/null +++ b/html/changelogs/crazylemon-mateat_tweak.yml @@ -0,0 +1,5 @@ +author: Crazylemon +delete-after: True +changes: + - rscadd: "Matter eater now allows you to eat humans as if you were fat." + - tweak: "Eating mobs with an aggressive grab now generates attack logs."