Merge pull request CleverRaven#36724 from ZhilkinSerg/sa-2020-01-05#41

Merged

fengjixuchui merged 24 commits intofengjixuchui:masterfrom CleverRaven:master

Jan 6, 2020

+4,082-2,713

Commits on Jan 4, 2020

Prune secret recipes from character creation display
kevingranade
authored

Commits on Jan 5, 2020

Move bronze to materials.json
anothersimulacrum
committed
Merge pull request #36699 from CleverRaven/kevingranade-fix-learned-recipe-display
Rivet-the-Zombie
authored
update houses 16-19 (#36709 )

curstwist
authored and
I-am-Erk
committed
Merge pull request #36713 from anothersimulacrum/mv-bronze
ZhilkinSerg
authored
Remove unused declarators
ZhilkinSerg
committed
Remove excessive incements
ZhilkinSerg
committed
Remove excessive empty lines
ZhilkinSerg
committed
Normalized TODO/HACK/FIXME comments
ZhilkinSerg
committed
Removed redundant empty statement
ZhilkinSerg
committed
Put comments to separate lines
ZhilkinSerg
committed
Spell-casting NPCs (#35597 )

authored and
KorGgenT
committed
update 5 more houses (#36727 )

curstwist
authored and
I-am-Erk
committed
Create canned.json (#36718 )

Maleclypse
authored and
I-am-Erk
committed
make fibrous stalk burnable (#36717 )

8ctopus
authored and
I-am-Erk
committed
Added 2 new NPCs. (#35238 )

committed
Mark royal jelly recipe secret.
kevingranade
committed
Minor fixes to godco content.
kevingranade
committed
Freeze burn does not cause insta-rot (#36644 )

1n17
authored and
kevingranade
committed
Move armor functions to Character (#36711 )

anothersimulacrum
authored and
kevingranade
committed
Fix undefined charges-max handling (#36723 )

Matthew Taylor
authored and
kevingranade
committed
retrodays+ updates (#36735 )

captnblood
authored and
I-am-Erk
committed
Mr Lapin NPC Warrener (#36287 )

Maleclypse
and
I-am-Erk
committed

Commits on Jan 6, 2020

Merge pull request #36724 from ZhilkinSerg/sa-2020-01-05
kevingranade
authored