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

Common/CSW - Use status effect for enableWeaponDisassembly #9413

Merged
merged 14 commits into from
Nov 23, 2023
Merged

Common/CSW - Use status effect for enableWeaponDisassembly #9413

merged 14 commits into from
Nov 23, 2023

Conversation

LinkIsGrim
Copy link
Contributor

When merged this pull request will:

Ref #9304

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@LinkIsGrim LinkIsGrim added the kind/bug-fix Release Notes: **FIXED:** label Sep 19, 2023
@LinkIsGrim LinkIsGrim mentioned this pull request Sep 19, 2023
Closed
3 tasks
LinkIsGrim and others added 5 commits September 24, 2023 15:53
@LinkIsGrim @PabstMirror
Update addons/common/functions/fnc_claim.sqf
3e7f7fb 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@LinkIsGrim @PabstMirror
Update addons/common/XEH_postInit.sqf
661fd8d 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@LinkIsGrim @PabstMirror
Update addons/common/XEH_postInit.sqf
0d0769b 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@LinkIsGrim
Update XEH_postInit.sqf
9ec9d0f
@LinkIsGrim
Merge branch 'master' into disableWeaponAssembly-statusEffect
37d5a64
johnb432
johnb432 approved these changes Nov 11, 2023
View reviewed changes
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

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

Apart from the comment, everything looks good to me. I don't have much knowledge about CSW, but the code is solid imo.

LinkIsGrim and others added 2 commits November 11, 2023 15:10
@LinkIsGrim @johnb432
Update addons/common/functions/fnc_claimSafeServer.sqf
7d83731 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@LinkIsGrim
Update fnc_claimSafeServer.sqf
681862a
@LinkIsGrim LinkIsGrim added this to the 3.16.2 milestone Nov 22, 2023
LinkIsGrim
LinkIsGrim commented Nov 22, 2023
View reviewed changes
addons/common/XEH_postInit.sqf Outdated Show resolved Hide resolved
addons/common/XEH_postInit.sqf Outdated Show resolved Hide resolved
@LinkIsGrim LinkIsGrim merged commit 3f61a41 into acemod:master Nov 23, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnb432 johnb432 johnb432 approved these changes

@PabstMirror PabstMirror Awaiting requested review from PabstMirror

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

Successfully merging this pull request may close these issues.

ace_common_fnc_claim break CSW vanilla disassembly block
3 participants
@LinkIsGrim @PabstMirror @johnb432