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

Merge pull request CleverRaven#39363 from CleverRaven/fix-typo-2020-0… #130

Merged
merged 6 commits into from
Apr 8, 2020

Conversation

fengjixuchui
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

LaVeyanFiend and others added 6 commits April 8, 2020 02:54
…flintlock) (#39188)

* Audit Colt M1861 Navy
* Audit Colt M1860 Army
* Audit flintlock musket
* Audit flintlock carbine
* Audit flintlock rifle
* Audit doublebarrel flintlock
* Audit flintlock pistol
* Re-add price_postapoc
The sound handling code could end up casting log(0) to an integer type
when there were no sounds around.  Avoid that by an early exit.
@fengjixuchui fengjixuchui merged commit 55adb24 into fengjixuchui:master Apr 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants