[MIRROR] Adds Affection Aversion quirk #783
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Adds Affection Aversion quirk Stops affection modules. Very simple. * I hate you, github May or may not do anything. Stop giving me a merge conflict. Stop it. * Revert "I hate you, github" This reverts commit 6515023cc3f72d97d90bbdf982857b1d2724b1cf. * Attempts to revert traits.dm Because something went TERRIBLY wrong with my fork and/or my editor and I'm not sure why. * Added quirk proper now that my fork is unfucked Why did this even happen? * These lists are alphabetized * Same here --------- Co-authored-by: Bloop <[email protected]>
Steals-The-PRs
added
Mirroring conflict
…into upstream-mirror-25194
AnywayFarus
added a commit
that referenced
this pull request
Nov 24, 2023
Iajret
pushed a commit
that referenced
this pull request
Feb 5, 2024
* health assembly altclick sanity (#81264) ## About The Pull Request checks can_interact now ## Why It's Good For The Game bug bad ## Changelog :cl: fix: you may not toggle health assemblies from any range, even while crit /:cl: * health assembly altclick sanity --------- Co-authored-by: jimmyl <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR: Skyrat-SS13/Skyrat-tg#25194
About The Pull Request
Adds the Affection Aversion quirk. Its sole purpose is to stop the affection module from working on anyone with said quirk.
How This Contributes To The Skyrat Roleplay Experience
Gives players the option to disable affection modules from affecting them. Yes. You're welcome.
Proof of Testing
Screenshots/Videos
Changelog
🆑 Danny Boy
add: Added Affection Aversion quirk which stops affection modules
/:cl: