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

Fix cluster and incend OB not respecting ceiling protections #4746

Merged
merged 2 commits into from
Oct 22, 2023

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Oct 20, 2023

About the pull request

This PR makes it so incend and cluster OBs actually respect ceiling protections (not just pylon protections). HE already is respecting closed areas, so your fault for leaving the doors open.

Explain why it's good for the game

Dropships ceilings were changed fairly long ago to protect against OBs, but the implementation I guess was never tested thoroughly.

Testing Photographs and Procedure

Screenshots & Videos

incend

https://youtu.be/Fc0q9p6hmeE

Changelog

🆑 Drathek
fix: Fix incend and cluster OBs not respecting ceiling OB protections.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Oct 20, 2023
@Drulikar Drulikar linked an issue Oct 20, 2023 that may be closed by this pull request
3 tasks
@harryob harryob added this pull request to the merge queue Oct 21, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Oct 21, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Oct 21, 2023
@cm13-github
Copy link
Contributor

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

…otection

# Conflicts:
#	code/modules/cm_marines/orbital_cannon.dm
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Oct 21, 2023
@fira fira added this pull request to the merge queue Oct 22, 2023
Merged via the queue into cmss13-devs:master with commit 3971a14 Oct 22, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Oct 22, 2023
@Drulikar Drulikar deleted the Fix_OB_Ceiling_Protection branch October 22, 2023 01:42
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clsuter OB hitted somewhere it shouldn't have too
4 participants