From 6507e46e1e78be93f761f07d9c14fa4bbdef87fe Mon Sep 17 00:00:00 2001 From: TheLeopold Date: Tue, 18 Apr 2023 19:51:48 +0800 Subject: [PATCH 1/4] i will call it escape --- .../modules/core_implant/cruciform/rituals/base.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/modules/core_implant/cruciform/rituals/base.dm b/code/modules/core_implant/cruciform/rituals/base.dm index 1fcf08c8382..ea307ead989 100644 --- a/code/modules/core_implant/cruciform/rituals/base.dm +++ b/code/modules/core_implant/cruciform/rituals/base.dm @@ -380,3 +380,17 @@ else fail("Deprivation does not work upon the living.", user, C) return FALSE + +/datum/ritual/cruciform/base/escape + name = "Escape" //Probably need a better name + phrase = "Excedere mundum a tergo et ascendere in caelum" + desc = "This litany will command your cruciform to detach, killing in the process. Others will be able to use it in scanner for Resurrection." + ignore_stuttering = TRUE + +/datum/ritual/cruciform/base/escape/perform(mob/living/carbon/human/user, obj/item/implant/core_implant/C) + user.adjustBruteLoss(15, BRUTE, BP_CHEST) + user.adjustOxyLoss(200) + user.custom_pain("You feel the cruciform ripping out of your chest!",1) + C.name = "[user]'s Cruciform" + C.uninstall() + return TRUE From 8e2c0180b9aa8bc8306bd66b4b61489906ad5d31 Mon Sep 17 00:00:00 2001 From: Leopold <62264115+TheLeopold@users.noreply.github.com> Date: Wed, 19 Apr 2023 18:13:33 +0000 Subject: [PATCH 2/4] Update code/modules/core_implant/cruciform/rituals/base.dm Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> --- code/modules/core_implant/cruciform/rituals/base.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/core_implant/cruciform/rituals/base.dm b/code/modules/core_implant/cruciform/rituals/base.dm index ea307ead989..3252f2e4829 100644 --- a/code/modules/core_implant/cruciform/rituals/base.dm +++ b/code/modules/core_implant/cruciform/rituals/base.dm @@ -384,7 +384,7 @@ /datum/ritual/cruciform/base/escape name = "Escape" //Probably need a better name phrase = "Excedere mundum a tergo et ascendere in caelum" - desc = "This litany will command your cruciform to detach, killing in the process. Others will be able to use it in scanner for Resurrection." + desc = "This litany will command your cruciform to detach, killing you in the process. Others will be able to use it in scanner for Resurrection." ignore_stuttering = TRUE /datum/ritual/cruciform/base/escape/perform(mob/living/carbon/human/user, obj/item/implant/core_implant/C) From fb84f2923adf69351b4fcf4a0fe5005165548ae2 Mon Sep 17 00:00:00 2001 From: Leopold <62264115+TheLeopold@users.noreply.github.com> Date: Fri, 21 Apr 2023 12:39:07 +0000 Subject: [PATCH 3/4] Update code/modules/core_implant/cruciform/rituals/base.dm Co-authored-by: TheShown911 <61743710+TheShown911@users.noreply.github.com> --- code/modules/core_implant/cruciform/rituals/base.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/core_implant/cruciform/rituals/base.dm b/code/modules/core_implant/cruciform/rituals/base.dm index 3252f2e4829..a57d8e8dc74 100644 --- a/code/modules/core_implant/cruciform/rituals/base.dm +++ b/code/modules/core_implant/cruciform/rituals/base.dm @@ -382,8 +382,8 @@ return FALSE /datum/ritual/cruciform/base/escape - name = "Escape" //Probably need a better name - phrase = "Excedere mundum a tergo et ascendere in caelum" + name = "Slumber" + phrase = "Dormis, cucumi" desc = "This litany will command your cruciform to detach, killing you in the process. Others will be able to use it in scanner for Resurrection." ignore_stuttering = TRUE From 59b1ca76bb7201dbbb47c6fc0a4a1c0faab8023c Mon Sep 17 00:00:00 2001 From: TheLeopold Date: Fri, 21 Apr 2023 21:01:18 +0800 Subject: [PATCH 4/4] Revert "Update code/modules/core_implant/cruciform/rituals/base.dm" This reverts commit fb84f2923adf69351b4fcf4a0fe5005165548ae2. --- code/modules/core_implant/cruciform/rituals/base.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/core_implant/cruciform/rituals/base.dm b/code/modules/core_implant/cruciform/rituals/base.dm index a57d8e8dc74..3252f2e4829 100644 --- a/code/modules/core_implant/cruciform/rituals/base.dm +++ b/code/modules/core_implant/cruciform/rituals/base.dm @@ -382,8 +382,8 @@ return FALSE /datum/ritual/cruciform/base/escape - name = "Slumber" - phrase = "Dormis, cucumi" + name = "Escape" //Probably need a better name + phrase = "Excedere mundum a tergo et ascendere in caelum" desc = "This litany will command your cruciform to detach, killing you in the process. Others will be able to use it in scanner for Resurrection." ignore_stuttering = TRUE