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

Electric Welder & Cell Component #3519

Merged
merged 15 commits into from
Dec 7, 2024

Conversation

thgvr
Copy link
Member

@thgvr thgvr commented Oct 10, 2024

About The Pull Request

Mostly port of Skyrat-SS13/Skyrat-tg#4900
Electric welder from Nova Sector

Removes the old experimental welder and replaces it with a battery-operated welding tool.
image
Sprite base by rye and finished by me
Also adds a cell component, allowing an easy way to add a functional cell to any item.

Changelog

🆑
add: Added a new electric welder - buy it from the outpost.
del: Removed experimental welder
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Oct 10, 2024
@rye-rice
Copy link
Member

STG remind me tommorw about this

@rye-rice
Copy link
Member

oh my god remind me on firday

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 24, 2024
@Sun-Soaked
Copy link
Member

I think fallcon ported the tg version of this cell component- we have it under components/melee/charged

Check it out and see if you can generalize it for use in tools

@thgvr
Copy link
Member Author

thgvr commented Nov 14, 2024

Weapons should just use this

@github-actions github-actions bot added Ruin Ruin successfully tested. and removed Merge Conflict Use Git Hooks, you're welcome. labels Nov 14, 2024
@thgvr thgvr removed the Ruin Ruin successfully tested. label Nov 14, 2024
@thgvr thgvr marked this pull request as ready for review November 14, 2024 16:54
@thgvr thgvr requested review from a team as code owners November 14, 2024 16:54
code/game/objects/items/storage/belt.dm Show resolved Hide resolved
code/game/objects/items/tools/electric_weldingtool.dm Outdated Show resolved Hide resolved
code/datums/components/cell_component.dm Show resolved Hide resolved
code/datums/components/cell_component.dm Outdated Show resolved Hide resolved
code/game/objects/items/tools/electric_weldingtool.dm Outdated Show resolved Hide resolved
@Burning02
Copy link
Contributor

Just saying this here, this PR removed the welder CE belts had, and that one jungle zombie ruin with one for some reason

@thgvr
Copy link
Member Author

thgvr commented Nov 17, 2024

will fix

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Nov 20, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Sun-Soaked
Copy link
Member

Sun-Soaked commented Nov 30, 2024

will fix

idle horror sting # 48 (warner bros media sound effect collection)

@github-actions github-actions bot added Ruin Ruin successfully tested. and removed Merge Conflict Use Git Hooks, you're welcome. labels Dec 3, 2024
@thgvr thgvr removed the Ruin Ruin successfully tested. label Dec 3, 2024
@github-actions github-actions bot added the Ruin Ruin successfully tested. label Dec 3, 2024
@Sun-Soaked Sun-Soaked dismissed MarkSuckerberg’s stale review December 7, 2024 17:55

all requested changes satisfied (I think)

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

yeag looks good

Copy link
Member

@Sun-Soaked Sun-Soaked left a comment

Choose a reason for hiding this comment

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

heart emonji

@Sun-Soaked Sun-Soaked added this pull request to the merge queue Dec 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 7, 2024
@Sun-Soaked Sun-Soaked added this pull request to the merge queue Dec 7, 2024
Merged via the queue into shiptest-ss13:master with commit bd066a3 Dec 7, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants