-
Notifications
You must be signed in to change notification settings - Fork 193
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
Cherry Pick PR #30576 #1135
Merged
Merged
Cherry Pick PR #30576 #1135
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
This cherry-picks space-wizards/space-station-14#30576 adds cool energy bolas Signed-off-by: Ghost581 <[email protected]>
github-actions
bot
added
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: YML
Changes any yml files
Changes: Sprite
Changes any png or json in an RSI
labels
Oct 23, 2024
VMSolidus
previously requested changes
Oct 24, 2024
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Outdated
Show resolved
Hide resolved
Remuchi
requested changes
Oct 24, 2024
Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Outdated
Show resolved
Hide resolved
Signed-off-by: Ghost581 <[email protected]>
Signed-off-by: Ghost581 <[email protected]>
FoxxoTrystan
requested review from
a team,
FoxxoTrystan,
DEATHB4DEFEAT,
Peptide90,
Pspritechologist and
OldDanceJacket
and removed request for
a team
October 24, 2024 09:17
FoxxoTrystan
suggested changes
Oct 24, 2024
Co-authored-by: FoxxoTrystan <[email protected]> Signed-off-by: Ghost581 <[email protected]>
Signed-off-by: Ghost581 <[email protected]>
Remuchi
requested changes
Oct 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
build fails
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
Outdated
Show resolved
Hide resolved
Co-authored-by: Remuchi <[email protected]> Signed-off-by: Ghost581 <[email protected]>
FoxxoTrystan
approved these changes
Oct 25, 2024
Remuchi
approved these changes
Oct 25, 2024
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: C#
Changes any cs files
Changes: Localization
Changes any ftl files
Changes: Sprite
Changes any png or json in an RSI
Changes: YML
Changes any yml files
Priority: 3-Medium
Needs to be resolved at some point
Status: Needs Review
Someone please review this
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.
This cherry-picks space-wizards/space-station-14#30576
Description
adds cool energy bolas