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

Removes devour, replaces it with haul. #2737 Revival #8442

Open
wants to merge 23 commits into
base: master
Choose a base branch
from

Conversation

casperr04
Copy link

@casperr04 casperr04 commented Feb 10, 2025

About the pull request

Replaces xeno devour with hauling, while keeping it as mechanically close as possible to the previous mechanic. Also removes stomach_contents from code

Also Fixes #8382

Explain why it's good for the game

I was told devour isn't lore accurate. I don't think xenomorphs ever actually swallowed hosts whole like pythons in the movies, although I actually never watched any of them so I couldn't tell you. Also there's the other obvious reason

While hauling functions basically the same as devour (host won't take damage from external sources while hauled, etc), the damage taken by the xenomorph while a host is trying to break out of the haul might be lower or higher than with devour, as it used to be a 30% chance of dealing damage to xenomorph when trying to move inside of them, whereas now you will just hit the xenomorph with your weapon with a regular melee attack cooldown. I tried to adjust the damage accordingly, but it may need to be raised or lowered in testing.

Breaking out of the haul now works the same and deals the same damage like previous devour

Credit towards Molto for the original PR this works off on, as well as Kugamo which I was told by Molto that he helped a lot with the original PR.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.
image

2025-02-10.20-24-15.mp4

Changelog

🆑 Mikrel0712, Molto, Kugamo
add: Replaced xenomorph devour with hauling.
/:cl:

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 10, 2025
@cm13-github
Copy link
Contributor

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

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Feb 10, 2025
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 10, 2025
@cm13-github
Copy link
Contributor

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

@squidqueen
Copy link

video isn't loading for me, is it like dragging them by their throat like in dark decent?

@thwompa
Copy link
Contributor

thwompa commented Feb 10, 2025

movielike

@hry-gh hry-gh added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Feb 11, 2025
cm13-github added a commit that referenced this pull request Feb 11, 2025
@DangerRevolution
Copy link

DangerRevolution commented Feb 12, 2025

Previously, regurgitating a Marine triggered all eggs & morphers & traps in the area (and then they'd leap after their cooldown) but "dropped" Marines don't trigger eggs or morphers until they move a tile.

also you can punch yourself to try kill yourself when grabbed

cm13-github added a commit that referenced this pull request Feb 12, 2025
@DangerRevolution
Copy link

DangerRevolution commented Feb 12, 2025

Previously, regurgitating a Marine triggered all eggs & morphers & traps in the area (and then they'd leap after their cooldown) but "dropped" Marines don't trigger eggs or morphers until they move a tile.

also you can punch yourself to try kill yourself when grabbed

Devour

2025-02-12.19-30-46.mp4

Dragging

2025-02-12.19-54-12.mp4

cm13-github added a commit that referenced this pull request Feb 13, 2025
@cm13-github
Copy link
Contributor

Test Merge Updated

Details
Server Instance

CM13 Live

Revision

Origin: 536df7e
Pull Request: 1219b9d
Server: c5d381f

Comment

GitHub Deployments

@cm13-github
Copy link
Contributor

Test Merge Updated

Details
Server Instance

CM13 Live

Revision

Origin: 8fde04e
Pull Request: 1219b9d
Server: 46172eeae6604a1c4fa7d0c121070780ea0cca41

Comment

@zzzmike

This comment was marked as outdated.

@zzzmike
Copy link
Contributor

zzzmike commented Feb 14, 2025

after the update, now it seems like if you click a knife in your mask slot you'll immediately drop the knife, and if you click your boots to check if you have a knife and there's no knife there, it'll immediately drop your boots. also using a/d with a weapon in hand doesn't give any message in chat about hitting the xeno so I assume that isn't working. also the click method lets you hit things nearby like weeds/bushes

cm13-github added a commit that referenced this pull request Feb 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
Status: Awaiting Review
Development

Successfully merging this pull request may close these issues.

Keybind shortcuts still go through when you are devoured.
8 participants