Code

Update latest codes#6

Code

Merged

RedShakespeare merged 100 commits intoRedShakespeare:masterRedShakespeare/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardAug 27, 2019

+12,280-24,914

Commits

Commits on Aug 17, 2019

• .45 pistols

  Show description for 8bc6b4e
  tenmillimaster

  committed
  8bc6b4e

• item groups, mk23 size

  Show description for 969a161
  tenmillimaster

  committed
  969a161

• fix item id

  tenmillimaster

  committed
  52e611b

• grammar

  tenmillimaster

  committed
  2d76f08

• Added Mk23 to military spawns

  Show description for a934ca8
  tenmillimaster

  committed
  a934ca8

Commits on Aug 21, 2019

• Martial Arts Rebalance for Judo

  Hymore246

  committed
  eda113d

Commits on Aug 22, 2019

• astyle

  Hymore246

  committed
  3d57e23

• astyle again

  Hymore246

  committed
  fe98d61

• Even more astyle

  Hymore246

  committed
  2c8c786

• Update src/martialarts.cpp

  Show description for e18b7a0
  

  Hymore246

  and

  Alexey Mostovoy

  authored
  e18b7a0

• Update src/melee.cpp

  Show description for 943887d
  

  Hymore246

  and

  Alexey Mostovoy

  authored
  943887d

• yet more astyle

  Hymore246

  committed
  a78339f

Commits on Aug 24, 2019

• Merge branch 'master' into 45-military-pistols

  tenmillimaster

  authored
  078a251

• Cleaning up snippets.json

  Kanexan

  committed
  947a927

• Fix node name

  Show description for 8dc1497
  ZhilkinSerg

  committed
  8dc1497

• Added plural name for oxygen

  ZhilkinSerg

  committed
  531c6a0

• Merge pull request #33448 from Hymore246/rebalance-judo

  Show description for b215f78
  Rivet-the-Zombie

  authored
  b215f78

• Check optional value before actually using it.

  BevapDin

  committed
  37e1627

• Move splitting vehicle move into horizontal and vertical into map::move_vehicle.

  Show description for 7507200
  BevapDin

  committed
  7507200

• Better error reporting from map::move_vehicle:

  Show description for cac4f1d
  BevapDin

  committed
  cac4f1d

• Give shoved vehicle a vertical velocity so map::move_vehicle wont complain.

  BevapDin

  committed
  7372b14

• Martial Arts Rebalance for Karate

  Hymore246

  committed
  6af2056

• Fix "resin_cord is undefed" (#33504)

  Show description for e6f1833
  

  BevapDin

  authored and

  ZhilkinSerg

  committed
  e6f1833

• Check optional value before actually using it. (#33505)

  ZhilkinSerg

  authored
  aeacdc9

• Add mission for claire isherwood npc (#33498)

  Show description for 6e300c8
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  6e300c8

• Make Sweet Tooth a starting trait (#33477)

  Show description for 5c7083b
  

  ebolite

  authored and

  ZhilkinSerg

  committed
  5c7083b

• Add survival kit (#33428)

  Show description for e1e05ce
  

  ampersand55

  authored and

  ZhilkinSerg

  committed
  e1e05ce

• fix mana inefficiency (#33454)

  

  Highmongrel

  authored and

  KorGgenT

  committed
  2d04960

• Translate English MOTD to Simplified Chinese

  Qrox

  committed
  06fcf52

• Commas

  Kanexan

  committed
  d545f3c

• Fix a spell name in Magiclysm

  Qrox

  committed
  73e6ea1

• Too many commas

  Kanexan

  committed
  e38ea5a

• Technique name change

  Hymore246

  committed
  1962fae

• adjust spawns for mi-go

  curstwist

  committed
  7199a82

• Merge pull request #33514 from Qrox/fix-scroll-name

  Show description for 490ce3d
  ZhilkinSerg

  authored
  490ce3d

• Merge pull request #33513 from Qrox/motd-zh-cn

  Show description for 5545c5e
  ZhilkinSerg

  authored
  5545c5e

• CRIT Expansion update (#31090)

  

  Soupster89

  authored and

  ZhilkinSerg

  committed
  e442b42

• Update data/json/techniques.json

  Show description for 262ecd1
  

  Hymore246

  and

  ampersand55

  authored
  262ecd1

• Update data/json/techniques.json

  Show description for 738d65a
  

  Hymore246

  and

  ampersand55

  authored
  738d65a

• Eating raw fat is dangerous

  Show description for a4763d4
  

  TheShadowFerret

  and

  ZhilkinSerg

  committed
  a4763d4

• Add wooden rack furniture

  Show description for d8953f0
  anothersimulacrum

  committed
  d8953f0

Commits on Aug 25, 2019

• Lint RetroDays tileset config (#33527)

  Show description for 984f345
  

  anothersimulacrum

  authored and

  kevingranade

  committed
  984f345

• Update Retrodays tileset

  Show description for d443c93
  anothersimulacrum

  committed
  d443c93

• Fixes some Generic Guns errors

  

  God-damnit-all

  authored and

  kevingranade

  committed
  d88e727

• invalidate mass when moving item from vehicle (fix #33512)

  

  pierredavidbelanger

  authored and

  kevingranade

  committed
  e64fb89

• Merge pull request #33506 from BevapDin/fej

  Show description for 10672e1
  kevingranade

  authored
  10672e1

• Merge pull request #33502 from ZhilkinSerg/fix-name-plural

  Show description for e29aa34
  kevingranade

  authored
  e29aa34

• Merge pull request #33501 from Kanexan/Snippets-Rework

  Show description for 8ea2938
  kevingranade

  authored
  8ea2938

• Merge pull request #33449 from LaVeyanFiend/Fatparasites

  Show description for 47cc8b6
  Rivet-the-Zombie

  authored
  47cc8b6

• Fixes to the photo description

  Qrox

  committed
  cb7ff9a

• Merge pull request #33528 from anothersimulacrum/retrodays-update

  Show description for 47ddfce
  ZhilkinSerg

  authored
  47ddfce

• Merge pull request #33530 from Qrox/fix-photo-desc

  Show description for 50eb071
  ZhilkinSerg

  authored
  50eb071

• Merge pull request #33523 from anothersimulacrum/wooden-rack

  Show description for 03f943b
  ZhilkinSerg

  authored
  03f943b

• Fix and jsonize item dropping and trap conversion in trap-vehicle interaction (#33459)

  Show description for ab9996b
  

  Qrox

  and

  ZhilkinSerg

  committed
  ab9996b

• Adds steel mill location (#33383)

  Show description for a344a2d
  

  Kanexan

  and

  ZhilkinSerg

  committed
  a344a2d

• Add real summary regular expression (#33531)

  Show description for b82aa76
  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  b82aa76

• adjust spawns for mi-go (#33519)

  ZhilkinSerg

  authored
  2783181

• Fix more translation and translation updating issues (#33433)

  Show description for 60e0ca9
  

  Qrox

  authored and

  ZhilkinSerg

  committed
  60e0ca9

• npcs: always restock on first trading conversation

  Show description for df03c09
  mlangsdorf

  committed
  df03c09

• Added descriptions for copy-from, abstract, delete and extend

  Show description for d08476f
  snipercup

  authored
  d08476f

• fix random npcs offering static npc missions

  curstwist

  committed
  aca6649

• Disallow certain activities while riding (#33165)

  Show description for 20d267b
  

  davidpwbrown

  authored and

  kevingranade

  committed
  20d267b

• add migo scout tower

  curstwist

  committed
  579b334

• make Panaceus have the size of your thumbnail

  l29ah

  committed
  b5fed6d

Commits on Aug 26, 2019

• Fix Marloss Voice Random Spawning

  Show description for 6affddd
  John-Candlebury

  committed
  6affddd

• Merge pull request #33295 from tenmillimaster/45-military-pistols

  Show description for 5d0737e
  Rivet-the-Zombie

  authored
  5d0737e

• clang-tidy bugprone-use-after-move (#33557)

  Show description for 19f0f67
  

  jbytheway

  authored and

  ZhilkinSerg

  committed
  19f0f67

• Merge pull request #33549 from curstwist/add-migo-scout-tower

  Show description for badc312
  ZhilkinSerg

  authored
  badc312

• Merge pull request #33541 from curstwist/fix-static-npcs-spawning-for-random-npcs

  Show description for cb6380f
  ZhilkinSerg

  authored
  cb6380f

• adjust and add missions for isherwood faction (#33537)

  Show description for 4162137
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  4162137

• npcs: always restock on first trading conversation (#33536)

  Show description for 0033303
  ZhilkinSerg

  authored
  0033303

• Merge pull request #33540 from snipercup/Update-JSON_INFO.MD-add-copy-from

  Show description for 2f740b6
  ZhilkinSerg

  authored
  2f740b6

• Fix #33486 'All furniture storage became 1000L' by reverting furniture max_volume (#33534)

  Show description for c5956b7
  

  ampersand55

  authored and

  ZhilkinSerg

  committed
  c5956b7

• Merge pull request #33552 from l29ah/panaceus-volume

  Show description for c2d51e5
  ZhilkinSerg

  authored
  c2d51e5

• Merge pull request #33558 from John-Candlebury/marloss-voice

  Show description for 3fdaf32
  ZhilkinSerg

  authored
  3fdaf32

• Change all instances of 'volume' in JSONs to be a metric string II: The Empre Strikes Back (#33551)

  Show description for dbdebf7
  

  ampersand55

  authored and

  ZhilkinSerg

  committed
  dbdebf7

• map palette consistency

  

  David Brown

  committed
  40817b3

• Practice survival when harvesting

  ralreegorganon

  committed
  3d0a8b0

• Remove inconspicuous trait

  kevingranade

  authored
  9636052

• Update crt_vamp_mutations.json

  kevingranade

  authored
  fbe7298

• Update starting_traits.json

  kevingranade

  authored
  7c7229e

• Update trait_groups.json

  kevingranade

  authored
  9a8ed72

• Update crt_classes.json

  kevingranade

  authored
  e885353

• Update obsolete.json

  kevingranade

  authored
  21b9133

• Merge pull request #33566 from davidpwbrown/palette_fix

  Show description for 0ddd684
  ZhilkinSerg

  authored
  0ddd684

• Merge pull request #33572 from CleverRaven/kevingranade-remove-inconspicuous

  Show description for b4c8dff
  ZhilkinSerg

  authored
  b4c8dff

• Merge pull request #33570 from ralreegorganon/practice-survival-when-harvesting

  Show description for 94cfcd5
  ZhilkinSerg

  authored
  94cfcd5

• Doc: move json inheritance wiki page to json inheritance.md and update it (#33569)

  Show description for d2e35e5
  

  snipercup

  authored and

  kevingranade

  committed
  d2e35e5

• Lower the str required to move tables

  l29ah

  committed
  898a424

Commits on Aug 27, 2019

• Merge pull request #33510 from Hymore246/rebalance-karate

  Show description for 1f09a1c
  Rivet-the-Zombie

  authored
  1f09a1c

• NPC activity rework - farming and generic multi-activity loop (#32730)

  

  davidpwbrown

  authored and

  kevingranade

  committed
  52d144a

• Granularize Cartridge Reloading Part 1: Gotta keep em separated (#33310)

  Show description for 873872c
  

  tenmillimaster

  authored and

  kevingranade

  committed
  873872c

• Clean up homemade mags and guns (#33376)

  Show description for 8e5411c
  

  tenmillimaster

  authored and

  kevingranade

  committed
  8e5411c

• Fixed "Evolution doesnt happen with initial day set at 30 #33450". (#33487)

  Show description for d8f806f
  

  ipcyborg

  authored and

  kevingranade

  committed
  d8f806f

• Make makeshift glaive fragile.

  Show description for 8e5b38a
  kevingranade

  authored
  8e5b38a

• Merge branch 'master' into tables-move-strength

  ZhilkinSerg

  authored
  74f4c5e

• Add new mission/talk effect u_learn_recipe (#33574)

  Show description for d0d3619
  

  ralreegorganon

  authored and

  ZhilkinSerg

  committed
  d0d3619

• Lower the str required to move tables (#33575)

  ZhilkinSerg

  authored
  408d4af

• Merge pull request #33579 from CleverRaven/kevingranade-fragile-glaive

  Show description for 4c28ab2
  ZhilkinSerg

  authored
  4c28ab2

• Change throwable extinguisher to perish after use (#33561)

  Show description for f918a14
  

  artur-kink

  authored and

  ZhilkinSerg

  committed
  f918a14