From 59d0a85bd4cb60d26995d48a1ede19a403f2e340 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sat, 7 Dec 2024 20:11:12 -0700 Subject: [PATCH 1/2] thewariscominghome --- code/modules/religion/honorbound/honorbound_trauma.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/religion/honorbound/honorbound_trauma.dm b/code/modules/religion/honorbound/honorbound_trauma.dm index ed4ecde1592ba..a2cc70d65cf1f 100644 --- a/code/modules/religion/honorbound/honorbound_trauma.dm +++ b/code/modules/religion/honorbound/honorbound_trauma.dm @@ -135,7 +135,7 @@ var/datum/job/job = target_human.mind?.assigned_role var/is_holy = target_human.mind?.holy_role if(is_holy || (job?.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY)) - to_chat(honorbound_human, span_warning("There is nothing righteous in attacking the just.")) + to_chat(honorbound_human, span_warning("The just and fair guards? If you truly think they are not innocent, declare them guilty.")) //DOPPLER EDIT CHANGE - ORIGINAL: to_chat(honorbound_human, span_warning("There is nothing righteous in attacking the just.")) return FALSE if(job?.departments_bitflags & DEPARTMENT_BITFLAG_MEDICAL && !is_guilty) to_chat(honorbound_human, span_warning("If you truly think this healer is not innocent, declare them guilty.")) @@ -273,13 +273,13 @@ to_chat(owner, span_warning("Followers of [GLOB.deity] cannot be evil!")) return FALSE - // cannot declare security as evil + /* cannot declare security as evil //DOPPLER EDIT CHANGE - You can, but they're good on a normal basis. if(living_cast_on.mind.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY) to_chat(owner, span_warning("Members of security are uncorruptable! You cannot declare one evil!")) return FALSE return TRUE - + */ /datum/action/cooldown/spell/pointed/declare_evil/before_cast(mob/living/cast_on) . = ..() if(. & SPELL_CANCEL_CAST) From a0967b527fb1e0275e74059e150d28c58309b1c4 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Sat, 7 Dec 2024 23:10:27 -0700 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Signed-off-by: Nerevar <12636964+Nerev4r@users.noreply.github.com> --- code/modules/religion/honorbound/honorbound_trauma.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/religion/honorbound/honorbound_trauma.dm b/code/modules/religion/honorbound/honorbound_trauma.dm index a2cc70d65cf1f..bf57d4b535cd4 100644 --- a/code/modules/religion/honorbound/honorbound_trauma.dm +++ b/code/modules/religion/honorbound/honorbound_trauma.dm @@ -273,13 +273,14 @@ to_chat(owner, span_warning("Followers of [GLOB.deity] cannot be evil!")) return FALSE - /* cannot declare security as evil //DOPPLER EDIT CHANGE - You can, but they're good on a normal basis. + // cannot declare security as evil + /* //DOPPLER EDIT CHANGE START - Commented out. You can, but they're good on a normal basis. if(living_cast_on.mind.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY) to_chat(owner, span_warning("Members of security are uncorruptable! You cannot declare one evil!")) return FALSE return TRUE - */ + */ //DOPPLER EDIT CHANGE END /datum/action/cooldown/spell/pointed/declare_evil/before_cast(mob/living/cast_on) . = ..() if(. & SPELL_CANCEL_CAST)