Skip to content

Commit

Permalink
Merge pull request DopplerShift13#279 from Nerev4r/rattlingclankingdo…
Browse files Browse the repository at this point in the history
…wntheroad

An Extremely Small Tweak To Honorbound
  • Loading branch information
Paxilmaniac authored Dec 8, 2024
2 parents e7c21bb + a0967b5 commit 6682653
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions code/modules/religion/honorbound/honorbound_trauma.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 <b>just</b>."))
to_chat(honorbound_human, span_warning("The <b>just</b> and fair guards? If you truly think they are not <b>innocent</b>, declare them guilty.")) //DOPPLER EDIT CHANGE - ORIGINAL: to_chat(honorbound_human, span_warning("There is nothing righteous in attacking the <b>just</b>."))
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 <b>innocent</b>, declare them guilty."))
Expand Down Expand Up @@ -274,12 +274,13 @@
return FALSE

// 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)
Expand Down

0 comments on commit 6682653

Please sign in to comment.