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

Fixes users getting locked in simulation view / simulation refactor #5318

Merged
merged 9 commits into from Dec 31, 2023
Merged

Fixes users getting locked in simulation view / simulation refactor #5318

merged 9 commits into from Dec 31, 2023

Conversation

ghost
Copy link

@ghost ghost commented Dec 27, 2023

About the pull request

Initially I thought I introduced this bug, but it looks like it's existed for a few years. Fixes #4927. Also did some minor refactoring for the simulator.

Explain why it's good for the game

bug bad

Changelog

🆑
fix: fixes users getting stuck inside of the simulator
/:cl:

@ghost ghost requested a review from fira as a code owner December 27, 2023 19:41
@github-actions github-actions bot added UI deletes nanoui/html Fix Fix one bug, make ten more labels Dec 27, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 29, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 29, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@ghost ghost changed the title Fixes users getting locked in simulation view / simulation refactor. Fixes users getting locked in simulation view / simulation refactor Dec 30, 2023
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Code looks fine and can confirm the fix is working.

@Drulikar Drulikar added this pull request to the merge queue Dec 31, 2023
Merged via the queue into cmss13-devs:master with commit 4d7f548 Dec 31, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 31, 2023
@dadlips
Copy link

dadlips commented Jan 1, 2024

detonate explosive button doesn't work (it stays grayed out.)
https://streamable.com/pmm2vu

github-merge-queue bot pushed a commit that referenced this pull request Jan 6, 2024
# About the pull request

This PR is a followup to #5318 that changed a var used to determine
whether detonation is possible.

# Explain why it's good for the game

Simulator is useless without this functionality.

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


![bombs](https://github.com/cmss13-devs/cmss13/assets/76988376/f8387688-a34f-4e59-b21d-c0497e8e0cdd)

</details>


# Changelog
:cl: Drathek
fix: Fixed simulators detonation button
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

getting stuck in the demolitions simulator with two people.
3 participants