adds in a memento mori check

2019-08-05 21:31:17 -04:00
parent e3c3742aec
commit 9f5b54940c
1 changed files with 6 additions and 2 deletions
@@ -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]