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

Captives - Allow disarming and blindfolding of captives in vehicles #9463

Merged

Conversation

mrschick
Copy link
Contributor

@mrschick mrschick commented Oct 4, 2023

When merged this pull request will:

  • Allow disarming of captives in vehicles, the items will then be dropped in the vehicle's inventory;
  • Allow blindfolding or removing the blindfold from captives in vehicles;

This is somewhat of a continuation of #9361.
To allow manipulating captives in vehicles I removed some isNull objectParent _captive exit conditions that check if the captives are not in any vehicle. Not sure what they were needed for and if they shouldn't be removed, but everything seems to work fine from my testing.

@LinkIsGrim LinkIsGrim added the kind/enhancement Release Notes: **IMPROVED:** label Oct 4, 2023
@LinkIsGrim LinkIsGrim added this to the 3.16.1 milestone Oct 8, 2023
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@LinkIsGrim LinkIsGrim modified the milestones: 3.16.1, 3.16.0 Oct 9, 2023
@LinkIsGrim LinkIsGrim merged commit b4c72d8 into acemod:master Oct 9, 2023
5 checks passed
@mrschick mrschick deleted the feature/captives-in-veh-improv branch October 9, 2023 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants