Code

Bring me up to speed#4

Code

Merged

Inglonias merged 82 commits intoInglonias:masterInglonias/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardNov 5, 2018

+2,551-1,182

Commits

Commits on Oct 12, 2018

• Tasty Portals!

  Show description for a0851a3
  Rod995

  committed
  a0851a3

  Copy full SHA for a0851a3

Commits on Oct 13, 2018

• Update doc/JSON_INFO.md

  Show description for 2efc7a2
  Rod995

  committed
  2efc7a2

  Copy full SHA for 2efc7a2

Commits on Oct 14, 2018

• fixes #25236 by adding zinc to more groups including hardware

  y2s82

  committed
  d1b93bc

  Copy full SHA for d1b93bc

• Update src/game.cpp

  Rod995

  committed
  6c376c0

  Copy full SHA for 6c376c0

Commits on Oct 16, 2018

• add and update canning and pickling recipes

  Regilith

  committed
  50d74bc

  Copy full SHA for 50d74bc

• Fix kompot calories

  Show description for 83f5ec1
  Regilith

  committed
  83f5ec1

  Copy full SHA for 83f5ec1

• Add correct id_suffix to 3L kompot

  Regilith

  committed
  0a39be5

  Copy full SHA for 0a39be5

Commits on Oct 18, 2018

• changes, additions and linting to mod

  Noctifer-de-Mortem

  authored
  1c10728

  Copy full SHA for 1c10728

Commits on Oct 19, 2018

• add 3L foods to drop list

  Regilith

  committed
  c152a01

  Copy full SHA for c152a01

• fix notepad being stupid

  Regilith

  committed
  bd572c3

  Copy full SHA for bd572c3

Commits on Oct 21, 2018

• Adds new faux fur clothing, and a tailoring book

  

  Xhuis

  committed
  f73c5b1

  Copy full SHA for f73c5b1

Commits on Oct 26, 2018

• Use the same advanced martial arts display for character creation.

  OzoneH3

  committed
  bc6a8ea

  Copy full SHA for bc6a8ea

• astyle

  OzoneH3

  committed
  4fe76b9

  Copy full SHA for 4fe76b9

• Generate technique descriptions

  OzoneH3

  committed
  8c41c19

  Copy full SHA for 8c41c19

• Fix old "_mult" entries

  OzoneH3

  committed
  e8e61b4

  Copy full SHA for e8e61b4

• Bonus and buff descriptions

  OzoneH3

  committed
  ce10299

  Copy full SHA for ce10299

• Fixes

  OzoneH3

  committed
  a460693

  Copy full SHA for a460693

• Translation and display fixes

  OzoneH3

  committed
  93df6e2

  Copy full SHA for 93df6e2

• make pretty

  OzoneH3

  committed
  6c1b795

  Copy full SHA for 6c1b795

• Fixes

  OzoneH3

  committed
  d726af6

  Copy full SHA for d726af6

• Revert "Added description to all martial art style techniques (except for debug ones)"

  Show description for 0d77579
  OzoneH3

  committed
  0d77579

  Copy full SHA for 0d77579

• compile fix

  OzoneH3

  committed
  5db5506

  Copy full SHA for 5db5506

• Cat fixes round 2

  

  Theundyingcode

  committed
  167f01d

  Copy full SHA for 167f01d

• sheet metal and solar cell -> spare_parts and generic.json

  

  Theundyingcode

  committed
  68556c4

  Copy full SHA for 68556c4

Commits on Oct 27, 2018

• Revert "sheet metal and solar cell -> spare_parts and generic.json"

  Show description for e888a10
  

  Theundyingcode

  committed
  e888a10

  Copy full SHA for e888a10

• solar cells and sheet metal -> spare parts

  

  Theundyingcode

  committed
  a60596c

  Copy full SHA for a60596c

• Merge branch 'master' into item_cat_fix

  

  Gordon Watt

  authored
  a024fef

  Copy full SHA for a024fef

• Add Magic 8-Ball and coin

  Muffindrake

  committed
  5f110fb

  Copy full SHA for 5f110fb

• Actually add the actual items

  Muffindrake

  committed
  bd0c1fe

  Copy full SHA for bd0c1fe

• Astyle fluff.json

  Muffindrake

  committed
  2dffbc6

  Copy full SHA for 2dffbc6

• Astyle changes in iuse.cpp

  Muffindrake

  committed
  fd95911

  Copy full SHA for fd95911

• Correctly style fluff.json

  Muffindrake

  committed
  edbeb1c

  Copy full SHA for edbeb1c

• Begrudgingly comply with broken compilers

  Muffindrake

  committed
  88d8416

  Copy full SHA for 88d8416

Commits on Oct 28, 2018

• Comply with ancient and broken typesetting system

  Muffindrake

  committed
  d424e6b

  Copy full SHA for d424e6b

• Correct i18n of 8-ball strings

  Muffindrake

  committed
  9a4f572

  Copy full SHA for 9a4f572

Commits on Oct 29, 2018

• added zinc_powder to factory_be_gate_01.json

  y2s82

  committed
  5ebb01e

  Copy full SHA for 5ebb01e

Commits on Oct 30, 2018

• added dairy tag to several foods

  

  rdittrich97

  committed
  4f7dfbe

  Copy full SHA for 4f7dfbe

Commits on Nov 2, 2018

• Merge remote-tracking branch 'refs/remotes/CleverRaven/master'

  LetterShapedGlyphs

  committed
  619eaf4

  Copy full SHA for 619eaf4

• Temporary fix for Advanced Ecig

  Show description for 2a0c671
  LetterShapedGlyphs

  committed
  2a0c671

  Copy full SHA for 2a0c671

• Merge remote-tracking branch 'refs/remotes/CleverRaven/master' into Addiction

  LetterShapedGlyphs

  committed
  da1c6cc

  Copy full SHA for da1c6cc

• astyle

  Show description for 5b88a21
  

  ZhilkinSerg

  and

  karthas077

  authored
  5b88a21

  Copy full SHA for 5b88a21

• astyle and unneeded cast

  Show description for 8c2361d
  

  ZhilkinSerg

  and

  karthas077

  authored
  8c2361d

  Copy full SHA for 8c2361d

Commits on Nov 3, 2018

• spooky double break

  Rod995

  committed
  aac6897

  Copy full SHA for aac6897

Commits on Nov 4, 2018

• Add summary 34 and a tiny fix.

  kevingranade

  committed
  1eea9c6

  Copy full SHA for 1eea9c6

• Updating the fireman belt to allow axes and maces

  Show description for 6432e09
  

  Lance Finfrock

  committed
  6432e09

  Copy full SHA for 6432e09

• Update summary30.txt

  kevingranade

  authored
  753b764

  Copy full SHA for 753b764

• Fix assigned letter disappearing when taking weapon out of holster

  Qrox

  committed
  0936141

  Copy full SHA for 0936141

• npctalk to JSON: Most other NPC dialogue into JSON

  Show description for 27e6c56
  mlangsdorf

  committed
  27e6c56

  Copy full SHA for 27e6c56

• npctalk to JSON: remove some obsolete functions

  Show description for aa8180b
  mlangsdorf

  committed
  aa8180b

  Copy full SHA for aa8180b

• npctalk to JSON: Remove hardcoded prices

  Show description for 1823606
  mlangsdorf

  committed
  1823606

  Copy full SHA for 1823606

• Update data/mods/More_Locations/factory/factory_be_gate_01.json

  Show description for 56fd6f3
  

  ZhilkinSerg

  and

  y2s82

  authored
  56fd6f3

  Copy full SHA for 56fd6f3

• Merge branch 'master' into mart_style_desc

  ZhilkinSerg

  authored
  9aca412

  Copy full SHA for 9aca412

• Merge pull request #26521 from Qrox/fix-17789

  Show description for 5f1d57a
  ZhilkinSerg

  authored
  5f1d57a

  Copy full SHA for 5f1d57a

• Merge pull request #26517 from kevingranade/summary34

  Show description for 9d94585
  ZhilkinSerg

  authored
  9d94585

  Copy full SHA for 9d94585

• Merge pull request #26235 from y2s82/issue-25236

  Show description for 9002349
  ZhilkinSerg

  authored
  9002349

  Copy full SHA for 9002349

• Merge pull request #26491 from Karthas077/Addiction

  Show description for 8bd0bfb
  ZhilkinSerg

  authored
  8bd0bfb

  Copy full SHA for 8bd0bfb

• Merge pull request #26285 from Regilith/Add-3L-recipes

  Show description for 48e15c2
  ZhilkinSerg

  authored
  48e15c2

  Copy full SHA for 48e15c2

• Update newcharacter.cpp

  ZhilkinSerg

  authored
  3b9064e

  Copy full SHA for 3b9064e

• Merge pull request #25432 from mlangsdorf/npctalk_refactor

  Show description for f99a963
  ZhilkinSerg

  authored
  f99a963

  Copy full SHA for f99a963

• Update armor.json

  

  Ashe Higgs

  authored
  5b4080c

  Copy full SHA for 5b4080c

Commits on Nov 5, 2018

• Update construction.json

  Mom-Bun

  authored
  ba30b50

  Copy full SHA for ba30b50

• Update construction.json

  Mom-Bun

  authored
  6891a04

  Copy full SHA for 6891a04

• Merge pull request #26411 from Theundyingcode/item_cat_fix

  Show description for a87db09
  Rivet-the-Zombie

  authored
  a87db09

  Copy full SHA for a87db09

• Update newcharacter.cpp

  ZhilkinSerg

  authored
  996d0c4

  Copy full SHA for 996d0c4

• Update newcharacter.cpp

  ZhilkinSerg

  authored
  164aa2e

  Copy full SHA for 164aa2e

• Update newcharacter.cpp

  ZhilkinSerg

  authored
  c4bc4d9

  Copy full SHA for c4bc4d9

• Merge pull request #26278 from OzoneH3/mart_style_desc

  Show description for c997e39
  ZhilkinSerg

  authored
  c997e39

  Copy full SHA for c997e39

• Merge pull request #26226 from Rod995/tasty-portals

  Show description for 6489107
  ZhilkinSerg

  authored
  6489107

  Copy full SHA for 6489107

• Merge pull request #26344 from Xhuis/fauxfurclothes

  Show description for e1e1e6e
  ZhilkinSerg

  authored
  e1e1e6e

  Copy full SHA for e1e1e6e

• translate_markers for color names

  

  AMurkin

  committed
  40bcc66

  Copy full SHA for 40bcc66

• Merge pull request #26532 from Positronic-Girl/construction

  Show description for 5851775
  ZhilkinSerg

  authored
  5851775

  Copy full SHA for 5851775

• Merge pull request #26519 from lancewf/lancewf/fireman_belt_attach_axes_maces

  Show description for 66e2ad4
  ZhilkinSerg

  authored
  66e2ad4

  Copy full SHA for 66e2ad4

• Merge pull request #26462 from rdittrich97/issue-24097

  Show description for 90e0112
  ZhilkinSerg

  authored
  90e0112

  Copy full SHA for 90e0112

• Add *.code-workspace to .gitignore

  

  AMurkin

  committed
  dc834fe

  Copy full SHA for dc834fe

• Fix comestibles.json format

  

  AMurkin

  committed
  097b59b

  Copy full SHA for 097b59b

• Merge pull request #26539 from AMurkin/fix-comestibles-json-format

  Show description for db8395c
  ZhilkinSerg

  authored
  db8395c

  Copy full SHA for db8395c

• Merge pull request #26538 from AMurkin/ignore-vsc-ws

  Show description for a6d6292
  ZhilkinSerg

  authored
  a6d6292

  Copy full SHA for a6d6292

• Merge pull request #26536 from AMurkin/delay-color-names-translation

  Show description for c3fc0f6
  ZhilkinSerg

  authored
  c3fc0f6

  Copy full SHA for c3fc0f6

• Dairy -> milk

  

  AMurkin

  committed
  a21c20e

  Copy full SHA for a21c20e

• Merge pull request #26420 from Muffindrake/flippist_galore

  Show description for de68419
  ZhilkinSerg

  authored
  de68419

  Copy full SHA for de68419

• Merge pull request #26300 from Noctifer-de-Mortem/c_s_mod_changes

  Show description for 63d53be
  ZhilkinSerg

  authored
  63d53be

  Copy full SHA for 63d53be

• Merge pull request #26540 from AMurkin/dairy-redone

  Show description for bd9c3f4
  ZhilkinSerg

  authored
  bd9c3f4

  Copy full SHA for bd9c3f4