Code

update#19

Code

Merged

Maleclypse merged 205 commits intoMaleclypse:masterMaleclypse/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardApr 28, 2020

+52,664-32,858

Commits

Commits on Apr 6, 2020

• Remove dangling references to leadworks

  anothersimulacrum

  committed
  5632d48

  Copy full SHA for 5632d48

Commits on Apr 8, 2020

• Adds new grenades and recipes

  Show description for fc7fb4e
  Brian-Otten

  committed
  fc7fb4e

  Copy full SHA for fc7fb4e

• missed name change

  Brian-Otten

  committed
  3d6a65d

  Copy full SHA for 3d6a65d

• Fixes obsoletion of makeshift grenade

  Brian-Otten

  committed
  5f82216

  Copy full SHA for 5f82216

Commits on Apr 9, 2020

• Fix sound effects

  Brian-Otten

  committed
  6a7dd7c

  Copy full SHA for 6a7dd7c

Commits on Apr 11, 2020

• Re-add radio activation

  Brian-Otten

  committed
  d56637f

  Copy full SHA for d56637f

• adds npc_activate flag

  Brian-Otten

  committed
  6b78a11

  Copy full SHA for 6b78a11

Commits on Apr 12, 2020

• Adds new barrel bombs. obsoletes old charges.

  Brian-Otten

  committed
  fbb92e8

  Copy full SHA for fbb92e8

• tweaks strays slightly

  Show description for 34cdf9c
  ephemeralstoryteller

  committed
  34cdf9c

  Copy full SHA for 34cdf9c

• new fauna

  Show description for ad73ea5
  ephemeralstoryteller

  committed
  ad73ea5

  Copy full SHA for ad73ea5

Commits on Apr 13, 2020

• Update data/json/items/obsolete.json

  Show description for 6647ca3
  

  Brian-Otten

  and

  Amoebka

  authored
  6647ca3

  Copy full SHA for 6647ca3

• Add detonation times

  Brian-Otten

  authored
  87dc2ee

  Copy full SHA for 87dc2ee

• stray buffs

  Show description for d069b9d
  ephemeralstoryteller

  committed
  d069b9d

  Copy full SHA for d069b9d

Commits on Apr 14, 2020

• Missing space.

  Brian-Otten

  authored
  650aaee

  Copy full SHA for 650aaee

Commits on Apr 17, 2020

• Balances axes

  Brian-Otten

  committed
  ffe8e3f

  Copy full SHA for ffe8e3f

• balances swords

  Brian-Otten

  committed
  95edcf3

  Copy full SHA for 95edcf3

Commits on Apr 18, 2020

• Polearm balance

  Brian-Otten

  committed
  2ffe5e5

  Copy full SHA for 2ffe5e5

Commits on Apr 19, 2020

• WIP - Adding spurge and lotus tea. Still buggy.

  HarrisonGreenlee

  committed
  7ed7b4a

  Copy full SHA for 7ed7b4a

• Fixed game crash when player drinks spurge tea. Improved item descriptions.

  HarrisonGreenlee

  committed
  3d7040a

  Copy full SHA for 3d7040a

• linted furniture-flora.json

  HarrisonGreenlee

  committed
  88c519f

  Copy full SHA for 88c519f

• change to toughs

  Show description for f5fd9df
  ephemeralstoryteller

  committed
  f5fd9df

  Copy full SHA for f5fd9df

Commits on Apr 20, 2020

• Merge branch 'master' into melee-weapon-balance-polearms

  Brian-Otten

  authored
  86a155f

  Copy full SHA for 86a155f

• Merge branch 'master' into new-grenade-crafting

  Brian-Otten

  authored
  449f203

  Copy full SHA for 449f203

• Merge branch 'master' into new-barrel-bomb-crafting

  Brian-Otten

  authored
  3bf3ded

  Copy full SHA for 3bf3ded

• Fixed JSON formatting for generic.json. Also improved description for spurge flowers.

  HarrisonGreenlee

  committed
  4ed3da1

  Copy full SHA for 4ed3da1

• Fixed formatting for pluralization in JSON.

  HarrisonGreenlee

  committed
  bc5325e

  Copy full SHA for bc5325e

Commits on Apr 21, 2020

• IF - Match clear filter

  Pupsi-Mupsi

  authored
  f619257

  Copy full SHA for f619257

• IF - minor changes to worldcreation menu

  Pupsi-Mupsi

  authored
  ccd59d4

  Copy full SHA for ccd59d4

• IF - Add indicator for hidden constructions

  Pupsi-Mupsi

  authored
  c5082d5

  Copy full SHA for c5082d5

• adds 2 new creatures

  Show description for b5b27c8
  ephemeralstoryteller

  committed
  b5b27c8

  Copy full SHA for b5b27c8

• lints spawn file + adds spawns for new critters

  ephemeralstoryteller

  committed
  eafdafb

  Copy full SHA for eafdafb

Commits on Apr 22, 2020

• makes fauna more common

  Show description for 13d6c6d
  ephemeralstoryteller

  committed
  13d6c6d

  Copy full SHA for 13d6c6d

• wisp desc addition

  Show description for f6b54df
  ephemeralstoryteller

  committed
  f6b54df

  Copy full SHA for f6b54df

• Audit primitive tool qualities and descriptions

  kevingranade

  authored
  78f50db

  Copy full SHA for 78f50db

• reverts stray upgrades defaulting to baby crystals

  ephemeralstoryteller

  committed
  57cff32

  Copy full SHA for 57cff32

• bruisers should not push vehicles

  Show description for 24e053e
  ephemeralstoryteller

  committed
  24e053e

  Copy full SHA for 24e053e

• moss liz won't follow players

  Show description for 12b1aeb
  ephemeralstoryteller

  committed
  12b1aeb

  Copy full SHA for 12b1aeb

Commits on Apr 23, 2020

• [magiclysm] optical sneeze beam

  

  KorGgenT

  authored and

  kevingranade

  committed
  b2532d1

  Copy full SHA for b2532d1

• Replace non-iterator, non-lambda auto with type

  anothersimulacrum

  committed
  de74fe6

  Copy full SHA for de74fe6

• Wake up player if too cold due to hypothermia (#39827)

  CodeBandit

  authored
  aa8d7b1

  Copy full SHA for aa8d7b1

• Sort martial arts valid weapons lists alphabetically and remove duplicate weapon names (#39815)

  Show description for ad1b7df
  enaantd

  authored
  ad1b7df

  Copy full SHA for ad1b7df

• Drunken master (#39808)

  Show description for 58a31dc
  crazykid080

  authored
  58a31dc

  Copy full SHA for 58a31dc

• Remove the dregs of the drunken trait

  kevingranade

  committed
  4938f6e

  Copy full SHA for 4938f6e

• Fix lazersneeze syntax (#39835)

  kevingranade

  authored
  3405110

  Copy full SHA for 3405110

• Add new movement based achievements and statistics

  ralreegorganon

  committed
  1689b1e

  Copy full SHA for 1689b1e

• Normalize score and stat names

  ralreegorganon

  committed
  c7b760a

  Copy full SHA for c7b760a

• Standard House Palette Tweaks (#39260)

  LilShiningMan

  authored
  53e8fc5

  Copy full SHA for 53e8fc5

• Remove dangling references to leadworks (#39300)

  kevingranade

  authored
  7c272ef

  Copy full SHA for 7c272ef

• Merge pull request #39370 from Brian-Otten/new-grenade-crafting

  Show description for 99f8572
  kevingranade

  authored
  99f8572

  Copy full SHA for 99f8572

• Adds new craftable small fragmentation devices (#39396)

  Show description for bacff07
  Brian-Otten

  authored
  bacff07

  Copy full SHA for bacff07

• Add roof monster groups (#39696)

  Show description for 3776f3c
  LyleSY

  authored
  3776f3c

  Copy full SHA for 3776f3c

• add 2 new firefighter tools (#39770)

  Show description for ca1643f
  Aluminumfoil

  authored
  ca1643f

  Copy full SHA for ca1643f

• Fix royal jelly (#39782)

  Fris0uman

  authored
  4491ea0

  Copy full SHA for 4491ea0

• Added a recipe which allows removal of barbs on barbed wire. (#39790)

  AH1684

  authored
  9201601

  Copy full SHA for 9201601

• Change wash kit (#39795)

  Pupsi-Mupsi

  authored
  bd0027f

  Copy full SHA for bd0027f

• Add a foam rubber bat (#39803)

  Show description for 16613bd
  wapcaplet

  authored
  16613bd

  Copy full SHA for 16613bd

• add spring to blackjack recipe (#39812)

  ampersand55

  authored
  f8ef8ab

  Copy full SHA for f8ef8ab

• modernise ranged damage entries

  Show description for 7102f90
  Soup-de-Loop

  committed
  7102f90

  Copy full SHA for 7102f90

• Merge pull request #39727 from HarrisonGreenlee/more_tea

  Show description for cd96ae3
  Rivet-the-Zombie

  authored
  cd96ae3

  Copy full SHA for cd96ae3

• Merge pull request #39717 from ralreegorganon/new-achievements

  Show description for a515dcb
  ZhilkinSerg

  authored
  a515dcb

  Copy full SHA for a515dcb

• Merge pull request #39837 from Soup-de-Loop/soupdeloop-blazemod-PR19

  Show description for a0544ef
  ZhilkinSerg

  authored
  a0544ef

  Copy full SHA for a0544ef

• Merge pull request #39836 from kevingranade/drunken-cleanup

  Show description for 8610094
  ZhilkinSerg

  authored
  8610094

  Copy full SHA for 8610094

• Merge branch 'master' into new-barrel-bomb-crafting

  Brian-Otten

  authored
  0fe7049

  Copy full SHA for 0fe7049

• Merge pull request #39829 from anothersimulacrum/auto

  Show description for 3ad52d7
  ZhilkinSerg

  authored
  3ad52d7

  Copy full SHA for 3ad52d7

• [DinoMod] Add Z-Rex (#39833)

  LyleSY

  authored
  d73cd32

  Copy full SHA for d73cd32

• Merge pull request #39818 from CleverRaven/kevingranade-axe-axe-qualities

  Show description for 2dcd1df
  ZhilkinSerg

  authored
  2dcd1df

  Copy full SHA for 2dcd1df

• Clear up last few non-std math function invocations. (#39811)

  Show description for 8ac7a27
  kevingranade

  authored
  8ac7a27

  Copy full SHA for 8ac7a27

• Merge pull request #39783 from Pupsi-Mupsi/PM-Interface-Update

  Show description for 176a6a5
  kevingranade

  authored
  176a6a5

  Copy full SHA for 176a6a5

• Fix astyle regression

  ZhilkinSerg

  authored
  6b5607b

  Copy full SHA for 6b5607b

• Fix astyle regression

  ZhilkinSerg

  authored
  045a5a0

  Copy full SHA for 045a5a0

• Merge pull request #39823 from ephemeralstoryteller/dks-wild-aliens

  Show description for 3e5fdd4
  kevingranade

  authored
  3e5fdd4

  Copy full SHA for 3e5fdd4

• Cosmetic changes to new_character

  

  Pupsi-Mupsi

  authored and

  kevingranade

  committed
  7b80f7f

  Copy full SHA for 7b80f7f

• Fix astyle regression

  ZhilkinSerg

  authored
  d683c5f

  Copy full SHA for d683c5f

• Fix json formatting

  ZhilkinSerg

  authored
  1ae40f3

  Copy full SHA for 1ae40f3

• Battery postapoc price

  Brian-Otten

  committed
  99a8705

  Copy full SHA for 99a8705

Commits on Apr 24, 2020

• Add an "anything" constraint for requirements

  Show description for 3a902e1
  jbytheway

  committed
  3a902e1

  Copy full SHA for 3a902e1

• Add a character_wakes_up event

  jbytheway

  committed
  4f471c6

  Copy full SHA for 4f471c6

• Add a "survive one day" achievement

  jbytheway

  committed
  01bf58a

  Copy full SHA for 01bf58a

• Document lower-time-bound achievements

  Show description for 895ff0d
  jbytheway

  committed
  895ff0d

  Copy full SHA for 895ff0d

• Update some stale doc links, etc.

  jbytheway

  committed
  2e188a3

  Copy full SHA for 2e188a3

• Better handling of game data load failures

  Show description for 7e943c4
  jbytheway

  committed
  7e943c4

  Copy full SHA for 7e943c4

• Reworked how crafting skill requirement display is generated. (#36089)

  ishtatann

  authored
  026c7b5

  Copy full SHA for 026c7b5

• Add missing Krav Maga Weapons: Take 2 (#37278)

  Show description for b634159
  JohnWildkins

  authored
  b634159

  Copy full SHA for b634159

• Merge pull request #39850 from Brian-Otten/battery-charge-price

  Show description for 86c18f0
  Rivet-the-Zombie

  authored
  86c18f0

  Copy full SHA for 86c18f0

• Corrected a small grammatical error in missiondef.json

  joemaro

  authored
  8ba9b5a

  Copy full SHA for 8ba9b5a

• Remove obsoleted leadworks references

  kevingranade

  committed
  7d23275

  Copy full SHA for 7d23275

• New pipe bombs (#39417)

  Brian-Otten

  authored
  062550e

  Copy full SHA for 062550e

• Adds new barrel bombs. obsoletes old explosive charges. (#39492)

  Show description for 8fdc612
  kevingranade

  authored
  8fdc612

  Copy full SHA for 8fdc612

• Club weapon balance (Part 3 of melee weapon balance project) (#39649)

  Brian-Otten

  authored
  6ea1540

  Copy full SHA for 6ea1540

• Balances axes (#39650)

  kevingranade

  authored
  a22217c

  Copy full SHA for a22217c

• Merge pull request #39651 from Brian-Otten/melee-weapon-balance-swords

  Show description for b181f2a
  kevingranade

  authored
  b181f2a

  Copy full SHA for b181f2a

• Spear and staff weapon balance (Part 7 of melee weapon balance project) (#39652)

  Brian-Otten

  authored
  71abfed

  Copy full SHA for 71abfed

• Polearm balance (#39654)

  kevingranade

  authored
  a570ba9

  Copy full SHA for a570ba9

• Merge pull request #39856 from joemaro/master

  Show description for ed97a0c
  ZhilkinSerg

  authored
  ed97a0c

  Copy full SHA for ed97a0c

• Merge pull request #39852 from jbytheway/game_data_load_failure

  Show description for f469766
  ZhilkinSerg

  authored
  f469766

  Copy full SHA for f469766

• Add min/max event statistics and z-level achievements

  

  ralreegorganon

  authored and

  kevingranade

  committed
  19093d2

  Copy full SHA for 19093d2

• Merge pull request #39841 from jbytheway/survival_achievement

  Show description for 4c1071b
  kevingranade

  authored
  4c1071b

  Copy full SHA for 4c1071b

• Sort by name and color

  

  CodeBandit

  authored and

  kevingranade

  committed
  5a5194a

  Copy full SHA for 5a5194a

• Add mouth and arm info to encumbrance display (#39843)

  CodeBandit

  authored
  3b6415c

  Copy full SHA for 3b6415c

• Change merc price

  

  Brian-Otten

  authored and

  kevingranade

  committed
  842ba94

  Copy full SHA for 842ba94

• Add fire/police stations to surrounded scenario.

  arijust

  authored
  f4efdb9

  Copy full SHA for f4efdb9

• Update quarterstaff

  Brian-Otten

  committed
  a134afe

  Copy full SHA for a134afe

• basement variety 8

  curstwist

  committed
  86c7da7

  Copy full SHA for 86c7da7

Commits on Apr 25, 2020

• Give achievements a name and optional description

  Show description for 8c75fcc
  jbytheway

  committed
  8c75fcc

  Copy full SHA for 8c75fcc

• Translate event_statistic descriptions

  Show description for 792f436
  jbytheway

  committed
  792f436

  Copy full SHA for 792f436

• Add a blank line between achievements in UI

  Show description for f0cd697
  jbytheway

  committed
  f0cd697

  Copy full SHA for f0cd697

• Tests should use different default user dir

  Show description for 15e0954
  jbytheway

  committed
  15e0954

  Copy full SHA for 15e0954

• Add localized_compare

  Show description for 7a6b2c8
  jbytheway

  committed
  7a6b2c8

  Copy full SHA for 7a6b2c8

• Sort vehicle spawn list by translated name

  jbytheway

  committed
  bdd6e24

  Copy full SHA for bdd6e24

• Merge pull request #39871 from curstwist/basement-variety-8

  Show description for 4a5feda
  ralreegorganon

  authored
  4a5feda

  Copy full SHA for 4a5feda

• Consolidate campus OMTs

  anothersimulacrum

  committed
  e12784c

  Copy full SHA for e12784c

• Merge pull request #39865 from Brian-Otten/quarterstaff-balance

  Show description for 9f6568b
  Rivet-the-Zombie

  authored
  9f6568b

  Copy full SHA for 9f6568b

• Merge pull request #39872 from jbytheway/tests_custom_user_dir

  Show description for d834d7a
  ralreegorganon

  authored
  d834d7a

  Copy full SHA for d834d7a

• Migrate ACT_PICKUP to the activity actor system

  

  ifreund

  authored and

  kevingranade

  committed
  de16cb5

  Copy full SHA for de16cb5

• Merge pull request #39862 from jbytheway/achievement_descriptions

  Show description for ce495a0
  ralreegorganon

  authored
  ce495a0

  Copy full SHA for ce495a0

• 2StoryModern01 - rare house (#39504)

  Show description for bf42e34
  LilShiningMan

  authored
  bf42e34

  Copy full SHA for bf42e34

• Adjust descriptions of AEP_PSYSHIELD

  Show description for b04958a
  

  RedShakespeare

  authored and

  kevingranade

  committed
  b04958a

  Copy full SHA for b04958a

• Removed all mentions of obsoleted mx_fumarole and mx_anomaly map extras (#39864)

  

  Anton Burmistrov

  authored
  b8c8042

  Copy full SHA for b8c8042

• Composite crossbow recipe update. (#39870)

  Show description for 40620fc
  Tamiore

  authored
  40620fc

  Copy full SHA for 40620fc

• Add recipe that allow holster varient survivor utility belt in Aftershock to be changed back (#39773)

  martinrhan

  authored
  65c49b2

  Copy full SHA for 65c49b2

• Rebalance can bomb

  

  Brian-Otten

  authored and

  kevingranade

  committed
  b797ed4

  Copy full SHA for b797ed4

• Merge pull request #39873 from jbytheway/localized_sorting

  Show description for 4a304e3
  kevingranade

  authored
  4a304e3

  Copy full SHA for 4a304e3

• Tweak in hopes of fixing clang build

  Show description for 64b72cf
  jbytheway

  committed
  64b72cf

  Copy full SHA for 64b72cf

• Merge pull request #39885 from jbytheway/fix_clang_build

  Show description for 54e4bb2
  ifreund

  authored
  54e4bb2

  Copy full SHA for 54e4bb2

• Add keybindings for veh cooler + heater (#39874)

  Show description for 108a43c
  Pupsi-Mupsi

  authored
  108a43c

  Copy full SHA for 108a43c

• Magiclysm: Added recipes for mana potions. Added lesser mana infusion. Tweaked the recipe for manatouched serum. (#39676)

  Show description for 99a8f9a
  

  HarrisonGreenlee

  and

  KorGgenT

  authored
  99a8f9a

  Copy full SHA for 99a8f9a

• string update (#39877)

  Show description for 400bfc4
  Soup-de-Loop

  authored
  400bfc4

  Copy full SHA for 400bfc4

• Merge pull request #39878 from anothersimulacrum/campus-up

  Show description for e5d0f9e
  ZhilkinSerg

  authored
  e5d0f9e

  Copy full SHA for e5d0f9e

• Rat cave jsonify (#39868)

  

  Anton Burmistrov

  authored
  5068d86

  Copy full SHA for 5068d86

• Prevent crashes when an iuse doesn't exist. (#39849)

  Show description for 6bf174b
  kevingranade

  authored
  6bf174b

  Copy full SHA for 6bf174b

• add rubber (#39800)

  Jerimee

  authored
  816fba8

  Copy full SHA for 816fba8

• Fix a bug in extract_json_strings.py (#39855)

  kwl01skz

  authored
  d6bc167

  Copy full SHA for d6bc167

• Various minor scores UI improvements (#39891)

  Show description for df3d82f
  jbytheway

  authored
  df3d82f

  Copy full SHA for df3d82f

• Don't use workbenches in dangerous field

  RipleyTom

  committed
  3deb2ee

  Copy full SHA for 3deb2ee

• magiclysm mapgen (#39893)

  curstwist

  authored
  eafb918

  Copy full SHA for eafb918

• Merge pull request #39888 from RipleyTom/fire_workbench

  Show description for 889f657
  ifreund

  authored
  889f657

  Copy full SHA for 889f657

• fix items having inappropriate charges

  Demoragon

  committed
  fa88e32

  Copy full SHA for fa88e32

• Fixes 100% chances to trigger teleglow effects (#39895)

  Show description for 4e59722
  RedShakespeare

  authored
  4e59722

  Copy full SHA for 4e59722

• Fix syntax error

  RedShakespeare

  committed
  5eb1dc3

  Copy full SHA for 5eb1dc3

• Merge pull request #39900 from RedShakespeare/syntax

  Show description for d73416c
  ifreund

  authored
  d73416c

  Copy full SHA for d73416c

• Add github action to check astyle and show diff

  ifreund

  committed
  fe24d13

  Copy full SHA for fe24d13

• Disable astyle on travis build

  Show description for c043670
  ifreund

  committed
  c043670

  Copy full SHA for c043670

• Merge pull request #39889 from ifreund/github-actions-astyle

  Show description for f47f2ee
  kevingranade

  authored
  f47f2ee

  Copy full SHA for f47f2ee

Commits on Apr 26, 2020

• extracts and concentrates pt3

  Show description for 2876ece
  

  NastyNate2612

  authored and

  kevingranade

  committed
  2876ece

  Copy full SHA for 2876ece

• Misc json cleanups

  kevingranade

  committed
  481157a

  Copy full SHA for 481157a

• Fix typo in C.R.I.T's description.

  perryprog

  authored
  1e735d5

  Copy full SHA for 1e735d5

• adjust terminology for mod custodianship from 'maintainer' to 'curator' (#39838)

  esotericist

  authored
  7c00e2a

  Copy full SHA for 7c00e2a

• Adds new wood and copper pikes with recipes. (#39861)

  Brian-Otten

  authored
  cddfa7b

  Copy full SHA for cddfa7b

• Rot away items inside reality bubble (#39822)

  Hirmuolio

  authored
  4ac15ac

  Copy full SHA for 4ac15ac

• Replace Makefile check for defines with values (#39905)

  Show description for 9eb2ff5
  anothersimulacrum

  authored
  9eb2ff5

  Copy full SHA for 9eb2ff5

• Routine i18n updates on 26 Apr 2020

  BrettDong

  committed
  b9117e1

  Copy full SHA for b9117e1

• Allow specifying clang version in makefile

  Show description for abff42a
  anothersimulacrum

  committed
  abff42a

  Copy full SHA for abff42a

• Use only Dex to avoid grabs and use only Str to break out of grabs (#39911)

  Show description for 6381b01
  CodeBandit

  authored
  6381b01

  Copy full SHA for 6381b01

• Adds recipe for tinted glass.

  Show description for 9c094c8
  

  Tamiore

  authored and

  kevingranade

  committed
  9c094c8

  Copy full SHA for 9c094c8

• Merge pull request #39920 from BrettDong/i18n

  Show description for a92d6d1
  Rivet-the-Zombie

  authored
  a92d6d1

  Copy full SHA for a92d6d1

• Intelligence affects exp rates based on current int, not max int (#39902)

  Show description for f7bd23a
  CodeBandit

  authored
  f7bd23a

  Copy full SHA for f7bd23a

• remove obsoleted scrap weapon derived content

  Show description for 4968f19
  

  Soup-de-Loop

  authored and

  kevingranade

  committed
  4968f19

  Copy full SHA for 4968f19

• Merge pull request #39923 from anothersimulacrum/make-fix

  Show description for dd07502
  ZhilkinSerg

  authored
  dd07502

  Copy full SHA for dd07502

• Merge pull request #39917 from perryprog/patch-1

  Show description for 2f96ef1
  ZhilkinSerg

  authored
  2f96ef1

  Copy full SHA for 2f96ef1

• Double Level Microlab. (#39875)

  John-Candlebury

  authored
  3e40376

  Copy full SHA for 3e40376

• basement variety 9 (#39906)

  curstwist

  authored
  5c5876c

  Copy full SHA for 5c5876c

• Change definitions for starting locations

  Show description for cdae8de
  arijust

  authored
  cdae8de

  Copy full SHA for cdae8de

• Added WINDOW flag to trunk doors

  

  enaantd

  authored and

  ena

  committed
  3135214

  Copy full SHA for 3135214

• Improve character heal_rate tests

  Show description for 45d26b1
  wapcaplet

  committed
  45d26b1

  Copy full SHA for 45d26b1

• Migrate vending menu to ui_adaptor

  Qrox

  committed
  80ace93

  Copy full SHA for 80ace93

• Migrate martial arts info to ui_adaptor

  Qrox

  committed
  6bde81e

  Copy full SHA for 6bde81e

• Migrate talk_function::display_and_choose_opts to ui_adaptor

  Qrox

  committed
  5f0100d

  Copy full SHA for 5f0100d

• move magiclysm json files around

  KorGgenT

  committed
  f8bff15

  Copy full SHA for f8bff15

• Update millyficent_lab.json

  curstwist

  committed
  4527e9f

  Copy full SHA for 4527e9f

• Merge pull request #39935 from wapcaplet/heal-with-meds

  Show description for 997cdcd
  ifreund

  authored
  997cdcd

  Copy full SHA for 997cdcd

• Change line-color to light_red for disabled option (#39934)

  Show description for 2588a0b
  Pupsi-Mupsi

  authored
  2588a0b

  Copy full SHA for 2588a0b

• Change body_part to bodypart_id in deal_damage (#39890)

  Show description for dced805
  Fris0uman

  authored
  dced805

  Copy full SHA for dced805

• Map item processing refactoring (#39942)

  Show description for ea7d0d3
  Hirmuolio

  authored
  ea7d0d3

  Copy full SHA for ea7d0d3

• Merge pull request #39936 from Qrox/migrate-ui-10

  Show description for b07ede0
  ifreund

  authored
  b07ede0

  Copy full SHA for b07ede0

• Extracts and Concentrates pt 3 (#37942)

  Show description for efb865c
  NastyNate2612

  authored
  efb865c

  Copy full SHA for efb865c

Commits on Apr 27, 2020

• extracts and concentrates pt4 (#37946)

  Show description for b9b0ce1
  NastyNate2612

  authored
  b9b0ce1

  Copy full SHA for b9b0ce1

• spacey

  kevingranade

  authored
  d8f1dc9

  Copy full SHA for d8f1dc9

• Extracts and Concentrates pt 5 (#37956)

  Show description for 140d058
  NastyNate2612

  authored
  140d058

  Copy full SHA for 140d058

• Adds recipe for makeshift leather hose. (#39882)

  Tamiore

  authored
  caf81ee

  Copy full SHA for caf81ee

• Merge pull request #39860 from arijust/scenario_surrounded

  Show description for 7a27c35
  ralreegorganon

  authored
  7a27c35

  Copy full SHA for 7a27c35

• Merge pull request #39933 from enaantd/fix-trunk-windows

  Show description for 4ef7081
  Rivet-the-Zombie

  authored
  4ef7081

  Copy full SHA for 4ef7081

• Merge pull request #39938 from KorGgenT/magiclysm-file-changes

  Show description for ea5a72d
  ZhilkinSerg

  authored
  ea5a72d

  Copy full SHA for ea5a72d

• Monster behavior tree (#39810)

  Show description for 342d2e7
  kevingranade

  authored
  342d2e7

  Copy full SHA for 342d2e7

• Merge pull request #39944 from curstwist/Aftershock-fix

  Show description for 4549c1a
  ZhilkinSerg

  authored
  4549c1a

  Copy full SHA for 4549c1a

• Rewrite code where MSVS gives nodiscard warnings (#39941)

  Show description for 7a0d2aa
  

  AMurkin

  and

  ifreund

  authored
  7a0d2aa

  Copy full SHA for 7a0d2aa

• Add point overloads for some functions

  jbytheway

  committed
  60b65ab

  Copy full SHA for 60b65ab

• Port function callers

  jbytheway

  committed
  8eda46c

  Copy full SHA for 8eda46c

• Port function implementations

  jbytheway

  committed
  a8f39d8

  Copy full SHA for a8f39d8

• Revamp achievement requirement tracking

  Show description for e118ece
  jbytheway

  committed
  e118ece

  Copy full SHA for e118ece

• Try to fix Android build

  jbytheway

  committed
  31b1c6f

  Copy full SHA for 31b1c6f

• fix age selection bar

  Demoragon

  committed
  2a5d3b4

  Copy full SHA for 2a5d3b4

• Refactor iuse_software_lightson

  Show description for 4f0d7a9
  

  AMurkin

  authored and

  kevingranade

  committed
  4f0d7a9

  Copy full SHA for 4f0d7a9

• Merge pull request #39956 from jbytheway/point_apis_20200427

  Show description for c2732c3
  kevingranade

  authored
  c2732c3

  Copy full SHA for c2732c3

• add flag ALLOWS_REMOTE_USE to canning pot

  

  Tairesh

  authored and

  kevingranade

  committed
  3c7ee60

  Copy full SHA for 3c7ee60

• Crude weapons 2020 (#39711)

  xanderrootslayer

  authored
  c87aaea

  Copy full SHA for c87aaea

• loop fixes

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  f085822

  Copy full SHA for f085822

• Adds fragile melee flag to fake weapons and chainsaws (#39959)

  Brian-Otten

  authored
  3bdcb87

  Copy full SHA for 3bdcb87

• Obsolete obsolete explosives.

  

  Brian-Otten

  authored and

  kevingranade

  committed
  d46cba1

  Copy full SHA for d46cba1

• Trigger traps after probability travel

  

  anothersimulacrum

  authored and

  kevingranade

  committed
  dc5fdf5

  Copy full SHA for dc5fdf5

• bio lightning does electric instead of stab (#39949)

  Dacendeth

  authored
  43adeb0

  Copy full SHA for 43adeb0

• Fix Android builds

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  d58288f

  Copy full SHA for d58288f

• Merge pull request #39963 from Demoragon/fix-age-selection-bar

  Show description for f85307d
  ifreund

  authored
  f85307d

  Copy full SHA for f85307d

• Merge pull request #39932 from jbytheway/stop_requirements_tracking

  Show description for 24673ca
  ifreund

  authored
  24673ca

  Copy full SHA for 24673ca

• Merge pull request #39898 from Demoragon/fix-charges

  Show description for d1c39eb
  ifreund

  authored
  d1c39eb

  Copy full SHA for d1c39eb

• Dynamic compact aim window pt.1 (#37715)

  Show description for 5926e6e
  Kilvoctu

  authored
  5926e6e

  Copy full SHA for 5926e6e