Code

update#35

Code

Merged

Soupster89 merged 198 commits intoSoupster89:masterSoupster89/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardOct 22, 2019

+49,982-32,133

Commits

Commits on Oct 4, 2019

• Add files via upload

  I-am-Erk

  authored
  1727060

  Copy full SHA for 1727060

• Merge branch 'master' of github.com:I-am-Erk/Cataclysm-DDA

  I-am-Erk

  committed
  4194498

  Copy full SHA for 4194498

Commits on Oct 12, 2019

• Merge pull request #1 from CleverRaven/master

  Show description for 50bc2fb
  mqrause

  authored
  50bc2fb

  Copy full SHA for 50bc2fb

Commits on Oct 13, 2019

• make solar panels repairable

  

  mqrause

  committed
  aeb0092

  Copy full SHA for aeb0092

• Martial Arts Rebalance for Taekwondo

  Hymore246

  committed
  2a19b13

  Copy full SHA for 2a19b13

• Add pain and fatigue to the morale window

  AlexMooney

  committed
  24a5f9f

  Copy full SHA for 24a5f9f

• take_weapon has priority over disarm

  Hymore246

  committed
  f1ee746

  Copy full SHA for f1ee746

• Switched the Stats and Traits tab in the character creation screen

  Xanderga

  committed
  af88631

  Copy full SHA for af88631

Commits on Oct 14, 2019

• vehicles: allow multiple vehicles on a bike rack

  Show description for ee3e2af
  mlangsdorf

  committed
  ee3e2af

  Copy full SHA for ee3e2af

• Check for duplicate entries in active_npc before inserting.

  ipcyborg

  committed
  a39bd74

  Copy full SHA for a39bd74

• Fix for item variable

  Hymore246

  committed
  9f16150

  Copy full SHA for 9f16150

• Fixed targeting UI issue for reach attack.

  ipcyborg

  committed
  0b05e96

  Copy full SHA for 0b05e96

• changed celery volume to better reflect the mass-to-volume ratio in real life

  y2s82

  committed
  08e1994

  Copy full SHA for 08e1994

• Astyle fix

  Hymore246

  committed
  5c42a73

  Copy full SHA for 5c42a73

• add tele_sight to itemgroups

  snipercup

  committed
  f944bb6

  Copy full SHA for f944bb6

• removes extra capacity

  

  Fris0uman

  committed
  944550e

  Copy full SHA for 944550e

• Fix disabled limb check for bicycles

  AlexMooney

  committed
  112681d

  Copy full SHA for 112681d

Commits on Oct 15, 2019

• Mythological replicas work with martial arts

  Show description for 9dcb06b
  TheShadowFerret

  committed
  9dcb06b

  Copy full SHA for 9dcb06b

• Astyle fix again

  Hymore246

  committed
  f236056

  Copy full SHA for f236056

• mon_centipede looks like mon_centipede_giant

  barsoosayque

  committed
  cff613d

  Copy full SHA for cff613d

• Merge pull request #34711 from Hymore246/rebalance-taekwondo

  Show description for 7e216c3
  Rivet-the-Zombie

  authored
  7e216c3

  Copy full SHA for 7e216c3

• Fixed speed indicator overlapping stamina indicator

  

  Valiant

  committed
  4836503

  Copy full SHA for 4836503

• Merge pull request #34766 from barsoosayque/json/centipede-looks-like

  Show description for 1c1c7b4
  ZhilkinSerg

  authored
  1c1c7b4

  Copy full SHA for 1c1c7b4

• Fuji's Military Professions Mod (#34767)

  

  NotFuji

  authored and

  ZhilkinSerg

  committed
  ec0fa17

  Copy full SHA for ec0fa17

• Fixed inactive incendiary grenades not exploding if thrown in fire (#34769)

  Show description for 1dac8a6
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  1dac8a6

  Copy full SHA for 1dac8a6

• Merge pull request #34771 from Night-Pryanik/fix-speed-indicator-overlapping-stamina-indicator

  Show description for bb3361e
  ZhilkinSerg

  authored
  bb3361e

  Copy full SHA for bb3361e

• Running/crouching while swimming will result in faster/slower swim speed (#34770)

  Show description for 31ecb67
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  31ecb67

  Copy full SHA for 31ecb67

• Merge pull request #34759 from AlexMooney/fix_broken_limb_check

  Show description for 142a406
  ZhilkinSerg

  authored
  142a406

  Copy full SHA for 142a406

• Merge pull request #34755 from snipercup/add-tele_sight-to-itemgroups

  Show description for cf395a3
  ZhilkinSerg

  authored
  cf395a3

  Copy full SHA for cf395a3

• Merge pull request #34750 from y2s82/issue-34556

  Show description for 29c6db5
  ZhilkinSerg

  authored
  29c6db5

  Copy full SHA for 29c6db5

• Tweaked NPC "Trade how many" menu

  

  Valiant

  committed
  6c6b1d4

  Copy full SHA for 6c6b1d4

• Revert "add tele_sight to itemgroups"

  ZhilkinSerg

  authored
  83c0755

  Copy full SHA for 83c0755

• Merge pull request #34775 from CleverRaven/revert-34755-add-tele_sight-to-itemgroups

  Show description for c7ef9a0
  ZhilkinSerg

  authored
  c7ef9a0

  Copy full SHA for c7ef9a0

• Fix astyle regression (2019-10-15) (#34772)

  Show description for e3b9973
  ZhilkinSerg

  authored
  e3b9973

  Copy full SHA for e3b9973

• Merge pull request #34743 from ipcyborg/fix-25329-active-npc-dup

  Show description for 6dd7488
  ZhilkinSerg

  authored
  6dd7488

  Copy full SHA for 6dd7488

• Changelog thru october (#34731)

  Show description for ecfca46
  

  kevingranade

  and

  ZhilkinSerg

  committed
  ecfca46

  Copy full SHA for ecfca46

• Crafting display infinite (#34726)

  

  Ramza13

  authored and

  ZhilkinSerg

  committed
  9e0c2a2

  Copy full SHA for 9e0c2a2

• Merge pull request #34729 from Siersha/Switch-traits-and-tabs-in-char-gen

  Show description for 637fed5
  ZhilkinSerg

  authored
  637fed5

  Copy full SHA for 637fed5

• Add monsters to railroad station

  snipercup

  committed
  8e7cb2b

  Copy full SHA for 8e7cb2b

• Usuable not dirty bionics in inv always green

  RDru

  committed
  f162df9

  Copy full SHA for f162df9

• Remove unneeded code from read_do_turn

  KnightosMaster

  committed
  67814e8

  Copy full SHA for 67814e8

• add roof, landscaping to house_w_2

  curstwist

  committed
  fc5fb13

  Copy full SHA for fc5fb13

• Martial Arts Rebalance for Tai Chi

  Hymore246

  committed
  7a241c6

  Copy full SHA for 7a241c6

• Fix repair activity for tools in vehicle

  Show description for 0b2f70a
  ifreund

  committed
  0b2f70a

  Copy full SHA for 0b2f70a

• Fix changelog generator not fetching all PR data

  Show description for 715c76c
  KurzedMetal

  committed
  715c76c

  Copy full SHA for 715c76c

• Updated type section of technique description

  Hymore246

  committed
  b5f38ef

  Copy full SHA for b5f38ef

Commits on Oct 16, 2019

• move clothes item_groups

  curstwist

  committed
  c21a3ab

  Copy full SHA for c21a3ab

• BUG: Fix redundancy error in cattail-jelly recipe

  Oddant1

  committed
  60f84ab

  Copy full SHA for 60f84ab

• Prevent counterattacks if tired or dead (#34793)

  Show description for 2ba91be
  

  Hymore246

  authored and

  kevingranade

  committed
  2ba91be

  Copy full SHA for 2ba91be

• Merge pull request #34797 from Oddant1/cattail-jelly-error

  Show description for 62de9e2
  Rivet-the-Zombie

  authored
  62de9e2

  Copy full SHA for 62de9e2

• Fix immersion suit Iuse

  John-Candlebury

  committed
  acfdd2b

  Copy full SHA for acfdd2b

• Merge pull request #34801 from John-Candlebury/suitfix

  Show description for 460d063
  ZhilkinSerg

  authored
  460d063

  Copy full SHA for 460d063

• Merge pull request #34794 from Hymore246/technique-type-desc

  Show description for 932b8c7
  ZhilkinSerg

  authored
  932b8c7

  Copy full SHA for 932b8c7

• Merge pull request #34796 from curstwist/move-clothes-item_groups-to-clothing.json

  Show description for 6566b00
  ZhilkinSerg

  authored
  6566b00

  Copy full SHA for 6566b00

• Merge pull request #34791 from ifreund/vehicle-iuse-location-fix

  Show description for 48624df
  ZhilkinSerg

  authored
  48624df

  Copy full SHA for 48624df

• Merge pull request #34787 from KnightosMaster/fix_oostamina_error

  Show description for d0b1d81
  ZhilkinSerg

  authored
  d0b1d81

  Copy full SHA for d0b1d81

• Merge pull request #34788 from curstwist/add-roof-and-landscapeing-to-house_w_2

  Show description for 24c9b50
  ZhilkinSerg

  authored
  24c9b50

  Copy full SHA for 24c9b50

• Merge pull request #34786 from RDru/bionic_inv_colors

  Show description for b85051e
  ZhilkinSerg

  authored
  b85051e

  Copy full SHA for b85051e

• finish reorganizing furniture.json (#34758)

  Show description for e07aaac
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  e07aaac

  Copy full SHA for e07aaac

• change crossed_threshold() scope and test_crossing_threshold() parameter to Character (#34761)

  Show description for 94104c6
  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  94104c6

  Copy full SHA for 94104c6

• Migrate move mode and related code from player (#34762)

  Show description for b7a73b1
  

  ifreund

  authored and

  ZhilkinSerg

  committed
  b7a73b1

  Copy full SHA for b7a73b1

• Merge pull request #34778 from Night-Pryanik/NPC-trade-menu

  Show description for 772f8c6
  ZhilkinSerg

  authored
  772f8c6

  Copy full SHA for 772f8c6

• Allow auto targeting mode for turrets only with installed turret control unit (#34202)

  Show description for b914b50
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  b914b50

  Copy full SHA for b914b50

• Changed how unarmed xp is calculated (#34723)

  

  Xanderga

  authored and

  ZhilkinSerg

  committed
  43dbce7

  Copy full SHA for 43dbce7

• Merge pull request #34749 from ipcyborg/fix-16400-reach-attack

  Show description for 5707490
  ZhilkinSerg

  authored
  5707490

  Copy full SHA for 5707490

• Merge pull request #34756 from Fris0uman/no_extra_capacity

  Show description for 36387eb
  ZhilkinSerg

  authored
  36387eb

  Copy full SHA for 36387eb

• Merge pull request #34765 from LaVeyanFiend/MythoRepMartials

  Show description for 080fc8d
  ZhilkinSerg

  authored
  080fc8d

  Copy full SHA for 080fc8d

• Eat menu: Display volume per serving.

  OzoneH3

  committed
  cec36d6

  Copy full SHA for cec36d6

• Fix: Dialogs not showing while tailoring.

  OzoneH3

  committed
  0c68685

  Copy full SHA for 0c68685

• Merge pull request #34804 from OzoneH3/repair_msg

  Show description for 5fc6532
  ZhilkinSerg

  authored
  5fc6532

  Copy full SHA for 5fc6532

• Magiclysm - Introducing Channel Wands and Disposable Wands (#34653)

  Show description for 08353e3
  

  foulman

  authored and

  KorGgenT

  committed
  08353e3

  Copy full SHA for 08353e3

Commits on Oct 17, 2019

• Adds new styles to Close Quarters Battle CBM

  Hymore246

  committed
  9373c7e

  Copy full SHA for 9373c7e

• Merge pull request #34803 from OzoneH3/eat_vol

  Show description for 4489e25
  Rivet-the-Zombie

  authored
  4489e25

  Copy full SHA for 4489e25

• More realistic contents of bots and turrets

  Show description for 5f4a2a6
  

  Valiant

  committed
  5f4a2a6

  Copy full SHA for 5f4a2a6

• Updated disassembling recipes for broken bots and turrets

  

  Valiant

  committed
  a324097

  Copy full SHA for a324097

• Reverted adding robot controls to bots

  

  Valiant

  committed
  723e369

  Copy full SHA for 723e369

• Updated Modular Turrets mod

  

  Valiant

  committed
  d4766dc

  Copy full SHA for d4766dc

• Followers show predicted training level

  Vollinger

  committed
  1ac3969

  Copy full SHA for 1ac3969

• Adjust blanket deconstruct recipe time

  Show description for 4093efe
  snipercup

  committed
  4093efe

  Copy full SHA for 4093efe

• Updated Android build process (2019-10-16) (#34806)

  Show description for 201ecc0
  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  201ecc0

  Copy full SHA for 201ecc0

• Add adult black dragon to dragon lair (#34809)

  

  curstwist

  authored and

  KorGgenT

  committed
  f40e7c2

  Copy full SHA for f40e7c2

• Change scope of rooted() and dependent functions (#34811)

  Show description for cb8747f
  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  cb8747f

  Copy full SHA for cb8747f

• add roof, landscaping and cosmetic upgrades to house_w_3 (#34810)

  Show description for 8ab1f9b
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  8ab1f9b

  Copy full SHA for 8ab1f9b

• Down mattress Typo fix and makes it interchangeable component as mattress in construction (#34733)

  Show description for 9540df0
  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  9540df0

  Copy full SHA for 9540df0

• Fix the density of Oxygen Cylinders (#34798)

  Show description for c37820d
  

  2 peopleauthored and

  ZhilkinSerg

  committed
  c37820d

  Copy full SHA for c37820d

• Fix "cart produces seed when on a crop tile" (#34784)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  8bb8467

  Copy full SHA for 8bb8467

• Merge pull request #34820 from Vollinger/follower-training

  Show description for 3307e8a
  ZhilkinSerg

  authored
  3307e8a

  Copy full SHA for 3307e8a

• Free power (#34773)

  Show description for f13b854
  

  karthas077

  authored and

  ZhilkinSerg

  committed
  f13b854

  Copy full SHA for f13b854

• Broken limb debuffs (#34682)

  Show description for a5f9312
  

  Ramza13

  authored and

  ZhilkinSerg

  committed
  a5f9312

  Copy full SHA for a5f9312

• Merge pull request #34812 from Hymore246/cqb-cbm-styles

  Show description for 4367e98
  ZhilkinSerg

  authored
  4367e98

  Copy full SHA for 4367e98

• Merge pull request #34819 from snipercup/Adjust-blanket-deconstruct-recipe-time

  Show description for 93274e6
  ZhilkinSerg

  authored
  93274e6

  Copy full SHA for 93274e6

• Give crowbars and tools with hammers ability to pull out nails (#34822)

  Show description for 296124b
  

  reed501

  authored and

  ZhilkinSerg

  committed
  296124b

  Copy full SHA for 296124b

• Merge pull request #34792 from KurzedMetal/changelog_generator_fix

  Show description for 7d68dcc
  ZhilkinSerg

  authored
  7d68dcc

  Copy full SHA for 7d68dcc

• Merge pull request #34783 from snipercup/Add-monsters-to-railroad-station

  Show description for 5b03f7b
  ZhilkinSerg

  authored
  5b03f7b

  Copy full SHA for 5b03f7b

• Replace three ascii dots with the unicode ellipsis (#34777)

  

  Qrox

  authored and

  ZhilkinSerg

  committed
  8f0f6bb

  Copy full SHA for 8f0f6bb

• Optimize ranged_balance.cpp (#34489)

  Show description for 2afa1dd
  

  SlackingSleeper

  authored and

  kevingranade

  committed
  2afa1dd

  Copy full SHA for 2afa1dd

• Muscle powered CBM code clean up (#34706)

  Show description for 8546e9d
  

  Fris0uman

  authored and

  kevingranade

  committed
  8546e9d

  Copy full SHA for 8546e9d

• Add wretched pukers (#34396)

  

  Axema Vales

  authored and

  kevingranade

  committed
  d01c3e7

  Copy full SHA for d01c3e7

• Update specials.json

  curstwist

  committed
  428573f

  Copy full SHA for 428573f

Commits on Oct 18, 2019

• Mainline/jsonify megastore (#34625)

  

  chaisawlajatang

  authored and

  kevingranade

  committed
  ee848d1

  Copy full SHA for ee848d1

• Basements update (#34657)

  

  chaisawlajatang

  authored and

  kevingranade

  committed
  7e52b20

  Copy full SHA for 7e52b20

• Vehicle autopilot part for patrolling / auto-farming etc (#34616)

  

  davidpwbrown

  authored and

  kevingranade

  committed
  a74b2b6

  Copy full SHA for a74b2b6

• Bionic UI: power display in kJ, J, mJ (#34753)

  Show description for 557a387
  

  RDru

  authored and

  kevingranade

  committed
  557a387

  Copy full SHA for 557a387

• Power display (#34754)

  

  Fris0uman

  authored and

  kevingranade

  committed
  ac21c88

  Copy full SHA for ac21c88

• Update tele_sight description (#34802)

  

  snipercup

  authored and

  kevingranade

  committed
  43c8569

  Copy full SHA for 43c8569

• Appease clang (#34823)

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  c7fc9cb

  Copy full SHA for c7fc9cb

• move player::fall_asleep() and dependent functions to Character scope (#34828)

  Show description for 430987c
  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  430987c

  Copy full SHA for 430987c

• Merge pull request #34826 from curstwist/isherwood-fix

  Show description for 9658c41
  ZhilkinSerg

  authored
  9658c41

  Copy full SHA for 9658c41

• Merge pull request #34718 from AlexMooney/pain_fatigue_on_morale_screen

  Show description for b1ab162
  ZhilkinSerg

  authored
  b1ab162

  Copy full SHA for b1ab162

• Merge pull request #34790 from Hymore246/rebalance-tai-chi

  Show description for 4de26dc
  Rivet-the-Zombie

  authored
  4de26dc

  Copy full SHA for 4de26dc

• Simplify generic multiple activity handler (#34102)

  Show description for e31b762
  

  ipcyborg

  authored and

  ZhilkinSerg

  committed
  e31b762

  Copy full SHA for e31b762

• Merge pull request #34740 from mlangsdorf/multiracks

  Show description for 1471f08
  ZhilkinSerg

  authored
  1471f08

  Copy full SHA for 1471f08

• Fix clang-tidy warnings

  Qrox

  committed
  871727e

  Copy full SHA for 871727e

• Update Android dependencies

  ZhilkinSerg

  committed
  93d2f90

  Copy full SHA for 93d2f90

• Force to make activity fullscreen

  Show description for 636f49f
  EhNuhc

  authored
  636f49f

  Copy full SHA for 636f49f

• Merge pull request #34838 from Qrox/fix-clang-tidy-warnings

  Show description for b48c77c
  ZhilkinSerg

  authored
  b48c77c

  Copy full SHA for b48c77c

• Enable the clang-tidy text style check (#34837)

  Show description for 1f0b039
  

  Qrox

  authored and

  ZhilkinSerg

  committed
  1f0b039

  Copy full SHA for 1f0b039

• Merge pull request #34839 from ZhilkinSerg/android-deps-2019-10-18

  Show description for e19d21f
  ZhilkinSerg

  authored
  e19d21f

  Copy full SHA for e19d21f

• Merge pull request #34841 from EhNuhc/patch-1

  Show description for d816955
  ZhilkinSerg

  authored
  d816955

  Copy full SHA for d816955

• fix fake_spell json saving error

  KorGgenT

  committed
  be551e2

  Copy full SHA for be551e2

• Yet another down_matress fix

  snipercup

  committed
  f831216

  Copy full SHA for f831216

• Martial Arts Rebalance for Tiger Kung Fu

  Hymore246

  committed
  853a2b6

  Copy full SHA for 853a2b6

• Merge pull request #34846 from snipercup/Yet-another-down_matress-fix

  Show description for 16748fc
  ZhilkinSerg

  authored
  16748fc

  Copy full SHA for 16748fc

• Python tools fixes (#34842)

  Show description for a1e1911
  

  mlangsdorf

  authored and

  ZhilkinSerg

  committed
  a1e1911

  Copy full SHA for a1e1911

• Allow the shoddy laser rifle to use all heavy batteries as ammo (#34829)

  Show description for 7746768
  

  cmazzullo

  authored and

  ZhilkinSerg

  committed
  7746768

  Copy full SHA for 7746768

• fix for consuming items in containter outside inventory

  RDru

  committed
  38e5059

  Copy full SHA for 38e5059

• Merge pull request #34849 from RDru/fix_consuming

  Show description for 9a3c316
  ZhilkinSerg

  authored
  9a3c316

  Copy full SHA for 9a3c316

• Merge pull request #34843 from KorGgenT/fake-spell-saving-fix

  Show description for f656587
  ZhilkinSerg

  authored
  f656587

  Copy full SHA for f656587

• Fix for items weighting below 1g (#34835)

  Show description for fc89d2a
  

  RDru

  authored and

  ZhilkinSerg

  committed
  fc89d2a

  Copy full SHA for fc89d2a

• Lifestraw (#34390)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  3b79f53

  Copy full SHA for 3b79f53

• Fix incorrectly calculated vitamin values

  Show description for d19562e
  

  Davi

  committed
  d19562e

  Copy full SHA for d19562e

Commits on Oct 19, 2019

• Made the Sledge Hammer a two-handed weapon.

  Show description for 17190b5
  cmazzullo

  committed
  17190b5

  Copy full SHA for 17190b5

• Added "needs_charges requirement to ember carrier.

  Show description for 519ffa3
  cmazzullo

  committed
  519ffa3

  Copy full SHA for 519ffa3

• MAINT: Change light/powerdraw values of various handheld lights

  Oddant1

  committed
  8d710a3

  Copy full SHA for 8d710a3

• Merge pull request #34712 from mqrause/repairable_solar_panels

  Show description for 556b355
  Rivet-the-Zombie

  authored
  556b355

  Copy full SHA for 556b355

• Correct behavior of time based activites

  Show description for 98bee38
  ifreund

  committed
  98bee38

  Copy full SHA for 98bee38

• Routine i18n updates on 19 Oct 2019

  BrettDong

  committed
  6c74950

  Copy full SHA for 6c74950

• Standardized chemical powders for 1 unit = 1/100 mol (part 1) (#34833)

  Show description for e88e998
  

  RDru

  authored and

  ZhilkinSerg

  committed
  e88e998

  Copy full SHA for e88e998

• Merge pull request #34853 from cmazzullo/issue34827-sledgehammer_2h_tag

  Show description for 8a2f079
  ZhilkinSerg

  authored
  8a2f079

  Copy full SHA for 8a2f079

• Merge pull request #34852 from DaviBones/vitamin-inheritance-bugfix

  Show description for 55d1190
  ZhilkinSerg

  authored
  55d1190

  Copy full SHA for 55d1190

• Merge pull request #34856 from cmazzullo/issue34520-ember_carrier_fix

  Show description for 525e8fb
  ZhilkinSerg

  authored
  525e8fb

  Copy full SHA for 525e8fb

• Fix spring weight (#34857)

  Show description for bdc00e0
  

  snipercup

  authored and

  ZhilkinSerg

  committed
  bdc00e0

  Copy full SHA for bdc00e0

• Merge pull request #34859 from Oddant1/change-lights

  Show description for ac2700e
  ZhilkinSerg

  authored
  ac2700e

  Copy full SHA for ac2700e

• Add roof, landscape to house_w_5 (#34863)

  

  curstwist

  authored and

  ZhilkinSerg

  committed
  35f2181

  Copy full SHA for 35f2181

• Merge pull request #34868 from BrettDong/i18n

  Show description for 6c5d129
  ZhilkinSerg

  authored
  6c5d129

  Copy full SHA for 6c5d129

• Merge pull request #34867 from ifreund/time-based-act-fix

  Show description for 02be33c
  ZhilkinSerg

  authored
  02be33c

  Copy full SHA for 02be33c

• Add roof, landscape to house w 4 (#34848)

  

  curstwist

  authored and

  ZhilkinSerg

  committed
  890a433

  Copy full SHA for 890a433

• Standardize electric motors (#34500)

  

  ArcanErasmus

  authored and

  ZhilkinSerg

  committed
  2e11d8d

  Copy full SHA for 2e11d8d

Commits on Oct 20, 2019

• Merge remote-tracking branch 'upstream/master'

  I-am-Erk

  committed
  2ff9233

  Copy full SHA for 2ff9233

• add some looks-like entries to common vehicle parts

  I-am-Erk

  committed
  5f2c48e

  Copy full SHA for 5f2c48e

• Merge pull request #34817 from Night-Pryanik/tu

  Show description for f7c73e0
  Rivet-the-Zombie

  authored
  f7c73e0

  Copy full SHA for f7c73e0

• fix hoe consistency

  

  davidpwbrown

  committed
  0ba5abf

  Copy full SHA for 0ba5abf

• Removed leftovers of hardcoded silo mapgen

  

  Valiant

  committed
  bdea57b

  Copy full SHA for bdea57b

• Disallow "name_plural" when "name" is not a string

  Qrox

  committed
  cb463ff

  Copy full SHA for cb463ff

• Magiclysm - Magical Clothing (#34658)

  Show description for 1bfe7c5
  

  foulman

  authored and

  KorGgenT

  committed
  1bfe7c5

  Copy full SHA for 1bfe7c5

• Allow low strength characters to drag furniture

  Show description for de1b21d
  anothersimulacrum

  committed
  de1b21d

  Copy full SHA for de1b21d

• Merge pull request #34894 from Qrox/fix-name-plural

  Show description for 7717d18
  ZhilkinSerg

  authored
  7717d18

  Copy full SHA for 7717d18

• Merge pull request #34892 from Night-Pryanik/silo-fix

  Show description for 7419d15
  ZhilkinSerg

  authored
  7419d15

  Copy full SHA for 7419d15

• Decrease the weight of kevlar_plate from 360 to 300g (#34895)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  90d9090

  Copy full SHA for 90d9090

• Change pot recipe components to steel_standard (#34891)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  032e6ee

  Copy full SHA for 032e6ee

• Increase shopping bag weight from 2 to 5 g (#34889)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  72849a4

  Copy full SHA for 72849a4

• Give weight to cig butt, cigar butt and joint roach (#34879)

  Show description for e00b598
  

  snipercup

  authored and

  ZhilkinSerg

  committed
  e00b598

  Copy full SHA for e00b598

• Change bottle jack weight from 7kg to 5kg (#34896)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  4089955

  Copy full SHA for 4089955

• Encapsulate stim and move it to Character (#34844)

  Show description for 8e5ba60
  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  8e5ba60

  Copy full SHA for 8e5ba60

• Merge pull request #34888 from davidpwbrown/hoe_consistency

  Show description for 3f83c82
  ZhilkinSerg

  authored
  3f83c82

  Copy full SHA for 3f83c82

• JSONize inheritance of flags via crafting (#34825)

  Show description for e5f61fe
  

  Davi-DeGanne

  authored and

  ZhilkinSerg

  committed
  e5f61fe

  Copy full SHA for e5f61fe

• fix garage door, add vehicle spawn

  curstwist

  committed
  61f714c

  Copy full SHA for 61f714c

• compose: handle multiple entries in a single tile_entry.json file

  Show description for c3eece5
  mlangsdorf

  committed
  c3eece5

  Copy full SHA for c3eece5

• Fix typo in Android build properties

  ZhilkinSerg

  authored
  9ed8dda

  Copy full SHA for 9ed8dda

• Magicylsm: NPCs can now teach spells (#34709)

  Show description for 820aa8d
  

  davidpwbrown

  authored and

  KorGgenT

  committed
  820aa8d

  Copy full SHA for 820aa8d

• Merge pull request #34900 from curstwist/fix-garage,-add-vehicle-spawns-house_w_5

  Show description for 8c681b2
  ZhilkinSerg

  authored
  8c681b2

  Copy full SHA for 8c681b2

• Merge pull request #34901 from mlangsdorf/compose_load_arrays

  Show description for 4a0e242
  ZhilkinSerg

  authored
  4a0e242

  Copy full SHA for 4a0e242

• Merge pull request #34882 from anothersimulacrum/low-drag

  Show description for 002d740
  ZhilkinSerg

  authored
  002d740

  Copy full SHA for 002d740

• iuse_actor::can_use parameter change to Character and dependent functions (#34855)

  Show description for d5e387a
  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  d5e387a

  Copy full SHA for d5e387a

• fix for construction not resuming

  

  davidpwbrown

  committed
  acc520a

  Copy full SHA for acc520a

Commits on Oct 21, 2019

• Merge pull request #34909 from davidpwbrown/construction_fix

  Show description for a4fd594
  ZhilkinSerg

  authored
  a4fd594

  Copy full SHA for a4fd594

• Add looks_like to wooden panel (#34905)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  f5d33a2

  Copy full SHA for f5d33a2

• Increase bear trap weight and components (#34904)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  58d5940

  Copy full SHA for 58d5940

• Fix the alignment of many unicode strings (#34886)

  Show description for 0490a5a
  

  Qrox

  authored and

  ZhilkinSerg

  committed
  0490a5a

  Copy full SHA for 0490a5a

• Merge pull request #34902 from CleverRaven/ZhilkinSerg-android-fix-typo-2019-10-20

  Show description for c923142
  ZhilkinSerg

  authored
  c923142

  Copy full SHA for c923142

• Merge pull request #34847 from Hymore246/rebalance-tiger

  Show description for 330984b
  Rivet-the-Zombie

  authored
  330984b

  Copy full SHA for 330984b

• Add mutagen crafting components to underground lab (#34384)

  Show description for 7787bc0
  

  zachary-kaelan

  authored and

  ZhilkinSerg

  committed
  7787bc0

  Copy full SHA for 7787bc0

• Add forging requirements to beartrap crafting

  kevingranade

  authored
  e3e2452

  Copy full SHA for e3e2452

Commits on Oct 22, 2019

• Adds Butterfly Swords to more martial arts styles

  Hymore246

  committed
  7e09245

  Copy full SHA for 7e09245

• Merge pull request #34927 from CleverRaven/kevingranade-beartrap-needs-forging

  Show description for 3a3e8f1
  ZhilkinSerg

  authored
  3a3e8f1

  Copy full SHA for 3a3e8f1

• Merge pull request #34929 from Hymore246/style-butterfly

  Show description for 0a07b30
  ZhilkinSerg

  authored
  0a07b30

  Copy full SHA for 0a07b30

• Move morale and related functions to Character (#34911)

  Show description for a71778a
  

  ifreund

  authored and

  ZhilkinSerg

  committed
  a71778a

  Copy full SHA for a71778a

• Add result for "no seed" farm zone type to avoid invalid recipe error (#34890)

  Show description for b37e5a2
  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  b37e5a2

  Copy full SHA for b37e5a2

• Merge pull request #34881 from I-am-Erk/vp-lookslike

  Show description for 7a02eb5
  Rivet-the-Zombie

  authored
  7a02eb5

  Copy full SHA for 7a02eb5

• Serialize requirements for fetch activity (#34907)

  Show description for 4cfc071
  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  4cfc071

  Copy full SHA for 4cfc071

• Fix CBM not drawing power (#34862)

  Show description for 6d11156
  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  6d11156

  Copy full SHA for 6d11156

• Stupid Sexy Survivor: Synthetic Fabrics pt 2 (#34871)

  Show description for ae2ed10
  

  tenmillimaster

  authored and

  ZhilkinSerg

  committed
  ae2ed10

  Copy full SHA for ae2ed10

• The dissoluted devourer zombie (#34057)

  

  free-coffee

  authored and

  kevingranade

  committed
  46ae118

  Copy full SHA for 46ae118

• Replace fictional Taurus Pro .38 with Taurus Spectrum (#34666)

  

  LaVeyanFiend

  authored and

  kevingranade

  committed
  2e638ac

  Copy full SHA for 2e638ac

• Infrastructure for using vitamin system for toxins (#34695)

  Show description for e941a73
  

  Davi-DeGanne

  authored and

  kevingranade

  committed
  e941a73

  Copy full SHA for e941a73

• Add infrastructure for restricting clothing mods (#34705)

  

  Davi-DeGanne

  authored and

  kevingranade

  committed
  7825679

  Copy full SHA for 7825679

• maps: rework collapsing to prevent weird lab collapses (#34866)

  Show description for bb41c00
  

  mlangsdorf

  authored and

  kevingranade

  committed
  bb41c00

  Copy full SHA for bb41c00

• Hamster Huey and the Gooey Kablooie: Mk 211 Raufoss and .50 BMG nerfs. (#34931)

  

  tenmillimaster

  authored and

  kevingranade

  committed
  f7e743c

  Copy full SHA for f7e743c