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 the equipment attach point being on the wrong plane #5475

Merged
merged 1 commit into from
Jan 18, 2024

Conversation

Vicacrov
Copy link
Contributor

@Vicacrov Vicacrov commented Jan 16, 2024

About the pull request

Currently, the equipment attach points (the ones on the Alamo and the Normandy) are on the basic atom layer, -6. This causes certain effects, such as hive clusters or egg morphers layer below it (that are on FLOOR_PLANE, -7).

See the images for a before and after.

Explain why it's good for the game

No weird layering. Hive clusters are now visible when placed on the same tile as attach points.

Testing Photographs and Procedure

Screenshots & Videos

Before:

image

After:

image

Changelog

🆑
fix: Special xeno structures no longer layer below the Alamo and Normandy's equipment attach points.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Jan 16, 2024
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

oh, yeah. shouldn't be on that one regardless because of ambient occlusion, good catch

@harryob harryob added this pull request to the merge queue Jan 18, 2024
Merged via the queue into cmss13-devs:master with commit ce2cf7a Jan 18, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Jan 18, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jan 20, 2024
# About the pull request

Fixes #5494 that I broke with #5475

sorry

# Explain why it's good for the game

You can attach engines/weapons to the dropships again _and_ not have
xeno structures layer below the floor attach points.

# Testing Photographs and Procedure

1. Attach various equipment to the dropships
2. See if they show up
3. Spawn xeno structures on the floor attach points

see screenshots below

<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/49321394/0d7344f2-0e38-4955-b8c2-3394dd1eb197)


![image](https://github.com/cmss13-devs/cmss13/assets/49321394/2a8dc816-58db-478b-825d-81b78efaf80d)


![image](https://github.com/cmss13-devs/cmss13/assets/49321394/e45e6d91-2b74-4e83-9457-9d90501bcad7)


![image](https://github.com/cmss13-devs/cmss13/assets/49321394/7f4e4ddf-a509-49f6-90fb-6d3009905334)

</details>


# Changelog
:cl:
fix: Fixes engine/weapon attach points layering below the dropship
walls.
/:cl:
@Vicacrov Vicacrov deleted the attachpoint_plane branch March 6, 2024 09:49
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.

2 participants