Skip to content

Makes the SAD give quirks#235

Merged
XeonMations merged 13 commits into
Monkestation:masterfrom
Shroopy:sad-quirks
May 25, 2026
Merged

Makes the SAD give quirks#235
XeonMations merged 13 commits into
Monkestation:masterfrom
Shroopy:sad-quirks

Conversation

@Shroopy
Copy link
Copy Markdown
Contributor

@Shroopy Shroopy commented May 11, 2026

About The Pull Request

Makes the SAD give a character's quirks on use, fully restoring them. I also made ghostrole-banned quirks function correctly now, they had an overlapping flag with trauma quirks. I also made the quirks friendly and thanatorenasia use add instead of incorrectly using add_unique .

Why it's Good for the Game

Missing quirks when getting SAD'd just sucks. Being able to get your quirks back is nice. Ghostroles having quirks banned correctly is nice. Quirks correctly applying in quirk transfer scenarios is nice.

Proof of Testing

Tested on localhost by spawning a new mob, aghosting to take control, and going in the SAD.

Changelog

🆑
add: The SAD now applies character quirks.
fix: Ghostroles now have certain quirks correctly banned.
/:cl:

@XeonMations
Copy link
Copy Markdown
Collaborator

make sure it doesnt give you items though. Stuff like the lunchbox quirk.

@Shroopy
Copy link
Copy Markdown
Contributor Author

Shroopy commented May 11, 2026

What quirks other than lunchbox give items? I know of parole but that's just a prison jumpsuit which is kinda fine IMO, and honestly I don't know why parole gives a prison jumpsuit

@ParboleumLoyce
Copy link
Copy Markdown
Contributor

nearsighted/farsighted, scarred eye, pseudobulbar all come to mind as quirks that give you items.

Copy link
Copy Markdown
Collaborator

@XeonMations XeonMations left a comment

Choose a reason for hiding this comment

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

Please ensure your arguments are in the right places in the edited procs. Also, for modularization, please state what you added/removed in the edit comment.

@Shroopy Shroopy marked this pull request as draft May 11, 2026 13:23
@Shroopy
Copy link
Copy Markdown
Contributor Author

Shroopy commented May 11, 2026

Okay, it's actually working now, tested on localhost.

@Shroopy Shroopy marked this pull request as ready for review May 11, 2026 23:38
@Shroopy Shroopy requested a review from XeonMations May 11, 2026 23:38
Comment thread code/__DEFINES/~~oculis_defines/quirks.dm
Comment thread code/datums/quirks/positive_quirks/friendly.dm
Comment thread code/modules/mob/living/status_procs.dm Outdated
@Shroopy Shroopy requested a review from XeonMations May 14, 2026 13:28
@XeonMations XeonMations merged commit 1776764 into Monkestation:master May 25, 2026
47 of 51 checks passed
oculisstation-ci Bot added a commit that referenced this pull request May 25, 2026
@github-actions
Copy link
Copy Markdown
Contributor

Your Fix/Feature pull request is currently below zero (-3). Maintainers may close future Feature/Balance PRs. Fixing issues or helping to improve the codebase will raise this score.

github-actions Bot added a commit that referenced this pull request May 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants