Jsonize crafting skill penalty from mutations (CleverRaven#36565)#31

Merged

fengjixuchui merged 46 commits intofengjixuchui:masterfrom CleverRaven:master

Dec 31, 2019

+2,608-371

Commits on Dec 29, 2019

Fix box drawing characters of bitmap fonts not shown when SDL line drawing is disabled
Qrox
committed

Commits on Dec 30, 2019

Fix linking error by explicitly instantiating advanced_inv_area::i_stacked
Qrox
committed
check for never_learn before adding candidate recipes to sdcard
David Brown
committed
Use empty() method
Fris0uman
committed
Removed cooking skill requirement from makeshift pot and copper pot recipes
Night-Pryanik
committed
Sugar kin don't get thirst from food or drink
Fris0uman
committed
Sugar kins can't get sick
Fris0uman
committed
radiation is private
Fris0uman
committed
missing radiation entries
Fris0uman
committed
Sugar kins are immune to radiations
Fris0uman
committed
Sugar kin can eat honey
Fris0uman
committed
Fix flooring of house_inner_garden
John-Candlebury
committed
Add missing whitespace
ZhilkinSerg
authored
Merge pull request #36567 from Fris0uman/ammotext
ZhilkinSerg
authored
Merge pull request #36573 from John-Candlebury/house-fix
ZhilkinSerg
authored
Merge pull request #36569 from Night-Pryanik/remove-cooking-skill-req-from-crafting-makeshift-pot
ZhilkinSerg
authored
Merge pull request #36566 from davidpwbrown/sd_card_teaches_debug_fix
ZhilkinSerg
authored
Merge pull request #36555 from Qrox/template-instantiation
ZhilkinSerg
authored
Fix bathroom SUS groups (#36529 )

Matthew Taylor
authored and
ZhilkinSerg
committed
Merge pull request #36536 from Qrox/bitmap-font-box-drawing
ZhilkinSerg
authored
astyle
Fris0uman
committed
Assorted Aftershock fixes
ZhilkinSerg
committed
Assorted generic guns fixes
ZhilkinSerg
committed
Assorted blazemod fixes
ZhilkinSerg
committed
Assorted CRT expansion fixes
ZhilkinSerg
committed

Commits on Dec 31, 2019

Add city block (#36540 )

curstwist
authored and
I-am-Erk
committed
Update cooking_components.json (#36559 )

RarkGrames
authored and
I-am-Erk
committed
Carbon fiber crossbow bolts (#36552 )

RarkGrames
authored and
I-am-Erk
committed
Veteran survivor zombies (#36557 )

RarkGrames
authored and
I-am-Erk
committed
Update materials section of JSON_INFO.md (#36476 )

Jerimee
and
I-am-Erk
committed
Remove pointless check before adding to values of map.
BevapDin
committed
Iterate via map::points_on_zlevel
BevapDin
committed
Convert functionality of tinymap::fake_load into its own class.
BevapDin
committed
Fix level of indention error.
kevingranade
committed
Merge pull request #36568 from ZhilkinSerg/mod-fix-2019-12-30
kevingranade
authored
Merge pull request #36571 from Fris0uman/sweet_misc
kevingranade
authored
Fix savegame migration for Hazardous Waste Sarcophagus

ZhilkinSerg
authored and
kevingranade
committed
Update Android build parameters on Travis

ZhilkinSerg
authored and
kevingranade
committed
Slight rewrite of first intercom mission.

John-Candlebury
authored and
kevingranade
committed
Merge pull request #36582 from BevapDin/bpi
kevingranade
authored
Magiclysm - Golems (#35658 )

arijust
and
KorGgenT
committed
Options to allow previous behavior around prompt for dangerous terrain (#36037 )

Ramza13
authored and
kevingranade
committed
refactor inventory_item_menu (#36206 )

KorGgenT
authored and
kevingranade
committed
Prevent npc's jumping from ledges or running into dangerous tiles (#36475 )

Ramza13
authored and
kevingranade
committed
Extended pickup window (#36492 )

8street
authored and
kevingranade
committed
Jsonize crafting skill penalty from mutations (#36565 )

Fris0uman
authored and
kevingranade
committed