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.

Sign up for GitHub

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

Jump to bottom

Grenades - use correct type for cookoff_enabled, check for AI and variable on vehicle #7634

Merged
merged 2 commits into from
Apr 19, 2020
Merged

Grenades - use correct type for cookoff_enabled, check for AI and variable on vehicle #7634

merged 2 commits into from
Apr 19, 2020

Conversation

Blutze
Copy link
Contributor

@Blutze Blutze commented Apr 13, 2020

When merged this pull request will:

  • See title.
  • Doesn't error with wrong type (setting was changed from boolean on/off to number off/players only/players and ai)
  • Checks variable on vehicle (with setting as fallback)
  • Doesn't trigger on empty or ai-only vehicles when setting is on "players only".

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Apr 13, 2020
@Blutze @mharis001
clean up negations
3fe3c01 
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
@PabstMirror PabstMirror added this to the 3.13.2 milestone Apr 19, 2020
PabstMirror
PabstMirror approved these changes Apr 19, 2020
View reviewed changes
Copy link
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested working

@PabstMirror PabstMirror changed the title Grenades: use correct type for cookoff_enabled, check for AI and variable on vehicle Grenades - use correct type for cookoff_enabled, check for AI and variable on vehicle Apr 19, 2020
@PabstMirror PabstMirror merged commit 217ccce into acemod:master Apr 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mharis001 mharis001 mharis001 left review comments

@PabstMirror PabstMirror PabstMirror approved these changes

Assignees
No one assigned
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Milestone
3.13.2
Development

Successfully merging this pull request may close these issues.
3 participants
@Blutze @PabstMirror @mharis001