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 resin doors not closing on mob/living if they are merged with weeds #4990

Merged
merged 3 commits into from
Nov 22, 2023

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Nov 21, 2023

About the pull request

This PR simply changes the mob/living check in /obj/structure/mineral_door/resin/Close() to also account for whether they are merged with the weeds. As soon as xeno corpses are also merging with weeds this will handle them too.

Explain why it's good for the game

Although I think this is a very rare situation, it can be especially confusing if a fully weeded corpse that intentionally is hard to see is causing a door to not close (seemingly arbitrarily).

Testing Photographs and Procedure

Screenshots & Videos
Untitled.mp4

Changelog

🆑 Drathek
fix: Resin doors will now close on dead mobs that are merged with weeds (currently only human).
fix: Resin doors will now restart their closing timer each open making the delay to close consistent.
code: Added a TRAIT_MERGED_WITH_WEEDS that is set whenever the mob is currently merged with weeds.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Nov 21, 2023
@Drulikar Drulikar changed the title Resin doors not close on mob/living if they are merged with the weeds Fix resin doors not closing on mob/living if they are merged with weeds Nov 21, 2023
code/modules/cm_aliens/XenoStructures.dm Outdated Show resolved Hide resolved
code/modules/cm_aliens/XenoStructures.dm Outdated Show resolved Hide resolved
@harryob harryob added this pull request to the merge queue Nov 22, 2023
Merged via the queue into cmss13-devs:master with commit c2aeb60 Nov 22, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 22, 2023
@Drulikar Drulikar deleted the Close_Doors_On_Weeded branch November 22, 2023 20:35
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.

3 participants