Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

An Extremely Small Tweak To Honorbound #279

Merged
merged 2 commits into from
Dec 8, 2024
Merged

An Extremely Small Tweak To Honorbound #279

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d0a85
thewariscominghome
Nerev4r Dec 8, 2024
a0967b5
Apply suggestions from code review
Nerev4r Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/modules/religion/honorbound/honorbound_trauma.dm
View file
Open in desktop
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
Loading