Port some more fixes and tweaks #751
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When using `e` to examine an adjacent tile, the existence of monsters (hostile, friendly, or neutral) was not indicated in any way. Change `e` to print "There is a zombie" or "There is a cow" for example, when such a creature is in the examined space. (cherry picked from commit 7b4a4e44f13fe6692190543f46978ab75575d00b)
Actual requested item is knife_spear_superior not knife_spear. fixes #41560 (cherry picked from commit 67d661f11854666651c4cfdf5e26eb97b1534a46)
(cherry picked from commits 6c950dd08b88bb356f860abed748d54210ce5dc7 and e41b749771f41dcac1f7fa6c14840549ed21694b)
(Tweaked error message a bit - olanti-p) (cherry picked from commit 0eead1fa582cf6897ed60dd6d21023c0ba7b373f)
Add activity_actor::can_resume_with_internal (cherry picked from commit 6f77ec7)
1. Fix incorrectly resuming interrupted vehicle activity when a different vehicle activity is initiated 2. Fix incorrect om terrain id (cherry picked from commit 37dadeed5476a1fee3c7272c87639af973751c85)
(cherry picked from commit 74ad6d03f7b650ee6f2ad7d532685a3d445ca1e3)
(cherry picked from commit 6303c7614f637d9b17fbf92721eecad8d09626c3)
Allows performing cleanup when Character::cancel_activity() is called. (cherry picked from commit ae6b7ac)
olanti-p
force-pushed
the
port-fixes-aug6
branch
from
c78f3af to
01ce54a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PRs being ported:
CleverRaven/Cataclysm-DDA#46432
CleverRaven/Cataclysm-DDA#41714
CleverRaven/Cataclysm-DDA#46600 + CleverRaven/Cataclysm-DDA#46627
CleverRaven/Cataclysm-DDA#49906
CleverRaven/Cataclysm-DDA#40126 (mainly for
can_resume_with, and to cut down on future conflicts)CleverRaven/Cataclysm-DDA#43987 (except the fix for pockets UI)
CleverRaven/Cataclysm-DDA#46777
CleverRaven/Cataclysm-DDA#50437
CleverRaven/Cataclysm-DDA#40683