From e3c3742aec72785534988a2a4c9895b35d5e4e14 Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 5 Aug 2019 06:27:10 -0400 Subject: [PATCH 1/6] Update guardian.dm --- code/modules/mob/living/simple_animal/guardian/guardian.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 1a918766b6..12cb81bccb 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -58,6 +58,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians . = ..() +/mob/living/simple_animal/hostile/guardian/CtrlClickOn(atom/A) + return + /mob/living/simple_animal/hostile/guardian/med_hud_set_health() if(summoner) var/image/holder = hud_list[HEALTH_HUD] From 9f5b54940c21d2e24e58d4bc4cae4a775b95962e Mon Sep 17 00:00:00 2001 From: Sishen Date: Mon, 5 Aug 2019 21:31:17 -0400 Subject: [PATCH 2/6] 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] From 582b355224cc891d9c9e1d5b2d3d5d89fae524a9 Mon Sep 17 00:00:00 2001 From: Sishen Date: Thu, 8 Aug 2019 11:00:23 -0400 Subject: [PATCH 3/6] Update guardian.dm --- code/modules/mob/living/simple_animal/guardian/guardian.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index ba516046cb..6d9a25b1ec 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -61,6 +61,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /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(user,"The memento mori repels your hands, you cannot grasp [C]!") return else . = ..() From 1fc69a13a4b2910492530d54a5a838df13fb9e14 Mon Sep 17 00:00:00 2001 From: Sishen Date: Thu, 8 Aug 2019 22:02:12 -0400 Subject: [PATCH 4/6] okay fixed --- code/modules/mob/living/simple_animal/guardian/guardian.dm | 6 ++++-- 1 file changed, 4 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 6d9a25b1ec..24d8afb60c 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -61,11 +61,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians /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(user,"The memento mori repels your hands, you cannot grasp [C]!") + 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] From 15dbb7ff3273190b4a2fe450e9de642c9eb54b1b Mon Sep 17 00:00:00 2001 From: Sishen Date: Sat, 10 Aug 2019 07:03:45 -0400 Subject: [PATCH 5/6] 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() ..() From 51011ccf974a5f52005cd436fb7a451b017ecc04 Mon Sep 17 00:00:00 2001 From: Sishen Date: Sat, 10 Aug 2019 07:05:53 -0400 Subject: [PATCH 6/6] Update guardian.dm --- code/modules/mob/living/simple_animal/guardian/guardian.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 581bcbd363..73274dcfaf 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians setthemename(theme) . = ..() - + /mob/living/simple_animal/hostile/guardian/med_hud_set_health() if(summoner) var/image/holder = hud_list[HEALTH_HUD]