Skip to content
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 6 commits into from
Oct 25, 2024
Merged

Cherry Pick PR #30576 #1135

merged 6 commits into from
Oct 25, 2024

Conversation

Ghost581X
Copy link
Contributor

This cherry-picks space-wizards/space-station-14#30576

Description

adds cool energy bolas

This cherry-picks space-wizards/space-station-14#30576
adds cool energy bolas

Signed-off-by: Ghost581 <[email protected]>
@github-actions 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
Copy link
Contributor

github-actions bot commented Oct 23, 2024

RSI Diff Bot; head commit 35445b3 merging into 85a770c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Throwable/energy_bola.rsi

State Old New Status
icon Added

Edit: diff updated after 35445b3

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Oct 24, 2024
@FoxxoTrystan FoxxoTrystan requested review from a team, FoxxoTrystan, DEATHB4DEFEAT, Peptide90, Pspritechologist and OldDanceJacket and removed request for a team October 24, 2024 09:17
Content.Server/Ensnaring/EnsnareableSystem.cs Outdated Show resolved Hide resolved
Content.Server/Ensnaring/EnsnareableSystem.cs Outdated Show resolved Hide resolved
Co-authored-by: FoxxoTrystan <[email protected]>
Signed-off-by: Ghost581 <[email protected]>
@FoxxoTrystan FoxxoTrystan added the Priority: 3-Medium Needs to be resolved at some point label Oct 24, 2024
@FoxxoTrystan FoxxoTrystan self-requested a review October 24, 2024 11:48
Copy link
Contributor

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

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

build fails

Co-authored-by: Remuchi <[email protected]>
Signed-off-by: Ghost581 <[email protected]>
@FoxxoTrystan FoxxoTrystan requested a review from Remuchi October 25, 2024 11:05
@VMSolidus VMSolidus merged commit ffcbdce into Simple-Station:master Oct 25, 2024
14 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants