From 15dbb7ff3273190b4a2fe450e9de642c9eb54b1b Mon Sep 17 00:00:00 2001 From: Sishen Date: Sat, 10 Aug 2019 07:03:45 -0400 Subject: [PATCH] Update guardian.dm --- .../living/simple_animal/guardian/guardian.dm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 24d8afb60c..581bcbd363 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/list/guardian_overlays[GUARDIAN_TOTAL_LAYERS] var/reset = 0 //if the summoner has reset the guardian already var/cooldown = 0 - var/mob/living/summoner + var/mob/living/carbon/summoner var/range = 10 //how far from the user the spirit can be var/toggle_button_type = /obj/screen/guardian/ToggleMode/Inactive //what sort of toggle button the hud uses var/datum/guardianname/namedatum = new/datum/guardianname() @@ -57,17 +57,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians setthemename(theme) . = ..() - -/mob/living/simple_animal/hostile/guardian/CtrlClickOn(atom/A) - var/mob/living/carbon/C = A - if((iscarbon(C)) && (istype(C.wear_neck, /obj/item/clothing/neck/necklace/memento_mori))) - to_chat(mind,"The memento mori repels your hands, you cannot grasp [C]!") - verbs -= /mob/living/verb/pulled - return - else - verbs += /mob/living/verb/pulled - . = ..() - + /mob/living/simple_animal/hostile/guardian/med_hud_set_health() if(summoner) var/image/holder = hud_list[HEALTH_HUD] @@ -159,6 +149,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians death(TRUE) qdel(src) snapback() + if(HAS_TRAIT(summoner, TRAIT_NODEATH) && (istype(summoner.wear_neck, /obj/item/clothing/neck/necklace/memento_mori))) + REMOVE_TRAIT(summoner, TRAIT_NODEATH, "memento_mori") + to_chat(summoner,"You feel incredibly vulnerable as the memento mori pulls your life force in one too many directions!") /mob/living/simple_animal/hostile/guardian/Stat() ..()