Code

Catchup to CleverRaven#10

Code

Merged

Maleclypse merged 112 commits intoMaleclypse:masterMaleclypse/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardJan 6, 2020

+100,681-47,366

Commits

Commits on Dec 18, 2019

• Leech-pod-monster family

  John-Candlebury

  committed
  46c9ac1

• Fix typo

  John-Candlebury

  committed
  5fd024a

• Apply suggestions from code review

  Show description for 86b3fa6
  

  3 peopleauthored
  86b3fa6

Commits on Dec 19, 2019

• Follow through suggestions

  John-Candlebury

  committed
  ffb5507

• Reword alien frond description

  John-Candlebury

  committed
  3fcc65b

Commits on Dec 20, 2019

• Correct monattack logic

  John-Candlebury

  committed
  adb9e66

• Finalize leech pod monster family

  John-Candlebury

  committed
  df0f9ba

Commits on Dec 31, 2019

• Allow folding turret mount

  

  ymber

  committed
  86a0823

• Use a slightly more accurate lunar month

  Show description for 514fedc
  jbytheway

  committed
  514fedc

• Factor out the real and default season lengths

  Show description for 2569a21
  jbytheway

  committed
  2569a21

• Simplify some arithmetic.

  jbytheway

  committed
  4075247

• Add a test for the lunar cycle code.

  jbytheway

  committed
  fd88a62

• Be more permissive in season length assertion

  Show description for 346a794
  jbytheway

  committed
  346a794

• Ensure moon phase doesn't change at night

  Show description for 31bae0e
  jbytheway

  committed
  31bae0e

• Suppress clang-tidy warning

  Show description for 9080d34
  jbytheway

  committed
  9080d34

Commits on Jan 1, 2020

• Update tools.json

  RarkGrames

  committed
  66130a0

Commits on Jan 2, 2020

• Detect and warn about crafting with rotten food

  Show description for 142fdfe
  jbytheway

  committed
  142fdfe

• Merge pull request #36622 from RarkGrames/Tools_general-item-group-tweak

  Show description for a77b8b8
  Rivet-the-Zombie

  authored
  a77b8b8

• Leech pod monster family (#35921)

  Show description for 1b3b2db
  

  3 peopleauthored
  1b3b2db

• Jsonize autodoc couch (#36200)

  

  Fris0uman

  authored and

  kevingranade

  committed
  a85a02a

• Aftershock errors to be fixed (#36425)

  

  Maleclypse

  authored and

  kevingranade

  committed
  efa31be

• Fix extended pickup window (#36593)

  

  8street

  authored and

  kevingranade

  committed
  d2e8c25

• Merge pull request #36549 from jbytheway/non_synchronous_moon_phases

  Show description for 0918b4e
  kevingranade

  authored
  0918b4e

• Add items, update military pilot drops (#36558)

  

  Matthew Taylor

  authored and

  kevingranade

  committed
  3399e37

• Store crafting related item data in a separate object inside a value_ptr

  Show description for 89a7b1c
  

  BevapDin

  authored and

  kevingranade

  committed
  89a7b1c

• Fix description

  

  Ramza13

  authored and

  kevingranade

  committed
  304a9e8

• Colored title of the info window (#36612)

  

  8street

  authored and

  kevingranade

  committed
  9b46640

• Unconditionally use material thickness for armor

  

  ymber

  authored and

  kevingranade

  committed
  eab27aa

• move and rename sus bedroom item_groups (#36614)

  

  curstwist

  authored and

  kevingranade

  committed
  9b40e2e

• Remove pit digging construction from CRIT

  

  TheShadowFerret

  authored and

  kevingranade

  committed
  5bdcd06

• Alcohol Revamp

  Show description for f6eb74d
  

  LilShiningMan

  authored and

  kevingranade

  committed
  f6eb74d

• Update arms.json

  

  RarkGrames

  authored and

  kevingranade

  committed
  93c4c76

• Fix crash in item comparison when using filter

  Show description for b2c6779
  

  jbytheway

  authored and

  kevingranade

  committed
  b2c6779

• Merge pull request #36602 from ymber/fold_turret

  Show description for dd658ae
  ZhilkinSerg

  authored
  dd658ae

• Merge pull request #36610 from jbytheway/warn_rotten_components

  Show description for d1d6270
  ZhilkinSerg

  authored
  d1d6270

• Remove duplicate stealing code (#36596)

  

  8street

  authored and

  ZhilkinSerg

  committed
  fe0e3de

• add roof to city block, vehicles

  Show description for 19a91c1
  curstwist

  committed
  19a91c1

• Book editing (#36631)

  Show description for 202f0b8
  

  k4gi

  authored and

  KorGgenT

  committed
  202f0b8

Commits on Jan 3, 2020

• Disable erroneous old-style-cast warning

  kevingranade

  committed
  fe72505

• Remove obsolete rock override (#36649)

  

  kevingranade

  authored and

  KorGgenT

  committed
  07dc4f5

• don't rebuild the item drop list (#36647)

  

  KorGgenT

  authored and

  kevingranade

  committed
  7aad3ab

• unify savegame version and bump to 27 (#36654)

  

  KorGgenT

  authored and

  kevingranade

  committed
  c3a2c46

• Fixed gunsafe's logic. (#36651)

  

  Kelenius

  authored and

  kevingranade

  committed
  828501c

• Merge pull request #36646 from curstwist/add-city-block-roof

  Show description for a39fc83
  Rivet-the-Zombie

  authored
  a39fc83

• Revert "don't rebuild the item drop list (#36647)"

  Show description for 68babf9
  BevapDin

  committed
  68babf9

• Add new mapgen location - private resort. (#35997)

  Show description for 4a734f0
  

  CountAlex

  authored and

  I-am-Erk

  committed
  4a734f0

• Fix dropping only two or so items when selecting to drop all of a stack.

  Show description for 2f4d528
  BevapDin

  committed
  2f4d528

Commits on Jan 4, 2020

• Aftershock: Add titanium items, spawning and recipes (#36581)

  Show description for 6df71be
  

  Soup-de-Loop

  authored and

  kevingranade

  committed
  6df71be

• Dynamically scale overmap legend width (#36662)

  

  Night-Pryanik

  authored and

  kevingranade

  committed
  a758fa6

• fix crash when switching modes with reach weapon in aiming window

  

  David Brown

  authored and

  kevingranade

  committed
  059a00b

• Fix mapgen code accessing the main game map.

  Show description for 5a05025
  

  BevapDin

  authored and

  kevingranade

  committed
  5a05025

• jsonize swim speed modifier as per walk cost mutation modifier

  

  David Brown

  authored and

  kevingranade

  committed
  5575599

• NPC's cant read while blind

  

  Ramza13

  authored and

  kevingranade

  committed
  f7e3493

• set pathfinding avoid_traps to true by default

  

  David Brown

  authored and

  kevingranade

  committed
  ed9e547

• Routine i18n updates on 4 Jan 2019

  BrettDong

  committed
  a5fb48e

• renovate house 04 (#36640)

  Show description for 5e67b46
  

  curstwist

  and

  I-am-Erk

  committed
  5e67b46

• Merge pull request #36683 from BrettDong/i18n

  Show description for 175ddf5
  Rivet-the-Zombie

  authored
  175ddf5

• Prevent undefined behaviour modifying bionic power

  Show description for c30844c
  anothersimulacrum

  committed
  c30844c

• Prevent high eye encumbrance from blinding players

  Show description for 5c02744
  anothersimulacrum

  committed
  5c02744

• Add an option to start the game window maximized

  Qrox

  committed
  58ef4cd

• Graphical Overmap update (#35792)

  

  Larwck

  authored and

  ZhilkinSerg

  committed
  c4f6a89

• Fix Wgt/Vol position in pickup window (#36643)

  

  8street

  authored and

  ZhilkinSerg

  committed
  eb750c3

• Mi-go furnitures contain a fetid goop that can mask your scent (#36160)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  235601a

• Speedup move test (#36664)

  Show description for c47e299
  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  c47e299

• Aftershock: PrepNet mycus war (#36661)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  7c22756

• Add title to info window in shift-v menu (#36648)

  

  8street

  authored and

  ZhilkinSerg

  committed
  9326ba6

• Merge pull request #36686 from anothersimulacrum/ub

  Show description for d0a3632
  ZhilkinSerg

  authored
  d0a3632

• Merge pull request #36687 from anothersimulacrum/vis

  Show description for 537fd02
  ZhilkinSerg

  authored
  537fd02

• Merge pull request #36688 from Qrox/maximize

  Show description for 9e6c9bf
  ZhilkinSerg

  authored
  9e6c9bf

• Restore crafting results being put on the workbench.

  Show description for 7399eec
  BevapDin

  committed
  7399eec

• Fix accessing invalid item locations:

  Show description for 5f339eb
  BevapDin

  committed
  5f339eb

• Fix monsters not being spawned on the map (#36691)

  Show description for 1e7f02e
  

  ZhilkinSerg

  authored and

  BevapDin

  committed
  1e7f02e

• Add construction recipe to turn shallow water to dirt. (#36493)

  Show description for 0e04348
  

  RafeHaab

  and

  I-am-Erk

  committed
  0e04348

• Prune secret recipes from character creation display

  Show description for 2c5394f
  kevingranade

  authored
  2c5394f

• renovate houses 06-10 (#36693)

  

  curstwist

  authored and

  I-am-Erk

  committed
  6b4ae2c

• Magiclysm: Cooking with Poison (#36627)

  Show description for 5c8e01c
  

  Maleclypse

  authored and

  KorGgenT

  committed
  5c8e01c

• Fix linting (#36701)

  

  anothersimulacrum

  authored and

  KorGgenT

  committed
  f32f08b

• Merge pull request #36694 from BevapDin/ouj

  Show description for cf92e9c
  ZhilkinSerg

  authored
  cf92e9c

• Merge pull request #36673 from BevapDin/biy

  Show description for 525090e
  ZhilkinSerg

  authored
  525090e

• Fix garage door knockback crash (#36671)

  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  443da66

• Lab snippet lore update (#36497)

  

  I-am-Erk

  authored and

  ZhilkinSerg

  committed
  c61070d

• update houses 11-15 (#36698)

  

  curstwist

  authored and

  I-am-Erk

  committed
  264b304

Commits on Jan 5, 2020

• Add reload wielded keybinding (#36658)

  

  Ramza13

  authored and

  kevingranade

  committed
  ca62787

• Cap fire age to prevent android overflow (#36676)

  

  davidpwbrown

  authored and

  kevingranade

  committed
  922b9a6

• Monster reorganize add fungus json (#36684)

  

  Maleclypse

  authored and

  kevingranade

  committed
  91d7b51

• Add "repairs_like" for items without a recipe (#36700)

  Show description for fdcae19
  

  anothersimulacrum

  authored and

  kevingranade

  committed
  fdcae19

• Stop ant tunnels stomping over other map terrain underground and removing staircases (#36702)

  Show description for ada2433
  

  davidpwbrown

  authored and

  kevingranade

  committed
  ada2433

• Prevent counterattacking with large/fragile items (#36704)

  Show description for 552ecbb
  

  anothersimulacrum

  authored and

  kevingranade

  committed
  552ecbb

• check emptiness (#36705)

  

  davidpwbrown

  authored and

  kevingranade

  committed
  921a9f4

• Move bronze to materials.json

  anothersimulacrum

  committed
  6d96601

• Merge pull request #36699 from CleverRaven/kevingranade-fix-learned-recipe-display

  Show description for cac8083
  Rivet-the-Zombie

  authored
  cac8083

• update houses 16-19 (#36709)

  

  curstwist

  authored and

  I-am-Erk

  committed
  745411a

• Merge pull request #36713 from anothersimulacrum/mv-bronze

  Show description for 9fe2e72
  ZhilkinSerg

  authored
  9fe2e72

• Remove unused declarators

  ZhilkinSerg

  committed
  1e08b4d

• Remove excessive incements

  ZhilkinSerg

  committed
  8925fea

• Remove excessive empty lines

  ZhilkinSerg

  committed
  f1490fc

• Normalized TODO/HACK/FIXME comments

  ZhilkinSerg

  committed
  1cabb58

• Removed redundant empty statement

  ZhilkinSerg

  committed
  7c7fc4d

• Put comments to separate lines

  ZhilkinSerg

  committed
  d941b4f

• Spell-casting NPCs (#35597)

  Show description for 7a023e4
  

  2 peopleauthored and

  KorGgenT

  committed
  7a023e4

• update 5 more houses (#36727)

  

  curstwist

  authored and

  I-am-Erk

  committed
  af810ad

• Create canned.json (#36718)

  Show description for 74eed30
  

  Maleclypse

  authored and

  I-am-Erk

  committed
  74eed30

• make fibrous stalk burnable (#36717)

  Show description for a511881
  

  8ctopus

  authored and

  I-am-Erk

  committed
  a511881

• Added 2 new NPCs. (#35238)

  Show description for bce06b8
  

  3 peoplecommitted
  bce06b8

• Mark royal jelly recipe secret.

  kevingranade

  committed
  4c4fa00

• Minor fixes to godco content.

  kevingranade

  committed
  7810b06

• Freeze burn does not cause insta-rot (#36644)

  

  1n17

  authored and

  kevingranade

  committed
  3829c9f

• Move armor functions to Character (#36711)

  Show description for 9cc8e32
  

  anothersimulacrum

  authored and

  kevingranade

  committed
  9cc8e32

• Fix undefined charges-max handling (#36723)

  

  Matthew Taylor

  authored and

  kevingranade

  committed
  d34a729

• retrodays+ updates (#36735)

  

  captnblood

  authored and

  I-am-Erk

  committed
  2b20b94

• Mr Lapin NPC Warrener (#36287)

  Show description for f069282
  

  Maleclypse

  and

  I-am-Erk

  committed
  f069282

Commits on Jan 6, 2020

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

  Show description for 605409a
  kevingranade

  authored
  605409a