Code

4-17-2020#1

Code

Merged

Drewscriver merged 71 commits intoDrewscriver:masterDrewscriver/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardApr 18, 2020

+7,567-5,057

Commits

Commits on Apr 5, 2020

• Add Military pilot Profession

  Competently-Incompetent

  authored
  16ef38b

  Copy full SHA for 16ef38b

• Update scenarios.json

  Show description for 8c6ca9a
  Competently-Incompetent

  authored
  8c6ca9a

  Copy full SHA for 8c6ca9a

• Added new description

  Competently-Incompetent

  authored
  72c8669

  Copy full SHA for 72c8669

• Update mutations.json

  Competently-Incompetent

  authored
  19eec8e

  Copy full SHA for 19eec8e

• Update professions.json

  Competently-Incompetent

  authored
  520b5be

  Copy full SHA for 520b5be

• Update professions.json

  Competently-Incompetent

  authored
  963646e

  Copy full SHA for 963646e

• Update professions.json

  Show description for 8359baf
  Competently-Incompetent

  authored
  8359baf

  Copy full SHA for 8359baf

• Update professions.json

  Show description for 966c29c
  Competently-Incompetent

  authored
  966c29c

  Copy full SHA for 966c29c

Commits on Apr 6, 2020

• attempt at functional trait

  Show description for 0671b00
  Competently-Incompetent

  authored
  0671b00

  Copy full SHA for 0671b00

• Update src/handle_action.cpp

  Show description for 18a6129
  

  Competently-Incompetent

  and

  anothersimulacrum

  authored
  18a6129

  Copy full SHA for 18a6129

• Update src/handle_action.cpp

  Show description for 7aef458
  

  Competently-Incompetent

  and

  anothersimulacrum

  authored
  7aef458

  Copy full SHA for 7aef458

• Update src/handle_action.cpp

  Show description for bc2e498
  

  Competently-Incompetent

  and

  anothersimulacrum

  authored
  bc2e498

  Copy full SHA for bc2e498

• Update src/handle_action.cpp

  Show description for 0065836
  

  Competently-Incompetent

  and

  anothersimulacrum

  authored
  0065836

  Copy full SHA for 0065836

• Update professions.json

  Show description for 943652d
  Competently-Incompetent

  authored
  943652d

  Copy full SHA for 943652d

• Update data/json/professions.json

  Show description for 1741d83
  

  Competently-Incompetent

  and

  Anton Burmistrov

  authored
  1741d83

  Copy full SHA for 1741d83

• Update professions.json

  Competently-Incompetent

  authored
  c0d6ae1

  Copy full SHA for c0d6ae1

Commits on Apr 11, 2020

• updated scenarious

  Competently-Incompetent

  committed
  dfad5ae

  Copy full SHA for dfad5ae

• updated scenarios and my godawful spelling

  Competently-Incompetent

  committed
  abe24fb

  Copy full SHA for abe24fb

• added the military pilot to DSA

  Competently-Incompetent

  committed
  7c8d0c4

  Copy full SHA for 7c8d0c4

• Hopefully successfully lint this file

  Competently-Incompetent

  committed
  a3d0816

  Copy full SHA for a3d0816

• changed profession trait

  Competently-Incompetent

  committed
  3444828

  Copy full SHA for 3444828

• edited description of helicopter pilot trait

  Competently-Incompetent

  committed
  aee0168

  Copy full SHA for aee0168

• reverted my changes

  Competently-Incompetent

  committed
  8f82279

  Copy full SHA for 8f82279

• Update mutations.json

  Show description for 64e2642
  Competently-Incompetent

  authored
  64e2642

  Copy full SHA for 64e2642

Commits on Apr 12, 2020

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  58e461c

  Copy full SHA for 58e461c

• Merge branch 'master' of https://github.com/Competently-Incompetent/Cataclysm-DDA

  Competently-Incompetent

  committed
  c04fb74

  Copy full SHA for c04fb74

Commits on Apr 13, 2020

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  03a3a5f

  Copy full SHA for 03a3a5f

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  cd1df5f

  Copy full SHA for cd1df5f

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  6d7a719

  Copy full SHA for 6d7a719

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  4012131

  Copy full SHA for 4012131

• Update data/json/mutations/mutations.json

  Show description for a559707
  

  Competently-Incompetent

  and

  Anton Burmistrov

  authored
  a559707

  Copy full SHA for a559707

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  70d53e7

  Copy full SHA for 70d53e7

• Merge remote-tracking branch 'upstream/master'

  Competently-Incompetent

  committed
  7a2bb33

  Copy full SHA for 7a2bb33

Commits on Apr 15, 2020

• Add grenade belts to loot pool

  Brian-Otten

  committed
  885bb8b

  Copy full SHA for 885bb8b

• Remove modularvest items

  

  ymber

  committed
  6b36c10

  Copy full SHA for 6b36c10

• Remove table buff/debuff for medicine

  wapcaplet

  committed
  3f8c654

  Copy full SHA for 3f8c654

Commits on Apr 16, 2020

• Add documentation on interface accessibility

  Qrox

  committed
  63170e9

  Copy full SHA for 63170e9

• more prices

  Brian-Otten

  committed
  3d90ccc

  Copy full SHA for 3d90ccc

• Adds postapoc prices to magazines

  Brian-Otten

  committed
  6c48f4d

  Copy full SHA for 6c48f4d

• Update armor.json

  Show description for 926a32f
  Arcangelus

  authored
  926a32f

  Copy full SHA for 926a32f

• Adds post apoc prices to resources

  Brian-Otten

  committed
  5c4c85b

  Copy full SHA for 5c4c85b

Commits on Apr 17, 2020

• Use correct sh syntax for string comparison

  wapcaplet

  committed
  3a1e1e9

  Copy full SHA for 3a1e1e9

• Fix item_modifier charges when min and max are same

  ralreegorganon

  committed
  ee250d0

  Copy full SHA for ee250d0

• Prices for tools

  Brian-Otten

  committed
  00c8142

  Copy full SHA for 00c8142

• Add prices to vehicle parts

  Brian-Otten

  committed
  5c6df3d

  Copy full SHA for 5c6df3d

• Merge pull request #39624 from Drewscriver/master

  Show description for e90cc91
  Rivet-the-Zombie

  authored
  e90cc91

  Copy full SHA for e90cc91

• Blazemod re-work preparatory restructure (#39621)

  Soup-de-Loop

  authored
  5748d3f

  Copy full SHA for 5748d3f

• Merge pull request #39615 from Arcangelus/patch-1

  Show description for 6c28dd3
  ZhilkinSerg

  authored
  6c28dd3

  Copy full SHA for 6c28dd3

• Merge pull request #39609 from Qrox/doc-accessibility

  Show description for 5a34594
  ZhilkinSerg

  authored
  5a34594

  Copy full SHA for 5a34594

• Merge pull request #39619 from wapcaplet/fix-lang-compiler

  Show description for 786fa8d
  ZhilkinSerg

  authored
  786fa8d

  Copy full SHA for 786fa8d

• Merge pull request #39620 from ralreegorganon/fix-item-group-charges

  Show description for d0dcefc
  ZhilkinSerg

  authored
  d0dcefc

  Copy full SHA for d0dcefc

• Cave jsonify (#39610)

  Show description for 086d751
  

  Anton Burmistrov

  authored
  086d751

  Copy full SHA for 086d751

• Interface: Match quality color (#39605)

  Show description for 7d57d08
  Pupsi-Mupsi

  authored
  7d57d08

  Copy full SHA for 7d57d08

• Merge pull request #39598 from wapcaplet/dining-on-drugs

  Show description for 06edab0
  ZhilkinSerg

  authored
  06edab0

  Copy full SHA for 06edab0

• Merge pull request #39292 from Competently-Incompetent/master

  Show description for 0a1cb3f
  ZhilkinSerg

  authored
  0a1cb3f

  Copy full SHA for 0a1cb3f

• Merge pull request #39592 from Brian-Otten/Grenade-belt-to-loot-pool

  Show description for 06de14f
  ZhilkinSerg

  authored
  06de14f

  Copy full SHA for 06de14f

• Transforming a mutation into another on activation (#39523)

  Fris0uman

  authored
  af60511

  Copy full SHA for af60511

• Adds prices to unsorted json

  Brian-Otten

  committed
  bd67a97

  Copy full SHA for bd67a97

• Build and use json_formatter in Visual Studio

  ralreegorganon

  committed
  9d6a104

  Copy full SHA for 9d6a104

• Merge pull request #39630 from ralreegorganon/vs-json-formatter

  Show description for b75cf3f
  ZhilkinSerg

  authored
  b75cf3f

  Copy full SHA for b75cf3f

• Merge pull request #39612 from Brian-Otten/post-apoc-price-controls-10

  Show description for 03db3fc
  ZhilkinSerg

  authored
  03db3fc

  Copy full SHA for 03db3fc

• Merge pull request #39613 from Brian-Otten/post-apoc-price-controls-11

  Show description for 01b0a9a
  ZhilkinSerg

  authored
  01b0a9a

  Copy full SHA for 01b0a9a

• Merge pull request #39614 from Brian-Otten/post-apoc-price-controls-12

  Show description for 129c6d7
  ZhilkinSerg

  authored
  129c6d7

  Copy full SHA for 129c6d7

• Merge pull request #39625 from Brian-Otten/post-apoc-price-controls-13

  Show description for ea1b358
  ZhilkinSerg

  authored
  ea1b358

  Copy full SHA for ea1b358

• Merge pull request #39626 from Brian-Otten/post-apoc-price-controls-14

  Show description for 4d16a86
  ZhilkinSerg

  authored
  4d16a86

  Copy full SHA for 4d16a86

• Merge pull request #39629 from Brian-Otten/post-apoc-price-controls-15

  Show description for 7d3d8d2
  ZhilkinSerg

  authored
  7d3d8d2

  Copy full SHA for 7d3d8d2

• Fix item info part of crafting ui in wide mode

  Qrox

  committed
  60ea359

  Copy full SHA for 60ea359

• Update docs for the new activty actor system

  ifreund

  committed
  357ca0b

  Copy full SHA for 357ca0b

• Merge pull request #39633 from Qrox/fix-crafting-ui

  Show description for cf87611
  ZhilkinSerg

  authored
  cf87611

  Copy full SHA for cf87611

• Merge pull request #39636 from ifreund/activity-docs

  Show description for f4c2803
  ZhilkinSerg

  authored
  f4c2803

  Copy full SHA for f4c2803

• Merge pull request #36920 from ymber/mbr

  Show description for 5dd7e74
  ZhilkinSerg

  authored
  5dd7e74

  Copy full SHA for 5dd7e74