Skip to content

Pestran alcoholism+ Pestran acolyte buff#6814

Open
Gatsby229 wants to merge 40 commits into
Monkestation:mainfrom
Gatsby229:alcoholism
Open

Pestran alcoholism+ Pestran acolyte buff#6814
Gatsby229 wants to merge 40 commits into
Monkestation:mainfrom
Gatsby229:alcoholism

Conversation

@Gatsby229

@Gatsby229 Gatsby229 commented Jun 20, 2026

Copy link
Copy Markdown

About The Pull Request

Makes the pestran amulet a flask holding 15 units, because alcoholism.
To satiate pestran acolytes constant need for tools, they get a new version of orison called pestras fang. Pestras fang can generate pure ethanol like regular orison generates holy water, and can do ok at cutting and cauterizing wounds. It is the best tool in the game at extracting lux. Also removes attach body part, because who genuinely uses it, its a bloat spell.

Why It's Good For The Game

The pestran flask is there mainly for flavor, since pestrans are described to be alcoholics, helps immerse people more into the lore. The fang is meant to keep the members of the church from having to beg the clinic or make tools of their own from sticks. Also removes bloat.

Changelog

🆑
add: Made pestran amulet a flask.
add: Added pestras fang, pestran acolyte multi tool.
/:cl:

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@github-actions github-actions Bot added Feature adds a new thing and removed Feature adds a new thing labels Jun 20, 2026
@github-actions github-actions Bot added the Mapping You changed a map file, thank you for your tiles. May require additional approval. label Jun 20, 2026
@github-actions github-actions Bot requested a review from Draggeru June 20, 2026 16:02
@Gatsby229

Copy link
Copy Markdown
Author

Ready for review

Comment thread code/datums/faith/devotion_subtypes.dm Outdated
CLERIC_T1 = /datum/action/cooldown/spell/diagnose/holy,
CLERIC_T2 = /datum/action/cooldown/spell/attach_bodypart,
CLERIC_T3 = /datum/action/cooldown/spell/cure_rot,
CLERIC_T4 = /obj/item/melee/touch_attack/orison/pestra,

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a spell

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved by sacrificing attach bodypart

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can have more than one spell in there

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like attach body part is such a bloat spell, theres no reason to keep it. You can do the exact same htign without the spell as a pestran acolyte, before you even get the spell.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It fully heals the limb and organs

spillable = TRUE
update_appearance(UPDATE_OVERLAYS)

/obj/item/reagent_containers/glass/bottle/pestra

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reagent containers can transfer to and from normal items, I would rather you reimplement drinking on a "fake" bottle cross subtype than turn the cross into a bottle

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes applied

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not what I meant, do not change it to a reagent container

@Gatsby229

Copy link
Copy Markdown
Author

Issues resolved.

@CheffieGithub

Copy link
Copy Markdown
Collaborator

Unresolved, re-read

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Mapping You changed a map file, thank you for your tiles. May require additional approval.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants