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

Change pull metal weapon mattack to cancel reload activity #36260

Merged
merged 1 commit into from Dec 19, 2019
Merged

Change pull metal weapon mattack to cancel reload activity #36260

merged 1 commit into from Dec 19, 2019

Conversation

ghost
Copy link

@ghost ghost commented Dec 19, 2019

Summary

SUMMARY: Bugfixes "Change pull metal weapon mattack to cancel reload activity"

Purpose of change

Fixes #36136

Describe the solution

Added check for activity type after weapon pulled succesfully, if its reload activity, then cancel it, to avoid debugmsg
also noticed that the valid weapons check didnt look for hardsteel material type, ive added that.

Describe alternatives you've considered

N/A

Testing

spawned zombie technician , reloaded while they approached, they pulled the weapon out my hands while reloading, no debugmsg popped up, after this change.

Additional context

N/A

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` labels Dec 19, 2019
@ZhilkinSerg ZhilkinSerg merged commit 5727c2c into CleverRaven:master Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code`
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Having your gun pulled out of your hands mid-reload throws an error
1 participant