Code

update#17

Code

Merged

I-am-Erk merged 239 commits intoI-am-Erk:masterI-am-Erk/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardNov 22, 2019

+33,573-18,011

Commits

Commits on Oct 23, 2019

• make jumper/heavy cable uncraftable

  ArcanErasmus

  committed
  f620d59

  Copy full SHA for f620d59

Commits on Nov 4, 2019

• Changes to CRT TV and it's Components

  Show description for 8d7be58
  HarrisonGreenlee

  committed
  8d7be58

  Copy full SHA for 8d7be58

• Changes to CRT TV and its Components

  Show description for ad6c210
  HarrisonGreenlee

  committed
  ad6c210

  Copy full SHA for ad6c210

• Merge branch 'Flatscreen-TV' of https://github.com/HarrisonGreenlee/Cataclysm-DDA into Flatscreen-TV

  HarrisonGreenlee

  committed
  af37a3d

  Copy full SHA for af37a3d

Commits on Nov 5, 2019

• Decreased weight of LCD TV

  HarrisonGreenlee

  authored
  bb95978

  Copy full SHA for bb95978

• Fixed large_lcd_screen price and added large_lcd_screen to other devices

  Show description for 33b0bbd
  HarrisonGreenlee

  committed
  33b0bbd

  Copy full SHA for 33b0bbd

• LCD deconstruction and remote vehicle control recipe change

  Show description for 0eb0d88
  HarrisonGreenlee

  committed
  0eb0d88

  Copy full SHA for 0eb0d88

Commits on Nov 6, 2019

• Raise amount of money needed for new cashcards.

  arijust

  authored
  86dc8ed

  Copy full SHA for 86dc8ed

• Reduced cash card post_apoc price.

  arijust

  authored
  b9b07ba

  Copy full SHA for b9b07ba

• Reduced price to 10$.

  Show description for 72b7022
  arijust

  authored
  72b7022

  Copy full SHA for 72b7022

Commits on Nov 7, 2019

• Tweak price of cashcard before apoc.

  Show description for 470c1eb
  

  arijust

  and

  Qrox

  authored
  470c1eb

  Copy full SHA for 470c1eb

• Lint.

  arijust

  authored
  a3a14ee

  Copy full SHA for a3a14ee

• remove other zone farming options to deduplicate and remove inconsistency

  

  davidpwbrown

  committed
  731ea57

  Copy full SHA for 731ea57

Commits on Nov 8, 2019

• Allow bandoliers to hold extra ammo types

  

  Rail Runner

  committed
  a353864

  Copy full SHA for a353864

• Linting

  

  Rail Runner

  committed
  8191a26

  Copy full SHA for 8191a26

Commits on Nov 9, 2019

• Use string ids instead of hashes for snippets

  Qrox

  committed
  01893bd

  Copy full SHA for 01893bd

• Add ids to item snippets

  Qrox

  committed
  4ab1657

  Copy full SHA for 4ab1657

• Fix snippet text style

  Qrox

  committed
  d80aa75

  Copy full SHA for d80aa75

• Add translation context to some snippets

  Qrox

  committed
  47a0cac

  Copy full SHA for 47a0cac

• Update TRANSLATING.md

  Qrox

  committed
  440fae3

  Copy full SHA for 440fae3

Commits on Nov 10, 2019

• Increased weight and volume of large LCD screen

  HarrisonGreenlee

  authored
  a600447

  Copy full SHA for a600447

• Increased weight and volume of LCD TV

  HarrisonGreenlee

  authored
  c97fe3c

  Copy full SHA for c97fe3c

• Add some items to wall_bash_results itemgroup.

  arijust

  authored
  daf0d75

  Copy full SHA for daf0d75

• Prevent UB caused by accessing delete item

  Show description for 6a6877c
  BevapDin

  committed
  6a6877c

  Copy full SHA for 6a6877c

• Tweak number of drops and add prob.

  arijust

  authored
  d97a50c

  Copy full SHA for d97a50c

• Changed wire to cable.

  arijust

  authored
  4db3076

  Copy full SHA for 4db3076

• Change count to charges

  arijust

  authored
  e63b7c1

  Copy full SHA for e63b7c1

• Raise number of drops for nails and add planks.

  arijust

  authored
  50d002d

  Copy full SHA for 50d002d

Commits on Nov 11, 2019

• Merge remote-tracking branch 'CleverRaven/master' into snippet-id

  Show description for 3f86784
  Qrox

  committed
  3f86784

  Copy full SHA for 3f86784

• Update random_from_category calls in suffer.cpp

  Qrox

  committed
  3f53e24

  Copy full SHA for 3f53e24

• Add an entry describing a SUMMARY: None description

  kevingranade

  authored
  c045f74

  Copy full SHA for c045f74

• Merge pull request #35404 from Rail-Runner/bandoliers

  Show description for 80bc091
  Rivet-the-Zombie

  authored
  80bc091

  Copy full SHA for 80bc091

• Merge pull request #35459 from CleverRaven/kevingranade-suggest-summary-none

  Show description for 2ac980f
  ZhilkinSerg

  authored
  2ac980f

  Copy full SHA for 2ac980f

• Merge pull request #35453 from BevapDin/obw

  Show description for ed8a7da
  ZhilkinSerg

  authored
  ed8a7da

  Copy full SHA for ed8a7da

• Basecamp storage zone : to populate camp inventory (#35379)

  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  1d6366e

  Copy full SHA for 1d6366e

• Bug fix for issue 35324

  Show description for b509d54
  RoyBerube

  committed
  b509d54

  Copy full SHA for b509d54

• Fix Lava Bomb scroll giving non-existent spell

  TheShadowFerret

  committed
  02a8427

  Copy full SHA for 02a8427

Commits on Nov 12, 2019

• Tailoring overhaul, part 2: Requirements (#35304)

  

  Rail-Runner

  authored and

  kevingranade

  committed
  35bff08

  Copy full SHA for 35bff08

• Mg controlled burst (#35334)

  

  ArcanErasmus

  authored and

  kevingranade

  committed
  2e5e42e

  Copy full SHA for 2e5e42e

• Raise cost for purchasing new cashcards to 10$. (#35356)

  Show description for 2f7941a
  kevingranade

  authored
  2f7941a

  Copy full SHA for 2f7941a

• Add staff sling and ammo (#35417)

  

  snipercup

  authored and

  kevingranade

  committed
  8fb0214

  Copy full SHA for 8fb0214

• Remove buggy code (#35418)

  

  Ramza13

  authored and

  kevingranade

  committed
  0e6f211

  Copy full SHA for 0e6f211

• create item_info_data as parameter for draw_item_info (#35428)

  

  KorGgenT

  authored and

  kevingranade

  committed
  8a3d96d

  Copy full SHA for 8a3d96d

• Refactor a few if-else switches in item.cpp to switch-case statements (#35438)

  

  Davi-DeGanne

  authored and

  kevingranade

  committed
  5e487e8

  Copy full SHA for 5e487e8

• Fungal rebalance 2: Dramatically slow sporeling maturation (#35442)

  

  I-am-Erk

  authored and

  kevingranade

  committed
  c719efe

  Copy full SHA for c719efe

• vehicles: rationalize damage on removal (#35444)

  Show description for ea3869b
  

  mlangsdorf

  authored and

  kevingranade

  committed
  ea3869b

  Copy full SHA for ea3869b

• update "sleep_min" and "sleep_max" for 1s turn (#35465)

  

  Fris0uman

  authored and

  kevingranade

  committed
  347ca25

  Copy full SHA for 347ca25

• Triple falling force (#35468)

  

  Anton Burmistrov

  authored and

  kevingranade

  committed
  ea781bd

  Copy full SHA for ea781bd

• softdrink list added (#35475)

  Show description for e85bb23
  

  LilShiningMan

  authored and

  kevingranade

  committed
  e85bb23

  Copy full SHA for e85bb23

• Merge pull request #35476 from LaVeyanFiend/LavaFix

  Show description for 18d0fe1
  ZhilkinSerg

  authored
  18d0fe1

  Copy full SHA for 18d0fe1

• Merge pull request #35452 from arijust/wall_bash_item_group

  Show description for 5a76882
  Rivet-the-Zombie

  authored
  5a76882

  Copy full SHA for 5a76882

• Fix astyle regression (#35478)

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  dbae0ae

  Copy full SHA for dbae0ae

• add hotel roof, extra floors (#35474)

  Show description for cf218bb
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  cf218bb

  Copy full SHA for cf218bb

• Item_Groups cleanup - Religious Books

  Show description for 79538bb
  LilShiningMan

  committed
  79538bb

  Copy full SHA for 79538bb

• add roof to farm_2side, cosmetic improvements, loot

  curstwist

  committed
  6b7dbb3

  Copy full SHA for 6b7dbb3

• hotel bugfix

  curstwist

  committed
  c934878

  Copy full SHA for c934878

• Merge pull request #35487 from curstwist/hotel-fix

  Show description for 49a0427
  ZhilkinSerg

  authored
  49a0427

  Copy full SHA for 49a0427

• Blazemod fix rock override (#35486)

  

  snipercup

  authored and

  ZhilkinSerg

  committed
  7a01c9e

  Copy full SHA for 7a01c9e

• Merge pull request #35484 from LilShiningMan/LSM---Item-Group---Holybooks

  Show description for 30cadf0
  ZhilkinSerg

  authored
  30cadf0

  Copy full SHA for 30cadf0

• Supress test timing output when time spent is tiny (#35425)

  

  kevingranade

  authored and

  ZhilkinSerg

  committed
  912d054

  Copy full SHA for 912d054

• Allow using array in MIGRATION object for id (#35481)

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  15449b8

  Copy full SHA for 15449b8

• Fix leotard coverage

  Show description for 17ca1ca
  FuelType-Memes

  authored
  17ca1ca

  Copy full SHA for 17ca1ca

• inital common maps and standard walls

  curstwist

  committed
  6e205f8

  Copy full SHA for 6e205f8

• wall variations, shelter tweek

  curstwist

  committed
  cf46f15

  Copy full SHA for cf46f15

Commits on Nov 13, 2019

• suffer: set character's initial radiation to 0 (#35491)

  Show description for eb3c2fd
  

  mlangsdorf

  authored and

  kevingranade

  committed
  eb3c2fd

  Copy full SHA for eb3c2fd

• Merge pull request #35488 from FuelType-Memes/master

  Show description for 7df9a89
  Rivet-the-Zombie

  authored
  7df9a89

  Copy full SHA for 7df9a89

• Remove unnecessary spaces

  AMurkin

  authored
  3d27d07

  Copy full SHA for 3d27d07

• Update Cataclysm-vcpkg-static.vcxproj

  Show description for 96dafea
  ZhilkinSerg

  authored
  96dafea

  Copy full SHA for 96dafea

• Fix MD trait not giving immunity to faulty bionics

  FuelType-Memes

  authored
  fa4dd38

  Copy full SHA for fa4dd38

• check weapon is not null

  

  Fris0uman

  committed
  2b666e9

  Copy full SHA for 2b666e9

• fix basecamp inv

  

  davidpwbrown

  committed
  fbbe0bb

  Copy full SHA for fbbe0bb

• Merge pull request #35485 from curstwist/add-roof-to-farm_2side

  Show description for 806b3e6
  ZhilkinSerg

  authored
  806b3e6

  Copy full SHA for 806b3e6

• Add roof to junkyard. merge junkyard/add palette (#35477)

  Show description for 178839a
  

  curstwist

  authored and

  ZhilkinSerg

  committed
  178839a

  Copy full SHA for 178839a

• Revise EFFECTS_JSON.md (#35506)

  Show description for e0f9e48
  

  arijust

  authored and

  ZhilkinSerg

  committed
  e0f9e48

  Copy full SHA for e0f9e48

• Merge pull request #35497 from AMurkin/patch-1

  Show description for 0bfa4c6
  ZhilkinSerg

  authored
  0bfa4c6

  Copy full SHA for 0bfa4c6

• Merge pull request #35503 from FuelType-Memes/master

  Show description for dd53c91
  ZhilkinSerg

  authored
  dd53c91

  Copy full SHA for dd53c91

• Merge pull request #35498 from CleverRaven/ZhilkinSerg-patch-1

  Show description for 8238fa5
  ZhilkinSerg

  authored
  8238fa5

  Copy full SHA for 8238fa5

• make code comments in game_constants.h uniform (#35505)

  Show description for 859b556
  

  alex19EP

  authored and

  ZhilkinSerg

  committed
  859b556

  Copy full SHA for 859b556

• Merge pull request #35504 from Fris0uman/stop_spilling_ur_nones

  Show description for 1baef90
  ZhilkinSerg

  authored
  1baef90

  Copy full SHA for 1baef90

• sinks be gone

  curstwist

  committed
  12af57c

  Copy full SHA for 12af57c

• Merge pull request #35511 from curstwist/fix-gambling-hall-terrain-bug

  Show description for e71ad4f
  ZhilkinSerg

  authored
  e71ad4f

  Copy full SHA for e71ad4f

Commits on Nov 14, 2019

• Merge pull request #35320 from HarrisonGreenlee/Flatscreen-TV

  Show description for e612365
  Rivet-the-Zombie

  authored
  e612365

  Copy full SHA for e612365

• Fixed: detecting the final stage of the construction

  ipcyborg

  committed
  77d0981

  Copy full SHA for 77d0981

• mouth encumbrance doesn't drain stamina while walking

  KorGgenT

  committed
  33b3a29

  Copy full SHA for 33b3a29

• deduplicate json (#35512)

  

  curstwist

  authored and

  kevingranade

  committed
  789c84a

  Copy full SHA for 789c84a

• jsonize bionic slots (#35508)

  

  KorGgenT

  authored and

  kevingranade

  committed
  d61abe8

  Copy full SHA for d61abe8

• Don't apply trap effects on player if player is riding a mount (#35495)

  Show description for b670426
  

  Anton Burmistrov

  authored and

  kevingranade

  committed
  b670426

  Copy full SHA for b670426

• Replaced sleep effects for fatigue effects (#35499)

  Show description for bb3648e
  

  arijust

  authored and

  kevingranade

  committed
  bb3648e

  Copy full SHA for bb3648e

Commits on Nov 15, 2019

• Replace outpost laser turrets with M2HB turrets (#35206)

  

  Matthew Taylor

  authored and

  kevingranade

  committed
  73f6a9a

  Copy full SHA for 73f6a9a

• Two typos in magazine descriptions

  jbytheway

  committed
  354a038

  Copy full SHA for 354a038

• fix Deconstruct Without Light at Night

  Show description for 6257742
  LeeMartin77

  committed
  6257742

  Copy full SHA for 6257742

• Merge pull request #35536 from jbytheway/typo

  Show description for b17746f
  Rivet-the-Zombie

  authored
  b17746f

  Copy full SHA for b17746f

• Update muzzle.json

  tenmillimaster

  committed
  05d7db6

  Copy full SHA for 05d7db6

• Support item_locations on NPCs

  Show description for 1cc10cd
  ifreund

  committed
  1cc10cd

  Copy full SHA for 1cc10cd

• Properly handle failure case of critter_by_id()

  ifreund

  committed
  8096889

  Copy full SHA for 8096889

• Read mutation categories using typed_reader (#35446)

  Show description for 5461dc5
  

  jbytheway

  authored and

  KorGgenT

  committed
  5461dc5

  Copy full SHA for 5461dc5

Commits on Nov 16, 2019

• add extra capabilities to mutation copy-from

  KorGgenT

  committed
  ba7cde0

  Copy full SHA for ba7cde0

• Update No Antique Firearms mod

  Show description for 2c05dc7
  Cyrano7

  committed
  2c05dc7

  Copy full SHA for 2c05dc7

• Add my name to maintainers

  Show description for d6ab00f
  Cyrano7

  committed
  d6ab00f

  Copy full SHA for d6ab00f

• Merge pull request #35548 from Cyrano7/update_no_old_guns

  Show description for e0332e1
  Rivet-the-Zombie

  authored
  e0332e1

  Copy full SHA for e0332e1

• Routine i18n updates on 16 Nov 2019

  BrettDong

  committed
  e0e148f

  Copy full SHA for e0e148f

• Fixed graphical artifacts after creating a world in main menu

  

  Valiant

  committed
  038c3df

  Copy full SHA for 038c3df

• Only for tiles builds

  

  Valiant

  committed
  3470a2a

  Copy full SHA for 3470a2a

• Remove failed craft when losing last component

  Show description for 886e552
  LeeMartin77

  committed
  886e552

  Copy full SHA for 886e552

• Help players discover how to repair

  Show description for 528a68f
  jbytheway

  committed
  528a68f

  Copy full SHA for 528a68f

• Fix turrets in vehicles displaying color tags in output

  Show description for cbfdc88
  BevapDin

  committed
  cbfdc88

  Copy full SHA for cbfdc88

• Merge pull request #35554 from LeeMartin77/prevent_empty_inprogress_crafts

  Show description for 4f81055
  ZhilkinSerg

  authored
  4f81055

  Copy full SHA for 4f81055

• Merge pull request #35553 from Night-Pryanik/fix-redraw-after-creating-a-world

  Show description for e54c8ec
  ZhilkinSerg

  authored
  e54c8ec

  Copy full SHA for e54c8ec

• Merge pull request #35551 from BrettDong/i18n

  Show description for e0072e0
  ZhilkinSerg

  authored
  e0072e0

  Copy full SHA for e0072e0

• candy_chocolate list added (#35550)

  Show description for 96b12e6
  

  LilShiningMan

  authored and

  ZhilkinSerg

  committed
  96b12e6

  Copy full SHA for 96b12e6

• Merge pull request #35557 from BevapDin/gaq

  Show description for 1889d65
  ZhilkinSerg

  authored
  1889d65

  Copy full SHA for 1889d65

• monsters: fix debug message when swapping with a pet in a vehicle (#35556)

  Show description for 1a1b85c
  

  mlangsdorf

  authored and

  ZhilkinSerg

  committed
  1a1b85c

  Copy full SHA for 1a1b85c

• Merge pull request #35555 from jbytheway/mend_clarification

  Show description for 92dee57
  ZhilkinSerg

  authored
  92dee57

  Copy full SHA for 92dee57

• Merge pull request #35537 from tenmillimaster/suppressor-displacement-quick-fix

  Show description for 37a85fa
  ZhilkinSerg

  authored
  37a85fa

  Copy full SHA for 37a85fa

• Merge pull request #35531 from LeeMartin77/disable_dark_construction_restart

  Show description for e8ab102
  ZhilkinSerg

  authored
  e8ab102

  Copy full SHA for e8ab102

• Merge pull request #35509 from davidpwbrown/camp_form_fix

  Show description for 3766dc6
  ZhilkinSerg

  authored
  3766dc6

  Copy full SHA for 3766dc6

• Merge pull request #35390 from davidpwbrown/moree_tilling_consistency

  Show description for ae3e7fa
  ZhilkinSerg

  authored
  ae3e7fa

  Copy full SHA for ae3e7fa

• Merge pull request #35415 from Qrox/snippet-id

  Show description for b740542
  ZhilkinSerg

  authored
  b740542

  Copy full SHA for b740542

• Merge pull request #35517 from ipcyborg/fix-35471-detect-final-construction

  Show description for e139f8d
  ZhilkinSerg

  authored
  e139f8d

  Copy full SHA for e139f8d

• Make AIM width customizable (#35521)

  Show description for 6a9c494
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  6a9c494

  Copy full SHA for 6a9c494

• Create template from already existing character (#35467)

  Show description for 3ca8f49
  

  OzoneH3

  authored and

  ZhilkinSerg

  committed
  3ca8f49

  Copy full SHA for 3ca8f49

• Merge pull request #35470 from RoyBerube/mouse_view_bugfix_35324

  Show description for c94e415
  ZhilkinSerg

  authored
  c94e415

  Copy full SHA for c94e415

• Prevent slimespring spawning dehydration

  Show description for d42e964
  anothersimulacrum

  committed
  d42e964

  Copy full SHA for d42e964

• Fix astyle regression

  anothersimulacrum

  committed
  aa8f4d7

  Copy full SHA for aa8f4d7

• Merge pull request #35563 from anothersimulacrum/astyle

  Show description for 93051a5
  ZhilkinSerg

  authored
  93051a5

  Copy full SHA for 93051a5

• Merge pull request #35561 from anothersimulacrum/slime-spawn

  Show description for 7796df3
  ZhilkinSerg

  authored
  7796df3

  Copy full SHA for 7796df3

Commits on Nov 17, 2019

• Merge pull request #35538 from ifreund/npc-item-loc

  Show description for 8d5b04e
  Rivet-the-Zombie

  authored
  8d5b04e

  Copy full SHA for 8d5b04e

• XL Black Dragon Armor (#35549)

  Show description for b653d6b
  

  araneyl

  and

  KorGgenT

  committed
  b653d6b

  Copy full SHA for b653d6b

• Update seed.json

  sketchywyvern

  authored
  f70a684

  Copy full SHA for f70a684

• Modify chitin armor recipes.

  arijust

  authored
  acdda97

  Copy full SHA for acdda97

• Modify chitin armguards.

  arijust

  authored
  d6d960c

  Copy full SHA for d6d960c

• Modify chitin boots

  arijust

  authored
  334efe7

  Copy full SHA for 334efe7

• Modify chitin gauntlets

  arijust

  authored
  b7629d3

  Copy full SHA for b7629d3

• Modify chitin helmets

  arijust

  authored
  e45e80e

  Copy full SHA for e45e80e

• Remove commented out code.

  BevapDin

  committed
  8d96f03

  Copy full SHA for 8d96f03

• Remove unused entry in FILENAMES map.

  Show description for 20e9630
  BevapDin

  committed
  20e9630

  Copy full SHA for 20e9630

• Remove reference to non-existing entry in FILENAMES.

  Show description for 127694b
  BevapDin

  committed
  127694b

  Copy full SHA for 127694b

• Remove reference to non-existing entry in FILENAMES:

  Show description for 02c6f96
  BevapDin

  committed
  02c6f96

  Copy full SHA for 02c6f96

• Change build_resource_list to avoid looking up FILENAMES from it.

  Show description for f195e06
  BevapDin

  committed
  f195e06

  Copy full SHA for f195e06

• Change options_manager::load_tilesets_from and options_manager::load_soundpack_from to take actual paths

  Show description for da38ef6
  BevapDin

  committed
  da38ef6

  Copy full SHA for da38ef6

• Hide the FILENAMES map.

  Show description for 496f52d
  BevapDin

  committed
  496f52d

  Copy full SHA for 496f52d

• Inline a few entries of the FILENAMES map

  Show description for c66e523
  BevapDin

  committed
  c66e523

  Copy full SHA for c66e523

• Add wrappers around calls to PATH_INFO::find_translated_file

  Show description for 9083c0d
  BevapDin

  committed
  9083c0d

  Copy full SHA for 9083c0d

• Add wrapper functions to set entries within FILENAMES from outside the cpp file.

  Show description for 5e49db8
  BevapDin

  committed
  5e49db8

  Copy full SHA for 5e49db8

• Change find_translated_file to take the actual values instead of lookup keys

  Show description for 6604c7e
  BevapDin

  committed
  6604c7e

  Copy full SHA for 6604c7e

• Extract FILENAMES["motd"] into a static variable

  BevapDin

  committed
  fd71a90

  Copy full SHA for fd71a90

• Extract FILENAMES["gfxdir"] into a static variable

  BevapDin

  committed
  9867ab1

  Copy full SHA for 9867ab1

• Extract FILENAMES["config_dir"] into a static variable

  BevapDin

  committed
  21be4a2

  Copy full SHA for 21be4a2

• Extract FILENAMES["user_dir"] into a static variable

  BevapDin

  committed
  90a2350

  Copy full SHA for 90a2350

• Extract FILENAMES["datadir"] into a static variable

  BevapDin

  committed
  d3f6f43

  Copy full SHA for d3f6f43

• Extract FILENAMES["base_path"] into a static variable

  BevapDin

  committed
  6487979

  Copy full SHA for 6487979

• Extract FILENAMES["savedir"] into a static variable

  BevapDin

  committed
  a3226b5

  Copy full SHA for a3226b5

• Extract FILENAMES["autopickup"] into a static variable

  BevapDin

  committed
  a3f8f35

  Copy full SHA for a3f8f35

• Extract FILENAMES["keymap"] into a static variable

  BevapDin

  committed
  563beea

  Copy full SHA for 563beea

• Extract FILENAMES["options"] into a static variable

  BevapDin

  committed
  8c41afa

  Copy full SHA for 8c41afa

• Extract FILENAMES["memorialdir"] into a static variable

  BevapDin

  committed
  80ef175

  Copy full SHA for 80ef175

• Second inlining of values of FILENAMES.

  BevapDin

  committed
  408ceb6

  Copy full SHA for 408ceb6

• Third inlining of values of FILENAMES.

  BevapDin

  committed
  85ba013

  Copy full SHA for 85ba013

• Remove the FILENAMES map.

  Show description for 50a2aa1
  BevapDin

  committed
  50a2aa1

  Copy full SHA for 50a2aa1

• Inline code of update_datadir

  Show description for 6d23012
  BevapDin

  committed
  6d23012

  Copy full SHA for 6d23012

• Inline code of update_config_dir

  Show description for 32b6c16
  BevapDin

  committed
  32b6c16

  Copy full SHA for 32b6c16

• Change PATH_INFO::init_user_dir to take a std::string, instead of a C-String

  Show description for 6a6bdc1
  BevapDin

  committed
  6a6bdc1

  Copy full SHA for 6a6bdc1

• Rename parameter and remove unnecessary local variable

  BevapDin

  committed
  42735ad

  Copy full SHA for 42735ad

Commits on Nov 18, 2019

• Clarify skill upgrade amount at character creation

  Show description for c0bea81
  jbytheway

  committed
  c0bea81

  Copy full SHA for c0bea81

• Sort vehicle spawn list (from debug menu)

  Show description for af2f244
  jbytheway

  committed
  af2f244

  Copy full SHA for af2f244

• commit 1

  TJKing293

  committed
  387ffd5

  Copy full SHA for 387ffd5

• Add Salty Snacks List

  LilShiningMan

  committed
  5aaf711

  Copy full SHA for 5aaf711

• Fix Bionic Lighter power usage

  Show description for 28e0cc0
  anothersimulacrum

  committed
  28e0cc0

  Copy full SHA for 28e0cc0

• Merge pull request #35580 from anothersimulacrum/bio_lighter

  Show description for a6c8ece
  Rivet-the-Zombie

  authored
  a6c8ece

  Copy full SHA for a6c8ece

• Merge pull request #35579 from LilShiningMan/LSM---Salty-Snacks

  Show description for ab07167
  ZhilkinSerg

  authored
  ab07167

  Copy full SHA for ab07167

• Liter literal (#35574)

  Show description for dd3d5cc
  

  jbytheway

  authored and

  ZhilkinSerg

  committed
  dd3d5cc

  Copy full SHA for dd3d5cc

• Merge pull request #35576 from jbytheway/sort_vehicle_spawn_list

  Show description for 14a8951
  ZhilkinSerg

  authored
  14a8951

  Copy full SHA for 14a8951

• Merge pull request #35575 from jbytheway/skill_upgrade_hint

  Show description for 366e665
  ZhilkinSerg

  authored
  366e665

  Copy full SHA for 366e665

• Merge pull request #35570 from BevapDin/flh

  Show description for ada5fe8
  ZhilkinSerg

  authored
  ada5fe8

  Copy full SHA for ada5fe8

• Merge pull request #35569 from arijust/chitin_armor_fix

  Show description for 6f5278a
  ZhilkinSerg

  authored
  6f5278a

  Copy full SHA for 6f5278a

• Fix spells sometimes missing despite successful cast (#35568)

  Show description for 4ca4ae6
  

  FuelType-Memes

  authored and

  ZhilkinSerg

  committed
  4ca4ae6

  Copy full SHA for 4ca4ae6

• Fix gravel terrain. (#35567)

  Show description for 11de18e
  

  arijust

  authored and

  ZhilkinSerg

  committed
  11de18e

  Copy full SHA for 11de18e

• Fix a few exploits allowing safe consumption of mutant meat (#35573)

  Show description for f69236d
  

  Davi-DeGanne

  authored and

  ZhilkinSerg

  committed
  f69236d

  Copy full SHA for f69236d

• Merge pull request #35566 from sketchywyvern/master

  Show description for 2c596d7
  ZhilkinSerg

  authored
  2c596d7

  Copy full SHA for 2c596d7

• Gender-specific clothing on corpses, part two (#35558)

  Show description for a183046
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  a183046

  Copy full SHA for a183046

• Merge pull request #35544 from KorGgenT/add-extra-capabilities-to-mutation-copy-from

  Show description for 1f1810a
  ZhilkinSerg

  authored
  1f1810a

  Copy full SHA for 1f1810a

• update_mapgen: rotation fixes to solve the teleporting NPC issue (#35534)

  Show description for a15421e
  

  mlangsdorf

  authored and

  ZhilkinSerg

  committed
  a15421e

  Copy full SHA for a15421e

• Safe fuel Mode (#35205)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  d83ada4

  Copy full SHA for d83ada4

• Merge pull request #35528 from KorGgenT/fix-stamina-reductin-while-walking

  Show description for 3058022
  ZhilkinSerg

  authored
  3058022

  Copy full SHA for 3058022

• Make El.jackhammer charges/recipes consistent (#35456)

  Show description for f388e84
  

  arijust

  authored and

  ZhilkinSerg

  committed
  f388e84

  Copy full SHA for f388e84

• Fix for overlapping farm zones NPC Shuffle (#35518)

  Show description for 42bcb5a
  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  42bcb5a

  Copy full SHA for 42bcb5a

• Bionic menu clean up (#35221)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  a3b0f0f

  Copy full SHA for a3b0f0f

• Change flags for both UPS in Aftershock.

  arijust

  authored
  b6729e5

  Copy full SHA for b6729e5

• Fix compiling without localization

  Show description for 2b104cb
  ifreund

  committed
  2b104cb

  Copy full SHA for 2b104cb

• Edit volume of dive knife.

  arijust

  authored
  79251e5

  Copy full SHA for 79251e5

• Only add a repair item once to the list of possible repair items.

  Show description for 02d7e90
  BevapDin

  committed
  02d7e90

  Copy full SHA for 02d7e90

• Update npc.json (#35585)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  308efca

  Copy full SHA for 308efca

• Merge pull request #35587 from arijust/jumper_cables_aftershock

  Show description for 054ab91
  ZhilkinSerg

  authored
  054ab91

  Copy full SHA for 054ab91

• Merge pull request #35589 from arijust/dive_knife

  Show description for e7b31d5
  ZhilkinSerg

  authored
  e7b31d5

  Copy full SHA for e7b31d5

• Merge pull request #35588 from ifreund/fix-no-localization-compile

  Show description for 87d597c
  ZhilkinSerg

  authored
  87d597c

  Copy full SHA for 87d597c

• Merge pull request #35489 from curstwist/add-new-faction-camp-in-a-shelter

  Show description for e72a302
  ZhilkinSerg

  authored
  e72a302

  Copy full SHA for e72a302

• Improve item_location (de)serialization handling

  Show description for 2b9f517
  ifreund

  committed
  2b9f517

  Copy full SHA for 2b9f517

• Merge pull request #35593 from ifreund/migrate-item-locs

  Show description for dfe83da
  ZhilkinSerg

  authored
  dfe83da

  Copy full SHA for dfe83da

• Merge pull request #35590 from BevapDin/myt

  Show description for 86d409b
  ZhilkinSerg

  authored
  86d409b

  Copy full SHA for 86d409b

Commits on Nov 19, 2019

• Clarify vehicle storage message

  Show description for b303f63
  jbytheway

  committed
  b303f63

  Copy full SHA for b303f63

• Merge pull request #35595 from jbytheway/clarify_storage_message

  Show description for d0db81d
  Rivet-the-Zombie

  authored
  d0db81d

  Copy full SHA for d0db81d

• Update data/json/items/armor/bandolier.json

  Show description for 7e06daf
  

  TJKing293

  and

  matskuman5

  authored
  7e06daf

  Copy full SHA for 7e06daf

• Merge branch 'master' into add-stone-pouch

  TJKing293

  committed
  7539cb3

  Copy full SHA for 7539cb3

• Add loot to cloning room

  John-Candlebury

  committed
  6e5eaec

  Copy full SHA for 6e5eaec

Commits on Nov 20, 2019

• Replace hardcoded maths constants with named ones

  Show description for 2b7f9e3
  jbytheway

  committed
  2b7f9e3

  Copy full SHA for 2b7f9e3

• Merge pull request #34958 from ArcanErasmus/uncraftable-jumper-cables

  Show description for 41ef0cb
  Rivet-the-Zombie

  authored
  41ef0cb

  Copy full SHA for 41ef0cb

• Merge pull request #35613 from jbytheway/math_constants

  Show description for 2e7ae54
  ZhilkinSerg

  authored
  2e7ae54

  Copy full SHA for 2e7ae54

• Merge pull request #35607 from John-Candlebury/microlab-genetics

  Show description for 9fa8332
  ZhilkinSerg

  authored
  9fa8332

  Copy full SHA for 9fa8332

• NPC Construction Fix (#35604)

  Show description for bfd6f9c
  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  bfd6f9c

  Copy full SHA for bfd6f9c

• Npc can handle multipe power gen cbm (#35601)

  Show description for 14e05ae
  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  14e05ae

  Copy full SHA for 14e05ae

• Added "force fullscreen" option to Android prelaunch menu

  ZhilkinSerg

  committed
  1cbc12e

  Copy full SHA for 1cbc12e

• Disable "Software rendering" mode in Android prelaunch menu by default

  ZhilkinSerg

  committed
  6d9eb82

  Copy full SHA for 6d9eb82

• Lowered minimum sdk version to 14/26 from 16/28

  ZhilkinSerg

  committed
  0fccbe1

  Copy full SHA for 0fccbe1

• Don't add the weight of animals within items to vehicle weight

  Show description for d536146
  BevapDin

  committed
  d536146

  Copy full SHA for d536146

• Set item variable "weight" to milligrams, because that is used in item::weight when the value of that variable is loaded.

  BevapDin

  committed
  7b946fe

  Copy full SHA for 7b946fe

• Simplify code to get weight of critter.

  Show description for 2c59300
  BevapDin

  committed
  2c59300

  Copy full SHA for 2c59300

• Fix weight of animal container with contained animal:

  Show description for f17cea4
  BevapDin

  committed
  f17cea4

  Copy full SHA for f17cea4

• Shockwaves don't cross z-levels

  

  Fris0uman

  committed
  533b9b2

  Copy full SHA for 533b9b2

• Add regional terrain/furniture resolution to mapgen

  Show description for d3adb53
  ralreegorganon

  committed
  d3adb53

  Copy full SHA for d3adb53

Commits on Nov 21, 2019

• Merge pull request #35577 from TJKing293/add-stone-pouch

  Show description for 32e0c35
  Rivet-the-Zombie

  authored
  32e0c35

  Copy full SHA for 32e0c35

• MRE food list and Military List clean up

  LilShiningMan

  committed
  87b495e

  Copy full SHA for 87b495e

• Revert accidental change to spells_learned

  

  Fris0uman

  committed
  781c4d0

  Copy full SHA for 781c4d0

• magiclysm sidewalk removal

  curstwist

  committed
  dc89c27

  Copy full SHA for dc89c27

Commits on Nov 22, 2019

• Merge pull request #35647 from curstwist/magic-cabin-fix

  Show description for 64d7f6c
  Rivet-the-Zombie

  authored
  64d7f6c

  Copy full SHA for 64d7f6c

• Tell players about autoclaves (#35646)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  226cce1

  Copy full SHA for 226cce1

• Merge pull request #35644 from Fris0uman/revert_float

  Show description for c4c1962
  ZhilkinSerg

  authored
  c4c1962

  Copy full SHA for c4c1962

• Merge pull request #35640 from LilShiningMan/LSM---MRE-List

  Show description for dc3a1bf
  ZhilkinSerg

  authored
  dc3a1bf

  Copy full SHA for dc3a1bf

• Smoke field "body_part_env_resistance" changed from 12 to 7 (#35637)

  Show description for 369cc42
  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  369cc42

  Copy full SHA for 369cc42

• Update NPC faction from wasteland_scavenger to no_faction (#35633)

  Show description for 198a526
  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  198a526

  Copy full SHA for 198a526

• Merge pull request #35606 from BevapDin/hfu

  Show description for da9ae7c
  ZhilkinSerg

  authored
  da9ae7c

  Copy full SHA for da9ae7c

• Fixed crash when trying to change targeting mode of vehicle turrets (#35622)

  Show description for 0f93de3
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  0f93de3

  Copy full SHA for 0f93de3

• Merge pull request #35623 from ZhilkinSerg/android-2019-11-19

  Show description for a5962f4
  ZhilkinSerg

  authored
  a5962f4

  Copy full SHA for a5962f4

• Merge pull request #35625 from ZhilkinSerg/android-2019-11-20

  Show description for 5d5f93a
  ZhilkinSerg

  authored
  5d5f93a

  Copy full SHA for 5d5f93a

• Continue hauling after swapping positions with NPC/pet (#35583)

  Show description for 9c324c5
  

  ipcyborg

  authored and

  ZhilkinSerg

  committed
  9c324c5

  Copy full SHA for 9c324c5

• Add Auto start mode to power gen bionics (#35620)

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  c4ecb35

  Copy full SHA for c4ecb35

• Aftershock PrepNet Phyle Faction, mobs, locations (#35322)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  3fd65f1

  Copy full SHA for 3fd65f1

• Merge pull request #35628 from Fris0uman/shock_z

  Show description for 287240a
  ZhilkinSerg

  authored
  287240a

  Copy full SHA for 287240a

• Merge pull request #35627 from ralreegorganon/region-terrain-types

  Show description for c8611b4
  ZhilkinSerg

  authored
  c8611b4

  Copy full SHA for c8611b4

• Added "shrub with bee hive" furniture (#35323)

  Show description for 4b261b5
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  4b261b5

  Copy full SHA for 4b261b5