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

Fix typo in med and issue related to unconsciousness #6411

Merged
merged 2 commits into from
Jun 28, 2018

Conversation

alganthe
Copy link
Contributor

When merged this pull request will:

  • Fix adenosine displayname being wrong in some medical interactions
  • Fix unconscious units waking up while being carried staying muted

For the unconscious units, turns out the global EH isn't called if the unit is being carried, and the muting / unmutting relies on it.

@dedmen
Copy link
Contributor

dedmen commented Jun 27, 2018

Ref:

["ace_unconscious", {

The EH that's not called

@PabstMirror
Copy link
Contributor

Fix #5758
I think this is an improvement, but there still might be an edge case, (not sure)

Unit is uncon and being carried
Unit wakes up and can now talk
Unit passes out again but won't be muted?

@PabstMirror PabstMirror added this to the 3.13.0 milestone Jun 27, 2018
@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Jun 27, 2018
@alganthe
Copy link
Contributor Author

alganthe commented Jun 27, 2018

The unit will be muted again because the EH is called when passing out.

I tested this fix by making an AI carry me, making myself pass and and wake up again.

@PabstMirror PabstMirror merged commit 09855f1 into acemod:master Jun 28, 2018
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.3 Jul 5, 2018
@alganthe alganthe deleted the fixMedActionTypo branch October 1, 2018 16:42
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Fix adenosine displayname being wrong in some medical interactions

* Fix unconscious units waking up while being carried staying muted
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants