Code

[WIP] Merging manual conflicts again#3

Code

Merged

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

+8,928-1,892

Commits

Commits on Jan 29, 2022

• Allow mixing pocket pickup rules

  Show description for d6a2fc9
  matshou

  committed
  d6a2fc9

• Make pockets look inside containers

  matshou

  committed
  278c842

• Rename pocket unit test file

  matshou

  committed
  6a186a8

• Write tests for mixing pickup rules

  matshou

  committed
  8cf13d2

• Fix pocket pickup rules not working

  matshou

  committed
  9c1e8f4

• Test item pocket container pickup rules

  matshou

  committed
  29e24db

• Change item pocket test tags

  matshou

  committed
  fcbfd5b

• Write code documentation

  matshou

  committed
  9c39170

• Do code refactoring

  matshou

  committed
  13706ac

Commits on Feb 1, 2022

• Check for null from ammo_current()

  dseguin

  committed
  768585e

• Fix remaining instances of passing null object to ammo_capacity()

  dseguin

  committed
  9df1953

Commits on Feb 2, 2022

• Unit test

  dseguin

  committed
  0eef328

• Adding salt water pipe and tannery to workshop version 2

  PatrikLundell

  committed
  80f8e11

• Add time to recipe and move it out of generic "recipe_others.json"

  Moumix3

  committed
  a1cc3e4

• remove tab at end of line

  Moumix3

  committed
  7d86958

• remove duplicate requirement

  Moumix3

  committed
  21fde21

• resolved confict

  PatrikLundell

  committed
  c60f5db

• corrected spell checker issues

  PatrikLundell

  committed
  7d79603

• addressed code analysis issues

  PatrikLundell

  committed
  6fc97ba

• submitted to clang-tidy demands

  PatrikLundell

  committed
  33f61ee

• submitted to clang-tidy demands

  PatrikLundell

  committed
  9cd5a01

• removed offensive semicolon

  PatrikLundell

  committed
  55bb26a

• double blanks...

  PatrikLundell

  committed
  0da21a9

• Add an entry for the diary in the Action Menu (under Info)

  DeeUnderscore

  committed
  b081434

Commits on Feb 3, 2022

• Merge pull request #55024 from Moumix3/magnifying_glass

  Show description for 97d8c8b
  Rivet-the-Zombie

  authored
  97d8c8b

• Added pants and leg armor to class

  Show description for dc43a34
  KeaneCarotenuto

  committed
  dc43a34

• unrelated constant removal demands

  PatrikLundell

  committed
  31b0585

• added missing save/load serialization

  PatrikLundell

  committed
  44e21fc

• submitted to clang-tidy demands

  PatrikLundell

  committed
  f92c601

• Optimize shot_features and shot_features_with_choke test

  BrettDong

  committed
  e8d6f32

• Update shot_features and shot_features_with_choke test expected values

  BrettDong

  committed
  6d03a2e

• Shift creature positions in coverage test (#55037)

  BrettDong

  authored
  edc3055

• Merge pull request #55063 from BrettDong/shot_features

  Show description for c3c92d1
  kevingranade

  authored
  c3c92d1

• Optimize JSON validation on CI (#55060)

  BrettDong

  authored
  70e72b4

• Expand widget clauses: Added new conditions

  dseguin

  committed
  460c0c8

• Expand widget clauses: Add conditional functions to phrases

  dseguin

  committed
  d39e15d

• Expand widget clauses: JSONify bp_status_text

  dseguin

  committed
  cd588e0

• Expand widget clauses: JSONify bp_status_sym_text

  dseguin

  committed
  0854dcb

• Expand widget clauses: JSONify bp_status_legend_text

  dseguin

  committed
  1205b8f

• Expand widget clauses: Documentation

  dseguin

  committed
  87be5c3

• Expand widget clauses: Unit tests

  dseguin

  committed
  c07b9c6

• Expand widget clauses: "phrase" -> "clause"

  Show description for 9d96d82
  

  dseguin

  and

  wapcaplet

  committed
  9d96d82

• Ordered strings

  kevingranade

  authored
  be90bd7

• Robofac Hybrid Weapons Platform (#54723)

  Show description for 05d6d4e
  

  bombasticSlacks

  and

  chaohedgehogs

  authored
  05d6d4e

• Merge pull request #54812 from matshou/feat/pocket-fav

  Show description for 0d88094
  kevingranade

  authored
  0d88094

• Remove redundant null terrains from mapgen (#54959)

  Show description for 587ccba
  jbytheway

  authored
  587ccba

• Mutation armor (#54966)

  Show description for fa25c79
  Venera3

  authored
  fa25c79

• Merge pull request #54987 from dseguin/fix_veh_fill

  Show description for d3bd55c
  kevingranade

  authored
  d3bd55c

• added stick recipe (#54993)

  Show description for 9949aa3
  remuluson2

  authored
  9949aa3

• really just clarification (#54996)

  bombasticSlacks

  authored
  f7e93ba

• Aligns mutation.cpp with other uses of condition.cpp (#55004)

  Show description for 0e92ada
  MylieDaniels

  authored
  0e92ada

• Vitamin rates from mutations now scale sensibly (#55005)

  Show description for c935ac5
  MylieDaniels

  authored
  c935ac5

• Fix wrong calorie count on batch crafted foods (#55008)

  Show description for f8f74d2
  

  mqrause

  and

  NetSysFire

  authored
  f8f74d2

• Mechanics Practice recipes (#55010)

  Maleclypse

  authored
  3a30331

• move BARS to integrated (#55018)

  bombasticSlacks

  authored
  441677e

• Fix update_mapgen bug (#55021)

  Ramza13

  authored
  444abde

• Update requirements.txt for Pillow-9.0.0 (#55022)

  feinorgh

  authored
  a6b7d32

• Give a chance of another try if game is unable to find a valid starting location (#55025)

  Show description for f948178
  Night-Pryanik

  authored
  f948178

• Merge pull request #55026 from PatrikLundell/salt_water_pipe_project

  Show description for 267e6a5
  kevingranade

  authored
  267e6a5

• Portal Storm Tweaks (#55036)

  Ramza13

  authored
  3e2f403

• Lazy create level cache layers. (#55038)

  akrieger

  authored
  701f89f

Commits on Feb 4, 2022

• Cost allowance for "give_equipment" (#55048)

  dseguin

  authored
  a728b25

• Changed symbol and its color of mx_casings map extra (#55051)

  Night-Pryanik

  authored
  cc471d1

• Repair Nanobots are now sleep friendly (#55052)

  Show description for de82384
  Night-Pryanik

  authored
  de82384

• Link to libncursesw in CMake (#55054)

  BrettDong

  authored
  d489019

• Add ability to count character flags, move all trait flag checks over to character flag (#55061)

  Show description for 2c41bdf
  Venera3

  authored
  2c41bdf

• Fixed blocked nested chunks for hunting lodge's basement (#55064)

  Show description for 7a7d639
  Night-Pryanik

  authored
  7a7d639

• Rebalance test parallelism (#55065)

  BrettDong

  authored
  3f2ba3d

• Enhance limb healing functionality (#55069)

  Venera3

  authored
  c6e58fc

• Various item performance optimizations. (#55070)

  akrieger

  authored
  e514109

• Merge pull request #54693 from dseguin/widget_phrase_ext

  Show description for 07de00c
  kevingranade

  authored
  07de00c

• Make Clang 6 the basic build test configuration (#55059)

  BrettDong

  authored
  f654124

• Merge pull request #55057 from KeaneCarotenuto/#55043_Pants

  Show description for 9fb7080
  Rivet-the-Zombie

  authored
  9fb7080

• De-sentinel temporary effects (#55046)

  Show description for 9dc9a34
  Nerezza

  authored
  9dc9a34

• Add standing floodlight appliance (#55047)

  Show description for ff07260
  

  Xenoamor

  and

  Joshua Booth

  authored
  ff07260

• refactor inventory_multiselector and remove inventory_iuse_selector (#55072)

  Show description for df59d87
  

  mqrause

  and

  mqrause

  authored
  df59d87

• More Utility Exo Spawns (#55078)

  Show description for ad7e213
  Drew4484

  authored
  ad7e213

• Added low profile mag pockets to light ballistic vest (#55080)

  Show description for e68292b
  bombasticSlacks

  authored
  e68292b

• Make gourmand work as advertised (#55083)

  Show description for cfcdefb
  

  3 peopleauthored
  cfcdefb

• Fix typo in GitHub Actions CI test script (#55084)

  BrettDong

  authored
  b175519

• Fix compile error on macOS (#55085)

  BrettDong

  authored
  b5fddbb

• Unhardcode grass cutting and add a stone sickle (#55086)

  Show description for de49cd7
  NetSysFire

  authored
  de49cd7

• Add VARSIZE to gloves_light (#55087)

  Jarewill

  authored
  93d8b77

• Skip installing SDL2 on ncurses build on GHA (#55088)

  BrettDong

  authored
  f365508

• Fix water temperature from vehicle faucets (#55092)

  Show description for 1c9a584
  Hirmuolio

  authored
  1c9a584

• Use move semantics in inventory::add_item() (#55100)

  BrettDong

  authored
  0e70699

• Add craftable dry batteries (zinc-carbon dry cell) (#54287)

  Proxima-b

  authored
  26b423d

• Feral Mechanic (#54873)

  Show description for 1d48bbb
  

  GuardianDll

  and

  Maleclypse

  authored
  1d48bbb

Commits on Feb 5, 2022

• [CR] Fix nested pockets pickup (#54941)

  Show description for fe15810
  robkuijper

  authored
  fe15810

• JSONify rad widget: Use conditional clauses

  dseguin

  committed
  d224237

• JSONify rad widget: Remove obsolete widget functions

  dseguin

  committed
  89a7cec

• JSONify rad widget: Update documentation

  dseguin

  committed
  1650291

• Alternate implementation of my earlier town hall varient (#54921)

  Show description for a1a0541
  

  JonathanLochridge

  and

  LovamKicsiGazsii

  authored
  a1a0541

• Expanded Plate Mail pt 5 (#54860)

  Show description for ad2281d
  

  Drew4484

  and

  bombasticSlacks

  authored
  ad2281d

• Merge pull request #55079 from dseguin/widget_migrate_rad

  Show description for 16cc118
  kevingranade

  authored
  16cc118

• Molle Pouch & Load Bearing Vest Recipes, Consistency Pass on \recipes\armor\storage (#55073)

  Show description for c9eb5ee
  chrispikula

  authored
  c9eb5ee

• Optimize item spawn list creation (#55099)

  BrettDong

  authored
  94dfb94

• Don't fail-fast on master builds for the general matrix. (#55103)

  akrieger

  authored
  e9520fc

• Restore "Building with Visual Studio" heading (#55105)

  Show description for 6ccd58e
  wapcaplet

  authored
  6ccd58e

• Fix character name covering world name (#55113)

  werty1124

  authored
  60b363d

• Merge pull request #55045 from DeeUnderscore/diary-menu

  Show description for 7efd4f5
  Rivet-the-Zombie

  authored
  7efd4f5