From 9f5b54940c21d2e24e58d4bc4cae4a775b95962e Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 5 Aug 2019 21:31:17 -0400 Subject: [PATCH] adds in a memento mori check --- .../modules/mob/living/simple_animal/guardian/guardian.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 12cb81bccb..ba516046cb 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -59,8 +59,12 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians . = ..() /mob/living/simple_animal/hostile/guardian/CtrlClickOn(atom/A) - return - + var/mob/living/carbon/C = A + if((iscarbon(C)) && (istype(C.wear_neck, /obj/item/clothing/neck/necklace/memento_mori))) + return + else + . = ..() + /mob/living/simple_animal/hostile/guardian/med_hud_set_health() if(summoner) var/image/holder = hud_list[HEALTH_HUD]