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

Fix Load Patient/Captive actions #5544

Merged
merged 5 commits into from
Sep 27, 2017
Merged

Fix Load Patient/Captive actions #5544

merged 5 commits into from
Sep 27, 2017

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Sep 22, 2017 •
edited
Loading

When merged this pull request will:

  • Disable "Load Patient" action if unit is dead but was unconscious before (we don't want loading of dead units do their weirdness) - ACE_isUnconscious flag doesn't get reset on death
  • Remove handcuffs on death to prevent ability to remove them later which causes the unit to stand up and run the ragdoll again (looks quite hilarious though)
  • Change "Load Captive" to show only if unit is not unconscious ("Load Patient" and "Load Captive" do the same thing and it's easier to notice someone is unconscious)
  • Disable "Unload Patient" action when inside a vehicle - fix Cannot unload injured from vehicle #5525 (more of a bandaid, but it makes more sense anyways)

@jonpas jonpas added kind/bug-fix Release Notes: **FIXED:** kind/enhancement Release Notes: **IMPROVED:** labels Sep 22, 2017
@jonpas jonpas added this to the 3.11.0 milestone Sep 22, 2017
@jonpas jonpas changed the title Fix patient load action Fix Load Patient/Captive actions Sep 22, 2017
@jonpas jonpas mentioned this pull request Sep 23, 2017
Closed
@jonpas
Copy link
Member Author

jonpas commented Sep 26, 2017 •
edited
Loading

Ready, need review.

PabstMirror
PabstMirror approved these changes Sep 27, 2017
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 merged commit a48db26 into master Sep 27, 2017
@PabstMirror PabstMirror deleted the fixPatientLoadAction branch September 27, 2017 20:41
PabstMirror added a commit that referenced this pull request Sep 27, 2017
@PabstMirror
Re-add #5544 changes
21d9283
@654wak654 654wak654 mentioned this pull request Sep 29, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

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

Successfully merging this pull request may close these issues.

Cannot unload injured from vehicle
2 participants
@jonpas @PabstMirror