Code

merging conflicts#5

Code

Merged

a-chancey merged 107 commits intoa-chancey:TailoringRecipeOverhaul-Cottona-chancey/Cataclysm-DDA:TailoringRecipeOverhaul-Cottonfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardFeb 23, 2022

+7,685-3,606

Commits

Commits on Feb 15, 2022

• Player is immune to deafing effect is he is already deaf

  

  Valiant

  committed
  ef214cb

  Copy full SHA for ef214cb

Commits on Feb 17, 2022

• Add string compare condition

  Ramza13

  committed
  5a68f03

  Copy full SHA for 5a68f03

• Add setting string and message tags

  Ramza13

  committed
  2ca1b8e

  Copy full SHA for 2ca1b8e

• Update debug_menu.cpp

  Ramza13

  committed
  8c26659

  Copy full SHA for 8c26659

• cleanup

  Ramza13

  committed
  3122f4d

  Copy full SHA for 3122f4d

• Remove mentions of vitA and vitB

  

  Fris0uman

  committed
  4265ea5

  Copy full SHA for 4265ea5

• Obsolete vitA and vitB

  

  Fris0uman

  committed
  98f204f

  Copy full SHA for 98f204f

• Obsolete vitB injection

  

  Fris0uman

  committed
  38c2dfd

  Copy full SHA for 38c2dfd

• Remove vitA and vitB from mods

  

  Fris0uman

  committed
  bfabe67

  Copy full SHA for bfabe67

• remove vitA and vitB from code

  

  Fris0uman

  committed
  2c00407

  Copy full SHA for 2c00407

• remove vitA and vitB from tests

  

  Fris0uman

  committed
  d346eb4

  Copy full SHA for d346eb4

• remove legacy handling of deficiencies

  

  Fris0uman

  committed
  379d4ad

  Copy full SHA for 379d4ad

• Update bandolier.json

  ZombieZilla

  authored
  e819266

  Copy full SHA for e819266

• lint

  ZombieZilla

  authored
  3bddd44

  Copy full SHA for 3bddd44

• fixes

  

  Fris0uman

  committed
  23dabb4

  Copy full SHA for 23dabb4

Commits on Feb 18, 2022

• Prevent error when trying to pick up items and wielding the container

  haveric

  committed
  04826e4

  Copy full SHA for 04826e4

Commits on Feb 19, 2022

• More robust test for multi material portions (#55461)

  Show description for 90b1c80
  bombasticSlacks

  authored
  90b1c80

  Copy full SHA for 90b1c80

• Chainmail standardization (#55455)

  Show description for 9f25f7c
  

  Drew4484

  and

  casswedson

  authored
  9f25f7c

  Copy full SHA for 9f25f7c

• Lightening up the hard chest/arm/leg guards a bit. (#55378)

  Show description for d5c8ddd
  

  Aerin-of-the-Toast

  and

  bombasticSlacks

  authored
  d5c8ddd

  Copy full SHA for d5c8ddd

• Merge pull request #55380 from Ramza13/string_vars

  Show description for 27ab2a5
  kevingranade

  authored
  27ab2a5

  Copy full SHA for 27ab2a5

• Renamed allow_melee martial arts attribute

  Hymore246

  committed
  7e21013

  Copy full SHA for 7e21013

Commits on Feb 20, 2022

• Update arms_armor.json

  Show description for 6303b07
  Drew4484

  committed
  6303b07

  Copy full SHA for 6303b07

• Additional TLC Finales (#55445)

  bombasticSlacks

  authored
  2250ecb

  Copy full SHA for 2250ecb

• Prevent crash when displaying weapon name of guns with no mode (#55500)

  dseguin

  authored
  edb9f92

  Copy full SHA for edb9f92

• Ignore autopickup setting when transfering liquids (#55497)

  dseguin

  authored
  f889ed9

  Copy full SHA for f889ed9

• Merge pull request #55470 from ZombieZilla/stone_pebble_pouch

  Show description for f0f6f19
  Rivet-the-Zombie

  authored
  f0f6f19

  Copy full SHA for f0f6f19

• Chainlink fence

  Venera3

  committed
  af9af5d

  Copy full SHA for af9af5d

• materials defense values can be floats

  bombasticSlacks

  committed
  f01fea1

  Copy full SHA for f01fea1

• Fix item info test

  

  Fris0uman

  committed
  5981319

  Copy full SHA for 5981319

• Increased the manhacks accuracy (#55516)

  bombasticSlacks

  authored
  728eb52

  Copy full SHA for 728eb52

• Create spell accuracy stat (#55502)

  KorGgenT

  authored
  0b90c60

  Copy full SHA for 0b90c60

• Force pull all translations from Transifex (#55530)

  BrettDong

  authored
  e54b46e

  Copy full SHA for e54b46e

• Polish COMPILING-VS-VCPKG.md with more thorough instructions. (#55467)

  akrieger

  authored
  5822d67

  Copy full SHA for 5822d67

• strait -> straight

  haveric

  committed
  2f6285a

  Copy full SHA for 2f6285a

• chestrig → chest rig

  Faalagorn

  authored
  dd1e863

  Copy full SHA for dd1e863

• Add alternative black gunpowder recipe and update original recipe (#55486)

  Show description for 51e44ef
  

  ElfLeaderMike

  and

  kevingranade

  authored
  51e44ef

  Copy full SHA for 51e44ef

• Migrate map::abs_sub to typesafe point

  Show description for 72741cf
  jbytheway

  committed
  72741cf

  Copy full SHA for 72741cf

Commits on Feb 21, 2022

• Variant fixes: Exclude appliances from vehicle part variants

  dseguin

  committed
  9441d44

  Copy full SHA for 9441d44

• Variant fixes: Split base variants and shapes when installing parts

  dseguin

  committed
  dd656a4

  Copy full SHA for dd656a4

• fix sabatons having two left feet

  nornagon

  authored
  3b48ea3

  Copy full SHA for 3b48ea3

• add 1st_aid_box to neodays

  nornagon

  committed
  d1f4563

  Copy full SHA for d1f4563

• Variant fixes: Use different names for windshield parts

  dseguin

  committed
  2435f02

  Copy full SHA for 2435f02

• ammount -> amount

  haveric

  committed
  362017f

  Copy full SHA for 362017f

• hosptial -> hospital

  haveric

  committed
  68476c3

  Copy full SHA for 68476c3

• enshrine test clothing for encumbrance test (#55457)

  bombasticSlacks

  authored
  d055515

  Copy full SHA for d055515

• Removed extra use guns space

  haveric

  committed
  2014826

  Copy full SHA for 2014826

• Merge pull request #55545 from nornagon/patch-13

  Show description for de5b5f9
  ZhilkinSerg

  authored
  de5b5f9

  Copy full SHA for de5b5f9

• Merge pull request #55553 from haveric/hospital

  Show description for d84836e
  ZhilkinSerg

  authored
  d84836e

  Copy full SHA for d84836e

• Merge pull request #55547 from nornagon/1st_aid_box_neodays

  Show description for db28490
  ZhilkinSerg

  authored
  db28490

  Copy full SHA for db28490

• Add dialog functions for portal storm doors opening/closing and being taken away briefly. (#55538)

  Show description for c468f8f
  Ramza13

  authored
  c468f8f

  Copy full SHA for c468f8f

• Merge pull request #55542 from Faalagorn/patch-1

  Show description for 51c2ae0
  ZhilkinSerg

  authored
  51c2ae0

  Copy full SHA for 51c2ae0

• [AFS] fix some typos (#55539)

  Show description for 9e5e99b
  

  casswedson

  and

  Maleclypse

  authored
  9e5e99b

  Copy full SHA for 9e5e99b

• Merge pull request #55537 from haveric/straight

  Show description for 0986ea0
  ZhilkinSerg

  authored
  0986ea0

  Copy full SHA for 0986ea0

• Merge pull request #55517 from Drew4484/Chainmail-naming-translations

  Show description for 598d4ba
  ZhilkinSerg

  authored
  598d4ba

  Copy full SHA for 598d4ba

• Fix reported version of newer Windows 10 releases (#55506)

  xuvatilavv

  authored
  b6a616b

  Copy full SHA for b6a616b

• Dana Nunez: Fix unreachable dialogue (#55465)

  hexagonrecursion

  authored
  9a3790b

  Copy full SHA for 9a3790b

• Clarify the "In a Pickle" mission description (#55464)

  hexagonrecursion

  authored
  e1f6cdb

  Copy full SHA for e1f6cdb

• Don't increase broken bones stat when bones are already broken (#55458)

  haveric

  authored
  944ae8a

  Copy full SHA for 944ae8a

• Merge pull request #55396 from Night-Pryanik/deaf

  Show description for 547374c
  ZhilkinSerg

  authored
  547374c

  Copy full SHA for 547374c

• Allow Letter Opener to be disassembled (#55494)

  AdamChirnside

  authored
  f3d385d

  Copy full SHA for f3d385d

• Fixed camp trapping (#55478)

  PatrikLundell

  authored
  f5cd415

  Copy full SHA for f5cd415

• Add debug mana mutation to magiclysm (#55473)

  GuardianDll

  authored
  b981ab3

  Copy full SHA for b981ab3

• Merge pull request #55510 from jbytheway/more_point_type_safety

  Show description for c73c936
  ZhilkinSerg

  authored
  c73c936

  Copy full SHA for c73c936

• Merge pull request #55515 from Hymore246/allowed-melee-rename

  Show description for acf00d3
  ZhilkinSerg

  authored
  acf00d3

  Copy full SHA for acf00d3

• Merge pull request #55529 from bombasticSlacks/float_mats

  Show description for 158205f
  ZhilkinSerg

  authored
  158205f

  Copy full SHA for 158205f

• Re-add lost meats to meat_nofish recipes

  ElfLeaderMike

  committed
  553f299

  Copy full SHA for 553f299

• Add leather jacket uncraft recipe

  ElfLeaderMike

  committed
  b77792a

  Copy full SHA for b77792a

• Removed the Talon

  bombasticSlacks

  committed
  93fa19a

  Copy full SHA for 93fa19a

• Merge pull request #55560 from ElfLeaderMike/leather-jacket-uncraft-recipe

  Show description for 6c74cc8
  Rivet-the-Zombie

  authored
  6c74cc8

  Copy full SHA for 6c74cc8

• Hide toggle minimap hint if no keys are bound to it

  haveric

  committed
  054abab

  Copy full SHA for 054abab

• Misc cleanup - newline at eof, no manual id load

  Show description for 583b0bb
  anothersimulacrum

  committed
  583b0bb

  Copy full SHA for 583b0bb

• Remove duplicate JSON entries: data/json

  Show description for 430cce7
  anothersimulacrum

  committed
  430cce7

  Copy full SHA for 430cce7

• Remove duplicate JSON entries: Aftershock

  Show description for 87e85c0
  anothersimulacrum

  committed
  87e85c0

  Copy full SHA for 87e85c0

• Remove duplicate JSON entires: CRT Expansion

  Show description for d6a89f3
  anothersimulacrum

  committed
  d6a89f3

  Copy full SHA for d6a89f3

• Remove duplicate JSON entries: Dark Skies Above

  Show description for 8b3c4c4
  anothersimulacrum

  committed
  8b3c4c4

  Copy full SHA for 8b3c4c4

• Remove duplicate JSON entries: Graphical Overmap

  anothersimulacrum

  committed
  5952073

  Copy full SHA for 5952073

• Remove duplicate JSON entries: alt map key

  anothersimulacrum

  committed
  8850aae

  Copy full SHA for 8850aae

• Remove duplicate JSON entries: innawoods

  Show description for fcb0043
  anothersimulacrum

  committed
  fcb0043

  Copy full SHA for fcb0043

• Add duplicate checking to generic factory

  Show description for 3652933
  anothersimulacrum

  committed
  3652933

  Copy full SHA for 3652933

• Ensure 'src' is assigned for specially created obj

  Show description for a6148ef
  anothersimulacrum

  committed
  a6148ef

  Copy full SHA for a6148ef

• Add 'src' to (almost) all generic factory types

  Show description for 299aff7
  anothersimulacrum

  committed
  299aff7

  Copy full SHA for 299aff7

• Merge pull request #55466 from Fris0uman/vitamins

  Show description for d13be28
  kevingranade

  authored
  d13be28

  Copy full SHA for d13be28

• Remove climate control kit from nomad harness

  Jarewill

  authored
  1d367d5

  Copy full SHA for 1d367d5

• Add a dive shop location (#55535)

  Show description for 6ca3ef2
  ccaviness

  authored
  6ca3ef2

  Copy full SHA for 6ca3ef2

• Merge pull request #55495 from anothersimulacrum/duplicates

  Show description for 7015770
  ZhilkinSerg

  authored
  7015770

  Copy full SHA for 7015770

• Merge pull request #55551 from haveric/amount

  Show description for c31c6d3
  ZhilkinSerg

  authored
  c31c6d3

  Copy full SHA for c31c6d3

• Merge pull request #55401 from Venera3/limb_chainlink

  Show description for 6db975c
  ZhilkinSerg

  authored
  6db975c

  Copy full SHA for 6db975c

• Merge pull request #55477 from haveric/pocket-wield

  Show description for 2f2d0da
  ZhilkinSerg

  authored
  2f2d0da

  Copy full SHA for 2f2d0da

• Merge pull request #55556 from haveric/extra-space-follower-text

  Show description for 512457a
  ZhilkinSerg

  authored
  512457a

  Copy full SHA for 512457a

• Fix repair difficulty for combat blouse and shirt (#55552)

  drhead

  authored
  32b1b0f

  Copy full SHA for 32b1b0f

• Merge pull request #55559 from ElfLeaderMike/meat_nofish-recipe-updates

  Show description for 5e4a356
  ZhilkinSerg

  authored
  5e4a356

  Copy full SHA for 5e4a356

• Merge pull request #55562 from haveric/toggle-minimap

  Show description for 4aeddde
  ZhilkinSerg

  authored
  4aeddde

  Copy full SHA for 4aeddde

• Waterproof smartphone case (#55558)

  Show description for 90643e7
  

  3 peopleauthored
  90643e7

  Copy full SHA for 90643e7

• Merge pull request #55561 from bombasticSlacks/remove-RL-Bot

  Show description for 4fa0273
  ZhilkinSerg

  authored
  4fa0273

  Copy full SHA for 4fa0273

• Give firefigher and police belts defined thickness (#55557)

  anoobindisguise

  authored
  552323c

  Copy full SHA for 552323c

• Prevent selected NPC jumping to the top in training session menus (#55432)

  haveric

  authored
  90f84f4

  Copy full SHA for 90f84f4

• Added holster info to pockets (#55548)

  bombasticSlacks

  authored
  1d8d194

  Copy full SHA for 1d8d194

• Adds new fine grinding quality to mortar and pestle + recipe updates (#55518)

  ElfLeaderMike

  authored
  fca5849

  Copy full SHA for fca5849

• TropiCata: Plants vs Zombies (#55476)

  Xaritscin

  authored
  e81ea01

  Copy full SHA for e81ea01

• Merge pull request #55565 from Jarewill/nomad-harness-fix

  Show description for 4c5cefe
  ZhilkinSerg

  authored
  4c5cefe

  Copy full SHA for 4c5cefe

• Misc overmap_terrain edits (#55485)

  Show description for 5dc01a4
  LovamKicsiGazsii

  authored
  5dc01a4

  Copy full SHA for 5dc01a4

• Merge pull request #55543 from dseguin/fix_veh_variants

  Show description for a139c2e
  kevingranade

  authored
  a139c2e

  Copy full SHA for a139c2e

• Add filthy flag to CBMs from zomborgs

  

  Fris0uman

  committed
  0005e8e

  Copy full SHA for 0005e8e

Commits on Feb 22, 2022

• Merge pull request #55576 from Fris0uman/filthy_borg

  Show description for 30df995
  Rivet-the-Zombie

  authored
  30df995

  Copy full SHA for 30df995

• Give military flight suit a repairs_like value

  drhead

  authored
  e8a2685

  Copy full SHA for e8a2685

• changed fancy flight suit too

  drhead

  authored
  9b43033

  Copy full SHA for 9b43033

Commits on Feb 23, 2022

• Merge pull request #55599 from drhead/flight-suit-repair

  Show description for 8f8e2b4
  Rivet-the-Zombie

  authored
  8f8e2b4

  Copy full SHA for 8f8e2b4