Code

Catchup#11

Code

Merged

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

+2,054-924

Commits

Commits on Jan 6, 2020

• Fixes to ant lair generation

  kevingranade

  committed
  6b0b64f

• Merge pull request #36736 from kevingranade/fix-ant-tunnels

  Show description for b0160b4
  Rivet-the-Zombie

  authored
  b0160b4

• Fix typo

  Qrox

  committed
  4493717

• update next 5 houses (#36741)

  

  curstwist

  authored and

  I-am-Erk

  committed
  57b6f2f

• Magiclysm: Holographic transposition spell (#36714)

  Show description for 8ad1db2
  

  3 peopleauthored and

  KorGgenT

  committed
  8ad1db2

• Adding Grape Seeds to the cooking oil recipe

  Show description for 2d14566
  Ker-Nes

  authored
  2d14566

• Merge pull request #1 from Ker-Nes/Ker-Nes-grapes

  Show description for e4492a8
  Ker-Nes

  authored
  e4492a8

• Take down the Christmas decorations

  Inglonias

  authored
  17ceebe

• Add documentation for repairs_like

  anothersimulacrum

  committed
  ff81bf2

• Merge pull request #36750 from Qrox/fix-typo

  Show description for 72a0325
  ZhilkinSerg

  authored
  72a0325

• Merge pull request #36753 from Inglonias/war-on-christmas

  Show description for 24d0daf
  ZhilkinSerg

  authored
  24d0daf

• Merge pull request #36755 from anothersimulacrum/docs

  Show description for 238ab4b
  ZhilkinSerg

  authored
  238ab4b

• Use libbacktrace to generate readable backtrace on Windows (#36615)

  Show description for 764aa9f
  

  Qrox

  authored and

  ZhilkinSerg

  committed
  764aa9f

Commits on Jan 7, 2020

• Handle basecamp component selection cancellation

  Show description for d6dbad0
  jbytheway

  committed
  d6dbad0

• Test and fix inventory caching bug

  jbytheway

  committed
  64dedd5

• Overhaul anthill generation to avoid conflicting with other map features.

  kevingranade

  committed
  b225c73

• Merge pull request #36740 from jbytheway/basecamp_consumption

  Show description for 95bbdfe
  ZhilkinSerg

  authored
  95bbdfe

• Merge pull request #36762 from jbytheway/resume_craft_crash

  Show description for 168f48f
  ZhilkinSerg

  authored
  168f48f

• Merge pull request #36752 from Ker-Nes/grapeseedoil

  Show description for 4d722cb
  Rivet-the-Zombie

  authored
  4d722cb

• Moved corpses.json from items dir to items/corpses

  Show description for 9493b39
  Night-Pryanik

  committed
  9493b39

• Merge pull request #36771 from Night-Pryanik/corpses

  Show description for 9c6802b
  ZhilkinSerg

  authored
  9c6802b

• Abandon camp NPC talk and bulletin board mission (#36697)

  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  88009f4

• Correct sandbag recipe for charges

  kevingranade

  committed
  0ee7ca4

• Merge pull request #36773 from kevingranade/fix-sandbag

  Show description for 28f902a
  ZhilkinSerg

  authored
  28f902a

• Merge pull request #36767 from kevingranade/fix-anthils-again

  Show description for a68dc58
  ZhilkinSerg

  authored
  a68dc58

• reweight gemstones in item_groups.json (#36734)

  

  Jerimee

  authored and

  ZhilkinSerg

  committed
  bd22b04

• AFS prefix removed (#36763)

  

  Maleclypse

  authored and

  I-am-Erk

  committed
  91c47b0

• Corporate Infiltrator

  Show description for b63b941
  John-Candlebury

  committed
  b63b941

• Fix ids in npc complaints for smoke fields (#36775)

  

  ZhilkinSerg

  authored and

  I-am-Erk

  committed
  9ea9f81

• Martial Arts missing Learn Diffculty and Incorrect Bonuses (#36772)

  Show description for 3734302
  

  Xanmyral

  authored and

  I-am-Erk

  committed
  3734302

• Set debug mutation as such in Magiclysm (#36774)

  Show description for c4c7b91
  

  2 peopleauthored and

  KorGgenT

  committed
  c4c7b91

• Electrochemical reactions (#36785)

  Show description for bcff7ae
  

  1n17

  authored and

  I-am-Erk

  committed
  bcff7ae

• Lower material thickness for ballistic vest.

  arijust

  authored
  0de82ed

Commits on Jan 8, 2020

• Boxpack (#36746)

  Show description for 29351f0
  

  k4gi

  and

  I-am-Erk

  committed
  29351f0

• Fix butchery results

  John-Candlebury

  committed
  1f9a072

• Adds military helipad location (#36732)

  Show description for 89ef868
  

  CountAlex

  authored and

  I-am-Erk

  committed
  89ef868

• Use -Wno-unknown-warning to simplify warnings

  Show description for 2a8c48d
  jbytheway

  committed
  2a8c48d

• various little changes in retrodays+ (#36780)

  

  captnblood

  authored and

  I-am-Erk

  committed
  8c94bf5

• Merge pull request #36799 from arijust/ballistic_vest

  Show description for d8a93e0
  Rivet-the-Zombie

  authored
  d8a93e0

• Revert "Lower material thickness for ballistic vest."

  kevingranade

  committed
  09cf3e4

• Fix redraw in vehicle interaction menu

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  8355299

• Increase assisted effect from nurse bot (#36798)

  Show description for a74605a
  

  Fris0uman

  authored and

  kevingranade

  committed
  a74605a

• Merge pull request #36803 from jbytheway/no_unknown_warning

  Show description for 82fafc5
  ZhilkinSerg

  authored
  82fafc5

• Merge pull request #36801 from John-Candlebury/afs-butcher-fix

  Show description for 77f4898
  ZhilkinSerg

  authored
  77f4898

• [Aftershock] Wraitheon exec helicopter crash (#36766)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  b6c48d8

• Merge pull request #36768 from John-Candlebury/holo-fighter

  Show description for a9432ab
  ZhilkinSerg

  authored
  a9432ab

• Update game.cpp (#36787)

  Show description for 44b584e
  

  1n17

  authored and

  kevingranade

  committed
  44b584e

• Construction recipe for barred window with curtains (#36797)

  Show description for 0e87154
  

  Kilvoctu

  authored and

  I-am-Erk

  committed
  0e87154

• Allow armor inserts in ballistic vests (#36778)

  Show description for e7fabca
  

  Matthew Taylor

  authored and

  I-am-Erk

  committed
  e7fabca

• Update s_clothes chances (#36823)

  

  Matthew Taylor

  authored and

  I-am-Erk

  committed
  bb7e3c4

• Update JSON_INFO.md (#36827)

  

  Jerimee

  authored and

  kevingranade

  committed
  4322f15