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.

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

Makes tinfoil hats prevent artifact hallucinations #16499

Merged
merged 2 commits into from Oct 17, 2023

Conversation

itchybones
Copy link
Contributor

[SCIENCE][FEATURE][CLOTHING]

About the PR

This PR makes #16411's madness artifact's hallucination effect ignore people with tinfoil hats.

Why's this needed?

I believe this to be a neat gimmick, and another use for the tinfoil hats, that, as of now, only block weak martian psyblasts.
This PR also adds a potential counter to the hallucinations, although I don't think the hats can be aquired without having
the conspirator trait.

Changelog

(u)Chasu
(+)Tinfoil hats now block artifact hallucinations.

@keywordlabeler keywordlabeler bot added A-Clothing Deals with clothing of whatever sort A-Science Deals with Artifacts, Telescience, or the department C-Feature A new feature or enhancements to existing features labels Oct 16, 2023
@github-actions github-actions bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 16, 2023
Copy link
Contributor

@amylizzle amylizzle left a comment

Choose a reason for hiding this comment

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

Love the idea, but recommend a tweak to the implementation

code/obj/artifacts/artifact_machines/madness.dm Outdated Show resolved Hide resolved
Co-authored-by: Amy <3855802+amylizzle@users.noreply.github.com>
@itchybones
Copy link
Contributor Author

Thanks for the suggestion and making the code easier to understand!

@ZeWaka ZeWaka added the E-Add-To-Wiki A PR that will require changes to the wiki label Oct 17, 2023
@Tarmunora Tarmunora merged commit 811fac5 into goonstation:master Oct 17, 2023
23 checks passed
github-actions bot pushed a commit that referenced this pull request Oct 17, 2023
@Studenterhue Studenterhue removed the E-Add-To-Wiki A PR that will require changes to the wiki label Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Clothing Deals with clothing of whatever sort A-Science Deals with Artifacts, Telescience, or the department C-Feature A new feature or enhancements to existing features size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants