[DNM] [IDB IGNORE] [MDB IGNORE] Merging supporting commits for Cynosure. #89
Conversation
This file contains hidden or 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
MistakeNot4892
force-pushed
the
map/cynosure_support
branch
5 times, most recently
from
8df3197 to
169022e
Compare
MistakeNot4892
changed the title
MistakeNot4892
force-pushed
the
map/cynosure_support
branch
2 times, most recently
from
b2ca3da to
e743de1
Compare
MistakeNot4892
force-pushed
the
map/cynosure_support
branch
from
e743de1 to
e83f43f
Compare
Cerebulon
reviewed
Mar 21, 2025
…nto map/cynosure_support
Cerebulon
reviewed
Mar 22, 2025
| @@ -106,6 +106,7 @@ | |||
| uid = "trait_posi_brain" | |||
| synthetic_bodytype_restricted = TRUE | |||
| incompatible_with = list(/decl/trait/prosthetic_organ/brain) | |||
| uid = "trait_positronic_brain" | |||
There was a problem hiding this comment.
uid already defined a few lines above
There was a problem hiding this comment.
Is this just because it's unused/not in loadout? I had ported our corp-sec jumpsuit sprite to this item anticipating adding it to loadout/lockers etc. later, but it's also not the end of the world if we just re-add it as a distinct modpack job gear thing later.
There was a problem hiding this comment.
Unsure, looks like merge clobber possibly.
MistakeNot4892
force-pushed
the
map/cynosure_support
branch
from
11087fd to
c4370f7
Compare
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.
No description provided.