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

Barricades Multi-Weld Revert & Refactoring #5795

Merged

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Feb 23, 2024

About the pull request

This PR is a follow up to #5609 which removed a busy check from some barricades allowing multi-welding. This PR restores that setting (which is a return to normal for all but folding barricades which incorrectly allowed multi-welding before).

I have also added automatic looping to barricade welding if there is still work to be done, and it can be performed.

Explain why it's good for the game

The PR that introduced this change was not intended to be a balance change. Additionally, it's far more difficult to tune welding speeds if the quantity of barricades being welded at the same time is variable. Technically this is a nerf though because previously multi-welding folding barricades was possible.

Testing Photographs and Procedure

Screenshots & Videos
weld.mp4

After looping welding addition:

Untitled.mp4

Changelog

🆑 Drathek
add: Welding a barricade will now repeat automatically if it can still be repaired.
balance: Reverted multi-welding change to barricades: All barricades must be welded one at a time.
refactor: Refactored more barricade code.
/:cl:

@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Feb 23, 2024
@github-actions github-actions bot added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Refactor Make the code harder to read labels Feb 23, 2024
@Drulikar Drulikar added the Feature Feature coder badge label Feb 23, 2024
@harryob harryob added this pull request to the merge queue Feb 24, 2024
Merged via the queue into cmss13-devs:master with commit 4546ee0 Feb 24, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Feb 24, 2024
@Drulikar Drulikar deleted the Barricade_Refactoring_And_Weld_Nerf branch February 24, 2024 22:08
github-merge-queue bot pushed a commit that referenced this pull request Feb 26, 2024
# About the pull request

This PR is a follow up to #5795 fixing a runtime should you swap to an
empty hand during welding. This should be caught if we used
`INTERRUPT_ALL` instead of `INTERRUPT_NO_NEEDHAND` but maybe
multitasking something else like wire maybe was intended.

# Explain why it's good for the game

Fixes 

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/321a502f-c5c3-4add-9add-65652428143e)

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


https://github.com/cmss13-devs/cmss13/assets/76988376/66e29f49-3696-401f-bd6c-da12e5d3cd71

</details>


# Changelog
:cl: Drathek
fix: Fixed a runtime when swapping tools during cade welding
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Refactor Make the code harder to read
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants