Code

YACM#9

Code

Merged

a-chancey merged 165 commits intoa-chancey:TailoringRecipeOverhaul-Cottona-chancey/Cataclysm-DDA:TailoringRecipeOverhaul-Cottonfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardMar 27, 2022

+174,880-133,552

Commits

Commits on Mar 6, 2022

• Use various funnels in recipes

  Show description for 6c59d38
  IvanShestakov

  committed
  6c59d38

Commits on Mar 10, 2022

• Initial work handling charges

  haveric

  committed
  f8cd361

Commits on Mar 13, 2022

• Allow count_by_charges items to still work with count

  haveric

  committed
  ee290ae

• Allow current ammo to also be checked and consumed

  haveric

  committed
  89efb40

• Update NPCs doc for charges

  haveric

  committed
  0a43be2

• Forgot to update u_has_items doc

  haveric

  committed
  b61372f

Commits on Mar 16, 2022

• Merge branch 'CleverRaven:master' into dialogue-charges

  haveric

  authored
  e4195b3

Commits on Mar 17, 2022

• Fix incorrect item weights (#56131)

  Show description for 4220a83
  Croisis

  committed
  4220a83

• Don't show prompt on entering deep water tiles while being stunned

  Night-Pryanik

  committed
  868e795

• Don't show prompt on stepping into a dangerous tile when stunned

  Night-Pryanik

  committed
  f0917f4

• Autopickup settings: preserve autopickup state between items

  dseguin

  committed
  766c26a

• Autopickup settings: update test rules for nested pocket usage

  dseguin

  committed
  f5d5bad

• Autopickup settings: always respect pocket autoinsert settings

  dseguin

  committed
  02ff363

• Autopickup settings: fix autopickup for sealed containers

  dseguin

  committed
  31944a1

• Autopickup settings: update pickup ui to reflect pickup rules

  dseguin

  committed
  c296afb

• Autopickup settings: unit tests for nested whitelisting

  dseguin

  committed
  f3b4f51

• Autopickup settings: unit tests for full wallet spawns

  dseguin

  committed
  2e96458

• Autopickup settings: unit test for sealed container autopickup

  dseguin

  committed
  8c61caf

Commits on Mar 18, 2022

• Martial Arts and Techniques can trigger EOCs

  MylieDaniels

  committed
  4099b9c

• Documentation

  MylieDaniels

  committed
  9b28ba2

• Cancel current activity if "Maybe later"; finish current activity if "Finish it"

  Night-Pryanik

  committed
  b04fa3d

• Fix Woodworker's spawn

  haveric

  committed
  6e42ffb

Commits on Mar 20, 2022

• Don't spawn hallucinations on open air

  Night-Pryanik

  committed
  b9270b9

• Unify robotfindskitten spelling

  Faalagorn

  authored
  0f30dd7

• Update Altica 2022-03-20

  

  Fris0uman

  committed
  f0fde41

• Update Chibi Ultica 2022-03-20

  

  Fris0uman

  committed
  3406993

• Update Ultica 2022-03-20

  

  Fris0uman

  committed
  5e23ac4

• Update HollowMoon 2022-03-20

  

  Fris0uman

  committed
  7a914e0

• Update Larwick Overmap 2022-03-20

  

  Fris0uman

  committed
  3d1c876

• Update MSX 2022-03-20

  

  Fris0uman

  committed
  e401f7b

• Fix clothes plurals and typos

  Faalagorn

  authored
  af76a80

• Update dictionary.txt

  Faalagorn

  authored
  2fedf7f

• Added a house with unfortunate victim

  Night-Pryanik

  committed
  45a345f

• Update labeler.yml

  Maleclypse

  committed
  5cd4438

• Update .github/labeler.yml

  Show description for c7c5f90
  

  Maleclypse

  and

  Night-Pryanik

  authored
  c7c5f90

• Consistent Exodii case + minor typos

  Faalagorn

  authored
  57076ae

• Add small to exodii_micro_computer plural

  Faalagorn

  authored
  3a9afdb

• Update NPC_ROBOFAC_PROTOTYPE.json

  Faalagorn

  authored
  0a04a0d

• Prevent generating normal distribution with zero sigma

  BrettDong

  committed
  fa6d5be

• Fix coffin burial: add ability to force flags on terrain

  dseguin

  committed
  ad0b6e7

• Fix coffin burial: update construction recipe and documentation

  dseguin

  committed
  e9ea147

• Fix coffin burial: use full name for "force_terrain"

  Show description for c005041
  

  dseguin

  and

  ZhilkinSerg

  committed
  c005041

• Fix mutations minor typos

  Faalagorn

  authored
  091c38c

Commits on Mar 21, 2022

• Diary: Use approximate time when player has no timekeeping device

  dseguin

  committed
  50cb4e9

• Diary: Check for "outdoors" instead of "above ground"

  Show description for 5f8a478
  

  dseguin

  and

  Night-Pryanik

  committed
  5f8a478

• Diary: Add time string functions to calendar

  Show description for 8affbea
  

  dseguin

  and

  ZhilkinSerg

  committed
  8affbea

• Diary: Apply "outside" time restriction to sidebar as well

  Show description for 9cc1e8a
  

  dseguin

  and

  Night-Pryanik

  committed
  9cc1e8a

• Consistently use ™

  Faalagorn

  authored
  d0d0256

• Add wooden bucket and wooden well for obtaining water

  Show description for f211f46
  IvanShestakov

  committed
  f211f46

Commits on Mar 22, 2022

• Modify wooden bucket to be made completely of wood

  Show description for e03e056
  IvanShestakov

  committed
  e03e056

• make wooden well look like covered well

  IvanShestakov

  committed
  ab08ac7

Commits on Mar 23, 2022

• Allow last variant in list to be installed

  dseguin

  committed
  229030d

• Three new animist spells

  John-Candlebury

  committed
  08696d0

• Delete ancient_sanctum.txt

  John-Candlebury

  authored
  403d232

• Fix int division

  John-Candlebury

  committed
  6c0e87e

• Update wind_turbine.json

  BoatNectar

  committed
  900fe29

Commits on Mar 24, 2022

• Lower spawn rate of campground_npc

  ZombieZilla

  committed
  c66f6d9

• Merge pull request #56322 from ZombieZilla/campground-spawning

  Show description for 543b040
  Rivet-the-Zombie

  authored
  543b040

• Fix touring suit warmth

  Aerin-of-the-Toast

  committed
  e44e8d5

• Update containers.json

  Faalagorn

  authored
  a18c52a

Commits on Mar 25, 2022

• Exclude grinding from cooked_acorns recipe (#55928)

  Show description for 490504f
  

  DanielVartanov

  and

  BrettDong

  authored
  490504f

• More warnings for armor definitions (#55939)

  Show description for 73a0517
  bombasticSlacks

  authored
  73a0517

• Add a collapsible mop (#55965)

  ZombieZilla

  authored
  b350fbe

• Merge pull request #55986 from haveric/dialogue-charges

  Show description for 5ccfb4d
  kevingranade

  authored
  5ccfb4d

• Remove CBM spawns in inappropriate locations (#55999)

  Show description for a6f5876
  BoatNectar

  authored
  a6f5876

• Fixes fake out of order warning for LBVs (#56023)

  Show description for 9e450cd
  bombasticSlacks

  authored
  9e450cd

• Add paper wrapper recipe (#56038)

  

  AtomicFox556

  authored
  9a801bb

• Add context to Drink in inventory (#56060)

  Show description for f5166bc
  

  Faalagorn

  and

  ZhilkinSerg

  authored
  f5166bc

• Additions and changes to ferals, and some other things (#56074)

  Show description for 87ba4f3
  BioHazardSuit

  authored
  87ba4f3

• Fixed Remington ACR .223 description. (#56090)

  Show description for 52aa985
  ProjectileWaterfowl

  authored
  52aa985

• Assign faction to (some) item and vehicle placement (#56110)

  Show description for 9095c04
  haveric

  authored
  9095c04

• lobster dishes and recipes (#56121)

  Show description for a984c0e
  LyleSY

  authored
  a984c0e

• Merge pull request #56129 from dseguin/fix_autopickup_settings

  Show description for 448f16b
  kevingranade

  authored
  448f16b

• Durable gloves (#56130)

  Drew4484

  authored
  e54e31f

• Zone cleanup (#56332)

  Show description for 5ba62ff
  bombasticSlacks

  authored
  5ba62ff

• Recipe byproducts: add support for item group definitions

  dseguin

  committed
  712e9f2

• Recipe byproducts: update documentation

  dseguin

  committed
  abf6199

• Merge pull request #56304 from dseguin/fix_veh_part_variant

  Show description for 46d4710
  ZhilkinSerg

  authored
  46d4710

• Recipe byproducts: unit tests

  dseguin

  committed
  5620b10

• Merge pull request #56331 from Faalagorn/patch-2

  Show description for b53aed9
  ZhilkinSerg

  authored
  b53aed9

• Merge pull request #56284 from Faalagorn/trademark

  Show description for b00200e
  ZhilkinSerg

  authored
  b00200e

• Merge pull request #56266 from Faalagorn/mutations

  Show description for cf1c1c1
  ZhilkinSerg

  authored
  cf1c1c1

• Merge pull request #56244 from Faalagorn/robotfindskitten

  Show description for 42f0890
  ZhilkinSerg

  authored
  42f0890

• Fix guns and minor typos (#56262)

  Show description for 6340641
  

  Faalagorn

  and

  NetSysFire

  authored
  6340641

• Merge pull request #56330 from Aerin-of-the-Toast/touring-suit-hotfix

  Show description for da87372
  ZhilkinSerg

  authored
  da87372

• iron and steel horse armor (#56327)

  LyleSY

  authored
  8cef4e5

• Typo fixes to bionics file (#56245)

  Faalagorn

  authored
  81af6c6

• Restore missing flags (#56275)

  Drew4484

  authored
  e1d8fe2

• Update SOUNDPACK.md (#56250)

  Fris0uman

  authored
  4215148

• bamboo (#56258)

  LyleSY

  authored
  e79ac24

• Merge pull request #56248 from Night-Pryanik/donnie

  Show description for 8225cd2
  ZhilkinSerg

  authored
  8225cd2

• Merge pull request #56246 from Fris0uman/tileset

  Show description for d601604
  ZhilkinSerg

  authored
  d601604

• Merge pull request #56238 from Night-Pryanik/dont-spawn-hallus-on-open-air

  Show description for 1bd7c6a
  ZhilkinSerg

  authored
  1bd7c6a

• Merge pull request #56260 from BrettDong/normal_roll

  Show description for d2f4b1d
  ZhilkinSerg

  authored
  d2f4b1d

• Merge pull request #56196 from haveric/tacoma-woodcutter-2

  Show description for cf51364
  ZhilkinSerg

  authored
  cf51364

• Merge pull request #56180 from Night-Pryanik/keep-trying

  Show description for c2aff07
  ZhilkinSerg

  authored
  c2aff07

• [DinoMod] sauropod stomach cooking (#56150)

  LyleSY

  authored
  2d0285a

• Add "polearms" weapon categories to the lucerne hammer and Poleaxe (#56146)

  catdach

  authored
  968efee

• Typo Fixes, Added desired name for the Pulverizer (#56164)

  bombasticSlacks

  authored
  20f7fb3

• Merge pull request #56162 from Croisis/fix_item_weights

  Show description for 5549b62
  ZhilkinSerg

  authored
  5549b62

• Merge pull request #55905 from Ivan-Shestakov/more_use_for_funnels

  Show description for 359caf6
  ZhilkinSerg

  authored
  359caf6

• Add exotic fruits from TropiCataclysm (#55776)

  

  AtomicFox556

  authored
  5180d4b

• [Innawoods] Welding-free mechanical pump (#56208)

  Sathra225

  authored
  4529645

• [Innawoods] Bronze tools (#56306)

  Sathra225

  authored
  90f965e

• Add an alternative grappling hook recipe (#56137)

  Meandering-Breviger

  authored
  bcdcecc

• [Innawoods] Goat profession (#56252)

  Meandering-Breviger

  authored
  cf4ad66

• Merge pull request #56309 from BoatNectar/Fix-inaccessable-windmill-doors

  Show description for aeb1bd2
  Rivet-the-Zombie

  authored
  aeb1bd2

• Reword suicide prompt (#56139)

  Show description for 6379956
  Fris0uman

  authored
  6379956

• Add human and demihuman organs (#56141)

  Show description for 2a15d5a
  

  AtomicFox556

  authored
  2a15d5a

• Give cables proper measurements (#56142)

  Meandering-Breviger

  authored
  0871dfd

• Chainmail thickness enforcement (#56145)

  Drew4484

  authored
  071f05d

• EOC arithmetic can alter NPC opinion (#56152)

  Show description for a7bf8a1
  MylieDaniels

  authored
  a7bf8a1

• Add some more post-thresh mutation dreams (#56163)

  Show description for e167bd3
  

  KittyTac

  and

  BrettDong

  authored
  e167bd3

• fixed material coverage for Nomad Plate (#56166)

  bombasticSlacks

  authored
  85e5af6

• Yogurt and pudding edible frozen (#56072) (#56168)

  Show description for 766372d
  Croisis

  authored
  766372d

• Merge pull request #56170 from Night-Pryanik/stunned

  Show description for a1c5d0a
  kevingranade

  authored
  a1c5d0a

• Update zones.json

  Faalagorn

  authored
  f04f0d5

• obsolete Graphical Overmap mod

  LyleSY

  authored
  f3f7043

• obsolete Graphical Overmap Magiclysm

  LyleSY

  authored
  99d9035

Commits on Mar 26, 2022

• Merge pull request #56342 from Faalagorn/patch-3

  Show description for d1776b2
  Rivet-the-Zombie

  authored
  d1776b2

• autodoc → Autodoc

  Faalagorn

  authored
  32e01d2

• Add Additional MOLLE equipment (#56171)

  Show description for f698c79
  

  3 peopleauthored
  f698c79

• Epilogue Message Accounts For Your Followers (#56175)

  Show description for 7a06c28
  

  bombasticSlacks

  and

  NetSysFire

  authored
  7a06c28

• Merge pull request #56179 from MylieDaniels/martial-arts-eocs

  Show description for 5d4666c
  kevingranade

  authored
  5d4666c

• Obsolete old chainmail armor. (#56182)

  Drew4484

  authored
  2c24f9d

• Reword PR summary instructions in template (#56186)

  xuvatilavv

  authored
  f7cfb90

• Computer practice works in the dark (#56190)

  TheShadowFerret

  authored
  e28aee4

• Merge pull request #56198 from dseguin/fix_coffin_burial

  Show description for 207ea3b
  kevingranade

  authored
  207ea3b

• Portal storm text and writing update (#56204)

  Ilysen

  authored
  d0179f6

• Merge pull request #56209 from dseguin/approx_diary_time

  Show description for 0cd96e1
  kevingranade

  authored
  0cd96e1

• Allow swith on death beyond reality bubble (#56220)

  hexagonrecursion

  authored
  f65d356

• added waist sublocation (#56224)

  bombasticSlacks

  authored
  5b7fb0f

• [MMA] Weapon Categories: Iron Heart and Panzer Kunst (#56229)

  Show description for 9715771
  catdach

  authored
  9715771

• Visible fire drill charges (#56219) (#56232)

  Show description for 55c2009
  Croisis

  authored
  55c2009

• Torso plate armor coverage (#56236)

  Drew4484

  authored
  1b98d34

• Blunt weapons are now steel and not iron (#56240)

  anoobindisguise

  authored
  025c1cd

• Merge pull request #56247 from Faalagorn/clothingplurals

  Show description for 2db87ca
  kevingranade

  authored
  2db87ca

• Merge pull request #56249 from Maleclypse/Add-spawn-to-triage-bot

  Show description for 2fbe627
  kevingranade

  authored
  2fbe627

• Reduce length of staff sling, reduce damage to reflect length reduction (#56254)

  Show description for fbd6e18
  avianArsonist

  authored
  fbd6e18

• Merge pull request #56257 from Faalagorn/exodii

  Show description for 15a8517
  kevingranade

  authored
  15a8517

• Add more mixed drinks (#56259)

  

  AtomicFox556

  authored
  9e704fc

• Fix monsters minor typos (#56264)

  Show description for 631c5b4
  

  Faalagorn

  and

  Qrox

  authored
  631c5b4

• Remove post vehicle dismantling item dissorting (#56276)

  PatrikLundell

  authored
  7c51375

• ft: more auto labeling (#56282)

  Show description for 033d5e3
  casswedson

  authored
  033d5e3

• Alpha can't be weak (#56288)

  TheShadowFerret

  authored
  0e5db3a

Commits on Mar 27, 2022

• Merge pull request #56289 from Ivan-Shestakov/add_wooden_well_and_bucket

  Show description for 3a215c7
  kevingranade

  authored
  3a215c7

• Fix problems with t-shirt variants in professions (#56290)

  Meandering-Breviger

  authored
  21bebf8

• Added freezer appliances/items/furniture (#56293)

  bennettallan

  authored
  131ff65

• Generic mutagen can cause mutations again (#56294)

  Show description for a0852b6
  MylieDaniels

  authored
  a0852b6

• Steel Crafts (#56300)

  Drew4484

  authored
  f1a6ee9

• Routine i18n updates on 26 March 2022 (#56350)

  Show description for ede427e
  

  kevingranade

  and

  BrettDong

  authored
  ede427e

• Effect typo fixes (#56263)

  Show description for 9f329e6
  

  Faalagorn

  and

  haveric

  authored
  9f329e6

• Add some documentation for ui_manager (#56281)

  Show description for 7152aef
  Qrox

  authored
  7152aef

• Replace artificial forests using predecessor mapgen (#55735)

  LovamKicsiGazsii

  authored
  4504f18

• Reword interrupt prompt (#55914)

  Arokha

  authored
  015b142

• Aftershock: Loot, monsters, and secrets for the glacial tunnels (#55990)

  Show description for 59c8e1d
  

  John-Candlebury

  and

  Mom-Bun

  authored
  59c8e1d

• Make projectile targeting code anatomy indepedent (#56104)

  Show description for b91dbc0
  anothersimulacrum

  authored
  b91dbc0

• Tacoma - Convert clinic and nurse to json (#56205)

  Show description for 2dc93f6
  haveric

  authored
  2dc93f6

• Monster cameras, vision optimizations, and an implementation through Slime (#56231)

  Show description for 52d991b
  

  3 peopleauthored
  52d991b

• Merge pull request #56305 from John-Candlebury/animist-spells

  Show description for f49e497
  kevingranade

  authored
  f49e497

• Rigid armor, conflicts and raw skin (#55566)

  bombasticSlacks

  authored
  96f1070

• Merge pull request #56317 from dseguin/recipe_itemgroup_byproducts

  Show description for d099305
  kevingranade

  authored
  d099305

• Merge pull request #56355 from Faalagorn/autodoc

  Show description for 92bf76e
  Rivet-the-Zombie

  authored
  92bf76e

• Merge pull request #56347 from CleverRaven/LyleSY-patch-1

  Show description for dcde9cd
  kevingranade

  authored
  dcde9cd

• [Innawood] Chemistry, electricity, and more! (#56348)

  Light-Wave

  authored
  0cc5c05