Code

Merging conflicts to pull down master#4

Code

Merged

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

+3,519-1,903

Commits

Commits on Feb 8, 2022

• Update appliances.json

  Testudo-Cultu

  authored
  4640277

  Copy full SHA for 4640277

Commits on Feb 9, 2022

• Don't prompt for stepping into thorny bush when you're in a mecha

  

  Valiant

  committed
  c038766

  Copy full SHA for c038766

Commits on Feb 10, 2022

• Disable the warning about mapgen in reality bubble

  Show description for 3a79a75
  jbytheway

  committed
  3a79a75

  Copy full SHA for 3a79a75

• Update tropical_terrain_flora.json

  Show description for ae0e97a
  Xaritscin

  authored
  ae0e97a

  Copy full SHA for ae0e97a

• Update tropical_reptile_amphibian.json

  Show description for ae8266b
  Xaritscin

  authored
  ae8266b

  Copy full SHA for ae8266b

• Print NPC attitude in List Items and Monsters menu

  

  Valiant

  committed
  006d20f

  Copy full SHA for 006d20f

• Increased width of List Items and Monsters menu from 45 to 55

  Show description for 60e043d
  

  Valiant

  committed
  60e043d

  Copy full SHA for 60e043d

• Function to check if utf8 string is whitespace or empty

  dseguin

  committed
  47eebbe

  Copy full SHA for 47eebbe

• Make window_panel::draw return height difference when drawing widgets

  dseguin

  committed
  e795179

  Copy full SHA for e795179

• Add W_DISABLED_WHEN_EMPTY flag

  dseguin

  committed
  0a3b2bd

  Copy full SHA for 0a3b2bd

• Use W_DISABLED_WHEN_EMPTY to track skipped lines when drawing widgets

  dseguin

  committed
  73502be

  Copy full SHA for 73502be

• Update documentation

  dseguin

  committed
  a0ff5f8

  Copy full SHA for a0ff5f8

• Multi-limbscore modifiers: Ability to specify multiple limb scores

  dseguin

  committed
  784c10c

  Copy full SHA for 784c10c

• Multi-limbscore modifiers: Jsonify fall damage modifier

  dseguin

  committed
  f6520a4

  Copy full SHA for f6520a4

• Multi-limbscore modifiers: Add capability for weighted lists

  dseguin

  committed
  25f67b1

  Copy full SHA for 25f67b1

• Multi-limbscore modifiers: JSONify slip prevention modifier

  dseguin

  committed
  054c07f

  Copy full SHA for 054c07f

• low steel → mild steel

  Faalagorn

  authored
  59716c1

  Copy full SHA for 59716c1

• Multi-limbscore modifiers: Unit tests

  dseguin

  committed
  0b6722b

  Copy full SHA for 0b6722b

• Multi-limbscore modifiers: Update documentation

  dseguin

  committed
  3a0a6e9

  Copy full SHA for 3a0a6e9

Commits on Feb 11, 2022

• Unit tests

  dseguin

  committed
  7fbdb1e

  Copy full SHA for 7fbdb1e

• Let standing lamps be constructed using lightstrips

  Show description for 6292469
  ccaviness

  committed
  6292469

  Copy full SHA for 6292469

• Merge pull request #55260 from Xaritscin/TropiCAta-0.6b

  Show description for cc83f7a
  Rivet-the-Zombie

  authored
  cc83f7a

  Copy full SHA for cc83f7a

• Reuse the input_context in uilists and create queues only from available hotkeys

  haveric

  committed
  18256de

  Copy full SHA for 18256de

• Created json version of mi-go portal

  

  Valiant

  committed
  2d6758c

  Copy full SHA for 2d6758c

• Removed mi-go portal from mx_portal_in map extra

  

  Valiant

  committed
  781f8d0

  Copy full SHA for 781f8d0

• Added ERASE_ALL_BEFORE_PLACING_TERRAIN flag

  

  Valiant

  committed
  c71bc16

  Copy full SHA for c71bc16

• added bow saw as an alternative to wood saw for misc repair kit recipe (#55039)

  Show description for f49ffd5
  

  SenpaiSlime

  and

  Maleclypse

  authored
  f49ffd5

  Copy full SHA for f49ffd5

• Implements EOCs in activated mutations and bionics and makes EOC spells targetable as an option (#55044)

  Show description for 0df5cf2
  MylieDaniels

  authored
  0df5cf2

  Copy full SHA for 0df5cf2

• Add a forge as placeable appliance (#55131)

  Show description for 2eae464
  Xenoamor

  authored
  2eae464

  Copy full SHA for 2eae464

• Add small and large space heater appliances (#55140)

  Show description for 454befe
  

  Xenoamor

  and

  Joshua Booth

  authored
  454befe

  Copy full SHA for 454befe

• Use real keybinds for the tutorial and improve tutorial readability (#55230)

  Show description for 6585fef
  

  haveric

  and

  dseguin

  authored
  6585fef

  Copy full SHA for 6585fef

• adding SUN_GLASSES to clothing_flags_description in armor_layers.cpp

  Show description for 264f133
  Kamejeir

  committed
  264f133

  Copy full SHA for 264f133

• Deconstruct kevlar sheet into threads (#55235)

  Show description for e2d561b
  anoobindisguise

  authored
  e2d561b

  Copy full SHA for e2d561b

• Fix tried to put an item (fn57) count (1) in a container (holster) (#55236)

  Show description for 4d55d54
  linonetwo

  authored
  4d55d54

  Copy full SHA for 4d55d54

• Minor character modifier / limb score tweaks (#55239)

  Venera3

  authored
  8ef30be

  Copy full SHA for 8ef30be

• Increase performance of item processing of contained items (#55240)

  Show description for 7b2354a
  Hirmuolio

  authored
  7b2354a

  Copy full SHA for 7b2354a

• Say "You pushed your mount" only if it was really done (#55242)

  

  Anton Burmistrov

  authored
  cd8bacd

  Copy full SHA for cd8bacd

• Armored monsters won't avoid sharp terrain no more (#55243)

  

  Anton Burmistrov

  authored
  fccacf1

  Copy full SHA for fccacf1

• Replaced i_add with add_or_drop in vaccine and flu_vaccine iuse actions (#55244)

  

  Anton Burmistrov

  authored
  d796e6e

  Copy full SHA for d796e6e

• Add tool qualities to craft XS metal arm guards (#55245)

  VitreousEyes110

  authored
  2630cf3

  Copy full SHA for 2630cf3

• Give medical residents a doctor's badge (#55250)

  caethan

  authored
  3f93ac3

  Copy full SHA for 3f93ac3

Commits on Feb 12, 2022

• Merge pull request #55253 from dseguin/multi_limbscore_modifiers

  Show description for a87e677
  kevingranade

  authored
  a87e677

  Copy full SHA for a87e677

• Make hyper-metabolism obtainable (#55254)

  MylieDaniels

  authored
  2219cab

  Copy full SHA for 2219cab

• Set the correct furniture id for box_large_reinforced (#55256)

  Show description for ee956f5
  ccaviness

  authored
  ee956f5

  Copy full SHA for ee956f5

• "u_set_queue_eoc" -> "queue_eocs"

  dseguin

  committed
  8099626

  Copy full SHA for 8099626

• Nest mapgen fixes Dinomod

  Maleclypse

  committed
  20970e2

  Copy full SHA for 20970e2

• Merge pull request #55259 from dseguin/widget_auto_disable

  Show description for d1d7da9
  kevingranade

  authored
  d1d7da9

  Copy full SHA for d1d7da9

• Document tl;dr for running Cata clang tidy in Ubuntu and WSL (#55261)

  akrieger

  authored
  cd09b05

  Copy full SHA for cd09b05

• Merge pull request #55262 from Night-Pryanik/attitude

  Show description for fceade6
  kevingranade

  authored
  fceade6

  Copy full SHA for fceade6

• Update armor names (#55264)

  Show description for 10713ee
  Drew4484

  authored
  10713ee

  Copy full SHA for 10713ee

• If blood is drawn from corpse of a monster from ZOMBIE species, convert blood to tainted blood (#55267)

  

  Anton Burmistrov

  authored
  3f7f544

  Copy full SHA for 3f7f544

• Fixing up gambesons (#55258)

  Aerin-of-the-Toast

  authored
  bf47c61

  Copy full SHA for bf47c61

• Fix Warmth On New Platemail (#55269)

  Show description for 9506ebd
  bombasticSlacks

  authored
  9506ebd

  Copy full SHA for 9506ebd

• Merge pull request #55302 from dseguin/fix_eoc_varname

  Show description for 1b9ac91
  ZhilkinSerg

  authored
  1b9ac91

  Copy full SHA for 1b9ac91

• skill_rust_multiplier in mutations does something now (#55275)

  MylieDaniels

  authored
  79f6e8b

  Copy full SHA for 79f6e8b

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

  Show description for 0cb5094
  ZhilkinSerg

  authored
  0cb5094

  Copy full SHA for 0cb5094

• Made lanyard, travel wallet, and Foodperson's cape power armor compatible (#55279)

  drhead

  authored
  b69e2cc

  Copy full SHA for b69e2cc

• Dive underwater after climbing down onto a tile with DEEP_WATER flag (#55281)

  

  Anton Burmistrov

  authored
  a21793a

  Copy full SHA for a21793a

• If floor has collapsed, trigger a trap on former floor tile (#55282)

  

  Anton Burmistrov

  authored
  94a9dc3

  Copy full SHA for 94a9dc3

• [Magiclysm] Adds rigid to thread generators (#55284)

  Show description for 99f9013
  Waladil

  authored
  99f9013

  Copy full SHA for 99f9013

• Chloromorph Permits Forced Sleep (#55184)

  Show description for 8c921ca
  

  5 peopleauthored
  8c921ca

  Copy full SHA for 8c921ca

• Making jeans less encumbering and motorcycle pants more accurate to their jean roots. (#55285)

  Show description for 2bd56eb
  Aerin-of-the-Toast

  authored
  2bd56eb

  Copy full SHA for 2bd56eb

• Add clay canning pot (#55247)

  

  AtomicFox556

  authored
  d7f15ce

  Copy full SHA for d7f15ce

• Merge pull request #55291 from Night-Pryanik/mi-go-portal-map-extra-2-OM-special

  Show description for 456bf80
  kevingranade

  authored
  456bf80

  Copy full SHA for 456bf80

• Merge pull request #55225 from Testudo-Cultu/Testudo-Cultu-patch-1

  Show description for 8627796
  ZhilkinSerg

  authored
  8627796

  Copy full SHA for 8627796

• Merge pull request #55280 from ccaviness/lamp

  Show description for a0f87c1
  ZhilkinSerg

  authored
  a0f87c1

  Copy full SHA for a0f87c1

• Merge pull request #55234 from Night-Pryanik/dont-prompt-armored-mounts

  Show description for 1bf6bb0
  ZhilkinSerg

  authored
  1bf6bb0

  Copy full SHA for 1bf6bb0

• Gave the zweihander the reach attack flag (#53416)

  Lady-Aranae

  authored
  21a6383

  Copy full SHA for 21a6383

• Merge pull request #55299 from jbytheway/disable_tinymap_load_warning

  Show description for 261d771
  ZhilkinSerg

  authored
  261d771

  Copy full SHA for 261d771

• Merge pull request #55304 from Maleclypse/Dinomod-Mapgen-fix

  Show description for 4fd2f4f
  ZhilkinSerg

  authored
  4fd2f4f

  Copy full SHA for 4fd2f4f

• Merge pull request #55300 from Kamejeir/add-SUN_GLASSES-to-clothing_flags_description-in-armor_layers.cpp

  Show description for 1a384ce
  ZhilkinSerg

  authored
  1a384ce

  Copy full SHA for 1a384ce

• Fix portal storm indoor smoke, reduce warning (#55297)

  Ramza13

  authored
  6d18cd7

  Copy full SHA for 6d18cd7

• Merge pull request #55288 from haveric/key-conflicts

  Show description for ca6bc5d
  ZhilkinSerg

  authored
  ca6bc5d

  Copy full SHA for ca6bc5d

• Made Flakey Coverage Test Wider (#55286)

  bombasticSlacks

  authored
  f70cf38

  Copy full SHA for f70cf38

• Change the workbench to drop its item form upon deconstruction (#55268)

  KittyTac

  authored
  4b9fa51

  Copy full SHA for 4b9fa51

• Reworking the touring suit. (#55263)

  Aerin-of-the-Toast

  authored
  4a01eea

  Copy full SHA for 4a01eea

• Added Bō to weapons (#55033)

  VarrenKrytor

  authored
  ead55d1

  Copy full SHA for ead55d1

• Added a watertight bucket-type "pocket" for liquids to crucibles

  

  Anton Burmistrov

  committed
  084f48a

  Copy full SHA for 084f48a

• Merge pull request #55307 from Night-Pryanik/crucible-can-hold-liquids

  Show description for fbd5ba7
  Rivet-the-Zombie

  authored
  fbd5ba7

  Copy full SHA for fbd5ba7

• Adds Bōjutsu Martial Art (#50010)

  SantosValourion

  authored
  e27abe9

  Copy full SHA for e27abe9

• variable name typo

  Hirmuolio

  committed
  86a6a7c

  Copy full SHA for 86a6a7c

• remove radiation from hard-coded craters too

  kevingranade

  authored
  d27c58b

  Copy full SHA for d27c58b

• more rad removal

  kevingranade

  authored
  ac510bd

  Copy full SHA for ac510bd

• Merge pull request #55317 from CleverRaven/kevingranade-no-rad

  Show description for 13a4346
  ZhilkinSerg

  authored
  13a4346

  Copy full SHA for 13a4346

• Zweihander fix (#55321)

  TealcOneill

  authored
  9fa6ac1

  Copy full SHA for 9fa6ac1

• Crafting test: Don't fill tools with BOIL when preparing craft (#55324)

  dseguin

  authored
  273e168

  Copy full SHA for 273e168

• JSONify health widget: Add condition for character health

  dseguin

  committed
  0830182

  Copy full SHA for 0830182

• JSONify health widget: Use conditional clauses

  dseguin

  committed
  d0ad2b7

  Copy full SHA for d0ad2b7

• JSONify health widget: Remove obsolete display function

  dseguin

  committed
  697bb16

  Copy full SHA for 697bb16

• JSONify health widget: Unit test & update doc

  dseguin

  committed
  f0e71a4

  Copy full SHA for f0e71a4

Commits on Feb 13, 2022

• Nomad armor overhaul (#53567)

  bombasticSlacks

  authored
  a5f73bc

  Copy full SHA for a5f73bc

• Merge pull request #55320 from dseguin/widget_migrate_health

  Show description for cff82b3
  kevingranade

  authored
  cff82b3

  Copy full SHA for cff82b3

• Convert motor bearings to charges (#55326)

  haveric

  authored
  275f700

  Copy full SHA for 275f700

• Add PALS_LARGE to single point sling (#55289)

  PlutusPleion

  authored
  a878f2e

  Copy full SHA for a878f2e

• Update locations.json (#55329)

  Drew4484

  authored
  5571d91

  Copy full SHA for 5571d91

• Merge pull request #55312 from Hirmuolio/typo

  Show description for 919d0fc
  Rivet-the-Zombie

  authored
  919d0fc

  Copy full SHA for 919d0fc

• Nested mapgen fix mi-go (#55343)

  Show description for 001d98b
  Maleclypse

  authored
  001d98b

  Copy full SHA for 001d98b

Commits on Feb 14, 2022

• Typos bad

  TheShadowFerret

  committed
  182dd1f

  Copy full SHA for 182dd1f

• Fix typo and add @dseguin to CODEOWNERS (#55359)

  dseguin

  authored
  a6e664e

  Copy full SHA for a6e664e

• Merge pull request #55362 from TheShadowFerret/Typos

  Show description for a8f310d
  Rivet-the-Zombie

  authored
  a8f310d

  Copy full SHA for a8f310d