From b62ed65eab4e7ed22070eeb914124fbd6bea317c Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Mon, 12 Aug 2024 00:57:26 +0200 Subject: [PATCH] Makes in-shoe deaths count as vore death (#8747) --- code/modules/mob/death.dm | 2 +- code/modules/mob/living/carbon/human/death.dm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index 34d5e2576f..a81e23d91e 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -72,7 +72,7 @@ if(stat == DEAD) return 0 SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed) - if(src.loc && istype(loc,/obj/belly) || istype(loc,/obj/item/device/dogborg/sleeper)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs + if(src.loc && istype(loc,/obj/belly) || istype(loc,/obj/item/device/dogborg/sleeper) || istype(loc, /obj/item/clothing/shoes)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs - CHOMPEdit: Added in-shoe as well facing_dir = null if(!gibbed && deathmessage != DEATHGASP_NO_MESSAGE) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index c77acb2f77..37eb33c452 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -84,6 +84,11 @@ callHook("death", list(src, gibbed)) + // CHOMPAdd - Shoe steppy. I was going to make a hook but- It isn't much. + if(istype(loc, /obj/item/clothing/shoes)) + mind?.vore_death = TRUE + // CHOMPEdit End + if(mind) // SSgame_master.adjust_danger(gibbed ? 40 : 20) // VOREStation Edit - We don't use SSgame_master yet. for(var/mob/observer/dead/O in mob_list)