SeanWiig/Cataclysm-DDA forked from CleverRaven/Cataclysm-DDA
Branch: master
-
add naginata to naginata recipe
SeanWiig committedMay 2, 2019 now you can craft a naginata from a wakizashi as an alternative to a katana
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
-
SeanWiig committed
Apr 24, 2019 -
SeanWiig committed
Apr 24, 2019 -
SeanWiig committed
Apr 24, 2019 -
Final tweaks to wording and profession
SeanWiig committedApr 24, 2019 -
Add japanese tailoring book and recipes
SeanWiig committedApr 24, 2019 -
SeanWiig committed
Apr 24, 2019
-
SeanWiig committed
Apr 12, 2019 -
Added urban samurai profession.
SeanWiig committedApr 12, 2019 Added urban samurai. Starts with very fancy clothes and decent early-game melee. It is unique in being the only profession to start with a weapon compatible with niten ichi-ryu.
-
SeanWiig committed
Apr 12, 2019 - added the new items to the itemgroups, with haori being treated as a rare item and the kimono is slightly less common than before, while yukata is more common. Also, geta was added to itemgroups. - Fixed some typos
-
martial arts apply to _inferior and _fake across the board
SeanWiig committedApr 12, 2019 All martial arts which applied to weapons with fake and inferior variants now apply to all fake and inferior variants. This was already the case for the halberd and halberd_fake, now it's consistent for all weapons. Also, the survivor naginata was added to sojutsu.
-
SeanWiig committed
Apr 12, 2019 - Yukata added. Yukata is similar to the kimono, but has less protection and less warmth and even less encumbrance. It is slightly more common than the kimono. Like the kimono, it has the flag FANCY. -Haori added. It is a torso and arm outer garment with the SUPER_FANCY flag and low encumbrance. It is not very protective. It is a rare item. - dress hakama added. This is an outer wear leg garment. It is not very protective. The idea is that you could wear it over a kimono or yukata (or anything else) - keikogi, karate_gi, zubon_gi, hakama_gi now have 2 defense, instead of 1, and have the STURDY flag. The idea is that martial arts wear is meant to withstand a lot of abuse and tumbling and are at least as tough and more tear-proof than jeans, which have 3? defense. keikogi and zubon_gi are now identical in terms of stats to the karate_gi, except that they're for legs or upper body only. hakama_gi now has slightly more coverage and warmth than zubon_gi, at the expense of being slightly more cumbersome. - tabi_gi and tabi_dress no longer have 10 encumbrance, which made them straight worse than socks with otherwise identical stats.
-
SeanWiig committed
Apr 12, 2019 - Added naginata_fake and naginata_inferior - Small buff to fake and inferior variants of Japanese weapons. Fake variants are still worse than a makeshift crowbar.
-
Cleanup json_blacklist (CleverRaven#29469)
* remove non-existed paths * remove already astyled paths
-
kevingranade committed
Apr 11, 2019 Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Make Clang/Tiles/Cmake build a release build (CleverRaven#29470)
kevingranade committedApr 11, 2019 * Make Clang/Tiles/Cmake build a release build
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
kevingranade committed
Apr 11, 2019 Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
Merge pull request CleverRaven#29459 from zombiethoughts/11/04/2019b
ZhilkinSerg committedApr 11, 2019 Linting blacklisted json files.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request CleverRaven#29461 from zombiethoughts/11/04/2019d
ZhilkinSerg committedApr 11, 2019 11/04/2019d
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
zombiethoughts committed
Apr 11, 2019 -
Linting blacklisted json files.
zombiethoughts committedApr 11, 2019 -
Linting blacklisted json files.
zombiethoughts committedApr 11, 2019 -
Merge pull request CleverRaven#29454 from esotericist/master
ZhilkinSerg committedApr 11, 2019 Add unbound keybinding entry which reloads without trying weapons first.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request CleverRaven#29453 from thquinn/character-prev-tab
ZhilkinSerg committedApr 11, 2019 Add PREV_TAB action to player display
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request CleverRaven#29449 from curstwist/add-bike-shop-roofs
Rivet-the-Zombie committedApr 11, 2019 Add bike shop roofs
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Add unbound keybinding entry which reloads without trying weapons first.
esotericist committedApr 11, 2019 -
Merge pull request CleverRaven#29446 from ZhilkinSerg/overmap-terrain…
kevingranade committedApr 11, 2019 …-abstract-river Used overmap terrain abstracts for river tiles
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request CleverRaven#29432 from ZhilkinSerg/refactor-unicod…
kevingranade committedApr 11, 2019 …e-symbols Refactor unicode symbols
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request CleverRaven#29429 from mlangsdorf/update_mapgen_co…
kevingranade committedApr 11, 2019 …mmune missions: move the free merchants start and end functions to JSON
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits