Code

Updates#51

Code

Merged

Soupster89 merged 73 commits intoSoupster89:masterSoupster89/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardFeb 25, 2020

+14,329-12,812

Commits

Commits on Feb 21, 2020

• 🍅 Add batch time to ketchup in recipe_food.json

  Show description for e7631de
  pjf

  committed
  e7631de

  Copy full SHA for e7631de

• Permit making candles from lard

  l29ah

  committed
  218eecf

  Copy full SHA for 218eecf

• Magazine name to object

  snipercup

  committed
  c070b99

  Copy full SHA for c070b99

Commits on Feb 22, 2020

• Ammo name to object

  snipercup

  committed
  897818d

  Copy full SHA for 897818d

• Bionic name to object

  snipercup

  committed
  9dc476d

  Copy full SHA for 9dc476d

• bionic_item name to object

  snipercup

  committed
  0479cf2

  Copy full SHA for 0479cf2

• Update Spike and Makeshift Knife recipe to be more reasonable. (#38033)

  Show description for 164a32e
  

  Xenomorph-III

  authored
  164a32e

  Copy full SHA for 164a32e

• Fix an issue preventing Luo (beggar) from being recruited.

  Show description for a4ad844
  

  culithir

  authored and

  kevingranade

  committed
  a4ad844

  Copy full SHA for a4ad844

• Fix remote vehicles teleporting when folding (#37974)

  Show description for 42d9e25
  saurocyte

  authored
  42d9e25

  Copy full SHA for 42d9e25

• add purse to bride and ballroom dancer professions

  jkraybill

  committed
  cc186e6

  Copy full SHA for cc186e6

• Merge pull request #38216 from snipercup/Bionic-name-to-object

  Show description for 244457c
  ZhilkinSerg

  authored
  244457c

  Copy full SHA for 244457c

• Merge pull request #38205 from l29ah/candle-lard

  Show description for df20fd2
  ZhilkinSerg

  authored
  df20fd2

  Copy full SHA for df20fd2

• Merge pull request #38215 from snipercup/Ammo-name-to-object

  Show description for f0e6614
  ZhilkinSerg

  authored
  f0e6614

  Copy full SHA for f0e6614

• Merge pull request #38213 from snipercup/Magazine-name-to-object-2

  Show description for de2abc2
  ZhilkinSerg

  authored
  de2abc2

  Copy full SHA for de2abc2

• Merge pull request #38217 from snipercup/bionic_item-name-to-object

  Show description for bd5b9fb
  ZhilkinSerg

  authored
  bd5b9fb

  Copy full SHA for bd5b9fb

• Merge pull request #38198 from pjf/ketchup_bulk

  Show description for a000b0b
  ZhilkinSerg

  authored
  a000b0b

  Copy full SHA for a000b0b

• Moved more string consts into single file (#38220)

  Ramza13

  authored
  d9c6079

  Copy full SHA for d9c6079

• Merge pull request #38223 from jkraybill/38207

  Show description for a70217c
  ZhilkinSerg

  authored
  a70217c

  Copy full SHA for a70217c

• Grammar/Spelling (#38006)

  klorpa

  authored
  9a78ab5

  Copy full SHA for 9a78ab5

• #38201, #37504 tweaked canning ratios

  jkraybill

  committed
  12fd768

  Copy full SHA for 12fd768

• linted

  jkraybill

  committed
  9df131e

  Copy full SHA for 9df131e

• reduced calories of canned fruit

  jkraybill

  committed
  9c05bbe

  Copy full SHA for 9c05bbe

• Merge pull request #38226 from jkraybill/37504

  Show description for cbd994a
  Rivet-the-Zombie

  authored
  cbd994a

  Copy full SHA for cbd994a

• Disable grenade_lethality test for sanitizer CI

  Show description for 52a776f
  jbytheway

  committed
  52a776f

  Copy full SHA for 52a776f

• Add dark_craftable bool to construction

  

  Fris0uman

  committed
  e0855b3

  Copy full SHA for e0855b3

• Make spots dark craftable

  

  Fris0uman

  committed
  58ad188

  Copy full SHA for 58ad188

• Disallow bashing liquids

  

  Fris0uman

  committed
  d2634f5

  Copy full SHA for d2634f5

• Routine i18n updates on 22 Feb 2020 (#38230)

  BrettDong

  authored
  5c80905

  Copy full SHA for 5c80905

• Disable all starve tests on clang sanitizer test

  Show description for ed471cc
  jbytheway

  committed
  ed471cc

  Copy full SHA for ed471cc

• Disable vehicle efficiency on the gcc asan build

  Show description for 07c7ec0
  jbytheway

  committed
  07c7ec0

  Copy full SHA for 07c7ec0

• Merge pull request #38239 from Fris0uman/dark_build

  Show description for 14a261e
  kevingranade

  authored
  14a261e

  Copy full SHA for 14a261e

• Don't stale 0.E content frozen PRs (#38245)

  anothersimulacrum

  authored
  9015618

  Copy full SHA for 9015618

Commits on Feb 23, 2020

• Merge pull request #38241 from Fris0uman/liquid_bash

  Show description for 5231875
  Rivet-the-Zombie

  authored
  5231875

  Copy full SHA for 5231875

• Moved more string consts into single file (#38237)

  Ramza13

  authored
  4987742

  Copy full SHA for 4987742

• fix spelling error (#38231)

  curstwist

  authored
  4e3f9e1

  Copy full SHA for 4e3f9e1

• item_groups penultimate (#38240)

  Show description for 087338b
  LilShiningMan

  authored
  087338b

  Copy full SHA for 087338b

• Make the boat hull crafting time a little more real (#38253)

  l29ah

  authored
  585fbbe

  Copy full SHA for 585fbbe

• adds newspaper item groups (#38246)

  Show description for 4c48fc6
  cosmiccoincidence

  authored
  4c48fc6

  Copy full SHA for 4c48fc6

• fix laundromat

  curstwist

  committed
  73d7992

  Copy full SHA for 73d7992

Commits on Feb 24, 2020

• Simplify shadowcasting types

  Show description for f00a2f8
  jbytheway

  committed
  f00a2f8

  Copy full SHA for f00a2f8

• Separate caches for light and vision transparency

  Show description for 4c70a18
  jbytheway

  committed
  4c70a18

  Copy full SHA for 4c70a18

• Add a test for crouching vision

  Show description for 9528517
  jbytheway

  committed
  9528517

  Copy full SHA for 9528517

• Increase the fishing quality of the pro fishing rod (#38257)

  Show description for 95cfdc4
  l29ah

  authored
  95cfdc4

  Copy full SHA for 95cfdc4

• BIONIC_ITEM name to object (#38273)

  snipercup

  authored
  1d6cc0e

  Copy full SHA for 1d6cc0e

• Ammo name to object (#38274)

  snipercup

  authored
  e55bd75

  Copy full SHA for e55bd75

• Magazine name to object (#38278)

  snipercup

  authored
  d850c6e

  Copy full SHA for d850c6e

• Generic name to object (#38277)

  snipercup

  authored
  abdf29a

  Copy full SHA for abdf29a

• Bionic name to object (#38279)

  snipercup

  authored
  92b0b2c

  Copy full SHA for 92b0b2c

• Include JSON formatter binary in release.

  damien

  committed
  f29c9d2

  Copy full SHA for f29c9d2

• Even more gcc warning options (#38222)

  Show description for 1c29e3d
  jbytheway

  authored
  1c29e3d

  Copy full SHA for 1c29e3d

• Merge pull request #38283 from curstwist/fix-laundromat

  Show description for a8d43e7
  ZhilkinSerg

  authored
  a8d43e7

  Copy full SHA for a8d43e7

• Decreasing how many Zombie brides and priests there are. (#38291)

  Show description for 875d138
  TimPollard

  authored
  875d138

  Copy full SHA for 875d138

• Fix dark craftable PR (#38243)

  Fris0uman

  authored
  8793567

  Copy full SHA for 8793567

• add random town name string (#38242)

  cosmiccoincidence

  authored
  d10f828

  Copy full SHA for d10f828

• Disable more tests for sanitizer CI (#38232)

  Show description for 865e12c
  ZhilkinSerg

  authored
  865e12c

  Copy full SHA for 865e12c

• Move some description function to Character (#38236)

  Fris0uman

  authored
  f8c79aa

  Copy full SHA for f8c79aa

• Merge pull request #38280 from jbytheway/crouching_affects_lighting

  Show description for bd3524c
  Rivet-the-Zombie

  authored
  bd3524c

  Copy full SHA for bd3524c

• Translated fertilizer name for "ran out of fertilizer" message (#38261)

  jkraybill

  authored
  6cc80b3

  Copy full SHA for 6cc80b3

• Converting multi-cooker to another item when it is filled with a dish. (#37794)

  Show description for dc64c6e
  eilaattwood

  authored
  dc64c6e

  Copy full SHA for dc64c6e

• Merge pull request #38288 from damien/add-json-formatter-to-dist

  Show description for 7ddabba
  ZhilkinSerg

  authored
  7ddabba

  Copy full SHA for 7ddabba

• Fix translation of vehicle owner

  Aloxaf

  committed
  a31826a

  Copy full SHA for a31826a

• container name to object, volume to string (#38281)

  Show description for dbe55a1
  

  snipercup

  and

  I-am-Erk

  authored
  dbe55a1

  Copy full SHA for dbe55a1

• Ammo name to object 3 (#38302)

  snipercup

  authored
  95e95eb

  Copy full SHA for 95e95eb

• bionic name to object (#38305)

  snipercup

  authored
  58d1d9f

  Copy full SHA for 58d1d9f

• gun name to object (#38306)

  snipercup

  authored
  66e62f9

  Copy full SHA for 66e62f9

• Tool name to object (#38307)

  snipercup

  authored
  06b484f

  Copy full SHA for 06b484f

• Vitamins name to object (#38308)

  snipercup

  authored
  b03e1f5

  Copy full SHA for b03e1f5

• Gun name to object

  snipercup

  committed
  01b7e6f

  Copy full SHA for 01b7e6f

• Lamp oil now has an 80% time-saving at 4 units. 🪔

  Show description for 700e579
  

  pjf

  authored and

  kevingranade

  committed
  700e579

  Copy full SHA for 700e579

• Ammo name to object

  snipercup

  committed
  7f8d1db

  Copy full SHA for 7f8d1db

• Merge pull request #38310 from snipercup/Ammo-name-to-object

  Show description for 839d8b3
  ZhilkinSerg

  authored
  839d8b3

  Copy full SHA for 839d8b3

• Merge pull request #38309 from snipercup/Gun-name-to-object-2

  Show description for 9c7257d
  ZhilkinSerg

  authored
  9c7257d

  Copy full SHA for 9c7257d

• Merge pull request #38301 from Aloxaf/fix_veh_owner_trans

  Show description for b54b890
  ZhilkinSerg

  authored
  b54b890

  Copy full SHA for b54b890