Skip to content
This repository has been archived by the owner on Dec 5, 2020. It is now read-only.

Critter Resist #55

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

Critter Resist #55

wants to merge 2 commits into from

Conversation

phyvo1
Copy link

@phyvo1 phyvo1 commented Mar 9, 2020

Adds a resist button for critters so that when they are grabbed or set on fire they can resist out of it. Importantly I generalized the resist proc a bit. The grab and resist handling are now in living.dm, then the human.dm proc handles breaking shackles and cuffs. I have tested the changes and everything is functional.

Adds a resist button for critters so that when they are grabbed or set on fire they can resist out of it.
@phyvo1
Copy link
Author

phyvo1 commented Mar 11, 2020

Resolved the conflict with the master by deleting the now redundant burning/grabbing resist code in human.dm

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant