Migrate cough #35263
Merged
Migrate cough #35263
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
This reverts commit ed491ea.
Co-Authored-By: anothersimulacrum <[email protected]>
This reverts commit 88637aa.
…clysm-DDA into broken_limb_debuffs
… of item on arm break if it can't be wielded anymore
…s and reduce damage dealt as well
…clysm-DDA into broken_limb_debuffs
This reverts commit 98e88b3.
This reverts commit daa7960.
…d decided to still allow martial arts/normal attack damage while on the ground
Fix some more typos and delete some extra spaces
The helper function get_item_location() did not support items being in vehicles. This commit corrects that oversight.
* finish reorganizing furniture.json * remove duplicats, add coat rack
…ter to Character (CleverRaven#34761) * change scope of crossed_threshold() * moved crossed_threshold to character.cpp * change parameter of test_crossing_threshold to Character * change "p" to "guy"
* Migrate move mode and related code from player - Hoist the move_mode variable up to character since NPCs should crouch and run someday - Drop UI-related code down to avatar - Serialize/deserialize move_mode in the character functions - Tweak related code to accomadate the changes * Migrate get_overlay_ids() to Character This fixes compilation of SDL builds
…rol unit (CleverRaven#34202) * Added turret control unit * Made it craftable (autolearn) * Added corresponding vehicle part * Added flag to bitflags set * Added documentation * Forcibly set turrets' targeting mode to manual if no turret control unit is present on turret's tile on loading save * Allow changing turrets' targeting mode only if turret control unit is present Also reworded targeting mode options a bit to reduce confusing. Also removed a check for MANUAL flag as there is no items or vehicle parts with this flag. Also reworded reason of why you can't aim automatic turrets and added a missing period. * Turret controls must be installed on a turret Also, on removing turret controls forcibly set targeting mode of affected turret to manual. * Set turret control unit's state equal to turret's targeting mode * Increased control unit power draw * Added a requirement for laptop computer Also inreased craft time to 2 hours. * Added mechanics skill req for crafting TCU Also increased its power consumption from 100W to 250W.
Condense melee weapons into one file
…en#34653) * Triples the number of wands Introduces Channel Wands and Disposable Wands. * removed channel wands * Update enchanted_wands.json
Get latest
anothersimulacrum
suggested changes
Nov 2, 2019
Sorry about that. Separating them now |
KorGgenT
added
[C++]
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.
Summary
SUMMARY: Infrastructure "Migrates cough from player to character"
Purpose of change
Part of #34721 Migrates cough from player to character
Adds debug feature to give character the flu
Describe the solution
I moved the code from player to character
Describe alternatives you've considered
Testing
Additional context