forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 9
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
Update. #117
Merged
Merged
Update. #117
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
add flash reaction effect
…tem. (space-wizards#32942) Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
S: Merge Conflict
Status: Merge conflicts need to be resolved.
Changes: Sprites
Changes: Might require knowledge of spriting.
Changes: Map
Changes: Might require knowledge of mapping.
labels
Oct 26, 2024
RSI Diff Bot; head commit b51a662 merging into 686f1df Resources/Textures/Ronstation/Clothing/Head/Helmets/heccdiver.rsi
Resources/Textures/Ronstation/Clothing/Neck/Cloaks/heccdiver.rsi
Resources/Textures/Ronstation/Clothing/OuterClothing/Hardsuits/heccdiver.rsi
Resources/Textures/Ronstation/Clothing/Uniforms/Jumpsuit/heccdiver.rsi
Resources/Textures/Ronstation/Objects/Devices/pda.rsi
|
github-actions
bot
removed
the
S: Merge Conflict
Status: Merge conflicts need to be resolved.
label
Oct 26, 2024
good to merge? |
@GitHubUser53123, everything looks good. Can be merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Map
Changes: Might require knowledge of mapping.
Changes: Sprites
Changes: Might require knowledge of spriting.
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.
Pull request to pull updates, due to merge conflict.