Code

[Aftershock] Frankenstein NPCs#37908

Code

Merged

ZhilkinSerg merged 87 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Maleclypse:Brain-Jar-NPCsMaleclypse/Cataclysm-DDA:Brain-Jar-NPCsCopy head branch name to clipboardAug 4, 2020

+1,787-26

Commits

Commits on Feb 11, 2020

• Frankenstein recipe, class, item, book.

  Show description for 0c958d2
  Maleclypse

  committed
  0c958d2

  Copy full SHA for 0c958d2

Commits on Mar 27, 2020

• Merge pull request #14 from CleverRaven/master

  Show description for 6abee0d
  Maleclypse

  authored
  6abee0d

  Copy full SHA for 6abee0d

Commits on Apr 3, 2020

• Merge pull request #15 from CleverRaven/master

  Show description for ea82db7
  Maleclypse

  authored
  ea82db7

  Copy full SHA for ea82db7

Commits on Apr 13, 2020

• Update frankenstein_recipes.json

  Maleclypse

  committed
  76baf49

  Copy full SHA for 76baf49

Commits on Apr 14, 2020

• Merge pull request #16 from CleverRaven/master

  Show description for 2c85d39
  Maleclypse

  authored
  2c85d39

  Copy full SHA for 2c85d39

Commits on Apr 23, 2020

• Merge pull request #17 from CleverRaven/master

  Show description for 8d986f1
  Maleclypse

  authored
  8d986f1

  Copy full SHA for 8d986f1

Commits on Apr 28, 2020

• Merge pull request #19 from CleverRaven/master

  Show description for ce276d2
  Maleclypse

  authored
  ce276d2

  Copy full SHA for ce276d2

Commits on May 3, 2020

• Merge branch 'master' into Brain-Jar-NPCs

  Maleclypse

  authored
  2010751

  Copy full SHA for 2010751

Commits on May 5, 2020

• Merge pull request #20 from CleverRaven/master

  Show description for 27a08a9
  Maleclypse

  authored
  27a08a9

  Copy full SHA for 27a08a9

Commits on May 9, 2020

• Update whately_dialogue.json

  Maleclypse

  committed
  94cbba3

  Copy full SHA for 94cbba3

• Whately Cousins

  Maleclypse

  committed
  dff66be

  Copy full SHA for dff66be

• fixes

  Maleclypse

  committed
  91136ae

  Copy full SHA for 91136ae

• Update classes.json

  Maleclypse

  committed
  323e879

  Copy full SHA for 323e879

Commits on May 10, 2020

• fixes

  Maleclypse

  committed
  d807c1f

  Copy full SHA for d807c1f

• Update classes.json

  Maleclypse

  committed
  25f247a

  Copy full SHA for 25f247a

• needs whately lmoe and whately cousin nest

  Maleclypse

  committed
  9f06fdb

  Copy full SHA for 9f06fdb

• cousin chunks placed

  Maleclypse

  committed
  3adb592

  Copy full SHA for 3adb592

Commits on May 11, 2020

• Update whately_dialogue.json

  Maleclypse

  committed
  6262f34

  Copy full SHA for 6262f34

Commits on May 30, 2020

• updates LMOE and quests

  Maleclypse

  committed
  111e62c

  Copy full SHA for 111e62c

Commits on Jun 4, 2020

• Update whately_lmoe.json

  Maleclypse

  committed
  c74dd33

  Copy full SHA for c74dd33

• dialogue chicanery

  Maleclypse

  committed
  03f616b

  Copy full SHA for 03f616b

Commits on Jun 20, 2020

• Merge pull request #21 from CleverRaven/master

  Show description for 3558e43
  Maleclypse

  authored
  3558e43

  Copy full SHA for 3558e43

Commits on Jun 28, 2020

• Update whately_dialogue.json

  Maleclypse

  committed
  3887691

  Copy full SHA for 3887691

Commits on Jul 7, 2020

• add whately turrets

  Maleclypse

  committed
  dd691f5

  Copy full SHA for dd691f5

• Merge branch 'master' into Brain-Jar-NPCs

  Maleclypse

  authored
  4e74282

  Copy full SHA for 4e74282

• update fun to appropriate for creating abominations

  Maleclypse

  committed
  cd2ab86

  Copy full SHA for cd2ab86

Commits on Jul 8, 2020

• chemistry and linting

  Maleclypse

  committed
  d4b190e

  Copy full SHA for d4b190e

• terrains and fixes

  Maleclypse

  committed
  209db1b

  Copy full SHA for 209db1b

• Update whately_dialogue.json

  Maleclypse

  committed
  5522e2f

  Copy full SHA for 5522e2f

• wooden floor with lighting terrain

  Maleclypse

  committed
  f279811

  Copy full SHA for f279811

• Update terrain.json

  Maleclypse

  committed
  8c22e9d

  Copy full SHA for 8c22e9d

• corrections

  Maleclypse

  committed
  2184b60

  Copy full SHA for 2184b60

Commits on Jul 9, 2020

• need to make background revival traits from the trait group and then dialogue for it.

  Maleclypse

  committed
  9d8b460

  Copy full SHA for 9d8b460

Commits on Jul 10, 2020

• Update BG_tableofcontents_AFS.JSON

  Maleclypse

  committed
  b9ae900

  Copy full SHA for b9ae900

• fixes

  Maleclypse

  committed
  51e09f8

  Copy full SHA for 51e09f8

Commits on Jul 12, 2020

• All hail Wapcaplet! fixing background traits

  Maleclypse

  committed
  d8956b9

  Copy full SHA for d8956b9

• broken stuff

  Maleclypse

  committed
  1df56fb

  Copy full SHA for 1df56fb

• linting and nerf cargo trough

  Maleclypse

  committed
  3cfcb73

  Copy full SHA for 3cfcb73

Commits on Jul 13, 2020

• move effect out of update magpen

  Maleclypse

  committed
  cbbe852

  Copy full SHA for cbbe852

Commits on Jul 14, 2020

• Whately family BG and BG Revival traits

  Maleclypse

  committed
  e97a16b

  Copy full SHA for e97a16b

• Linting

  Maleclypse

  committed
  2ba8466

  Copy full SHA for 2ba8466

• Update classes.json

  Maleclypse

  committed
  df296b9

  Copy full SHA for df296b9

• Update whately_lmoe.json

  Maleclypse

  committed
  a1fb41f

  Copy full SHA for a1fb41f

Commits on Jul 15, 2020

• Merge pull request #22 from CleverRaven/master

  Show description for d492872
  Maleclypse

  authored
  d492872

  Copy full SHA for d492872

• Merge branch 'master' into Brain-Jar-NPCs

  Maleclypse

  committed
  1bbd5c0

  Copy full SHA for 1bbd5c0

Commits on Jul 16, 2020

• cyrus questline need to place npcs in whately bunker

  Maleclypse

  committed
  b513073

  Copy full SHA for b513073

• comma missing

  Maleclypse

  committed
  4c5653a

  Copy full SHA for 4c5653a

Commits on Jul 17, 2020

• Update cyrus_whately.json

  Maleclypse

  committed
  286aebe

  Copy full SHA for 286aebe

• background story and itemgroup spawn

  Maleclypse

  committed
  1ec4806

  Copy full SHA for 1ec4806

• Create BGRS_mi-go_1.json

  Show description for 12da5c1
  Maleclypse

  committed
  12da5c1

  Copy full SHA for 12da5c1

• Update bionics_groups.json

  Maleclypse

  committed
  5647a7d

  Copy full SHA for 5647a7d

Commits on Jul 19, 2020

• reanimation backgrounds

  Maleclypse

  committed
  d2b7f72

  Copy full SHA for d2b7f72

• schizo revivification stories

  Maleclypse

  committed
  e6e040f

  Copy full SHA for e6e040f

• linting

  Maleclypse

  committed
  4190e7b

  Copy full SHA for 4190e7b

• final backgrounds

  Maleclypse

  committed
  b983fce

  Copy full SHA for b983fce

• npc spawns

  Maleclypse

  committed
  88b1ba9

  Copy full SHA for 88b1ba9

• linting

  Maleclypse

  committed
  fe6db27

  Copy full SHA for fe6db27

Commits on Jul 20, 2020

• fixes

  Maleclypse

  committed
  4a7f414

  Copy full SHA for 4a7f414

• more fixes

  Maleclypse

  committed
  7d2ddc8

  Copy full SHA for 7d2ddc8

• Update whately_lmoe.json

  Maleclypse

  committed
  a735bee

  Copy full SHA for a735bee

Commits on Jul 25, 2020

• Update cyrus_whately.json

  Maleclypse

  committed
  484f718

  Copy full SHA for 484f718

Commits on Jul 26, 2020

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  1c8e95f

  Copy full SHA for 1c8e95f

• Update cyrus_whately.json

  Maleclypse

  committed
  faaaa6c

  Copy full SHA for faaaa6c

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  792b52a

  Copy full SHA for 792b52a

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  6da125b

  Copy full SHA for 6da125b

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  c4f82c4

  Copy full SHA for c4f82c4

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  103f5f0

  Copy full SHA for 103f5f0

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  a5ac2cd

  Copy full SHA for a5ac2cd

Commits on Jul 28, 2020

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  9d320e1

  Copy full SHA for 9d320e1

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  ec41667

  Copy full SHA for ec41667

• CI build fix

  Maleclypse

  committed
  73a51fb

  Copy full SHA for 73a51fb

• Revert "CI build fix"

  Show description for 729c7fe
  Maleclypse

  committed
  729c7fe

  Copy full SHA for 729c7fe

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  21482dc

  Copy full SHA for 21482dc

Commits on Jul 29, 2020

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  6e75219

  Copy full SHA for 6e75219

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  674d315

  Copy full SHA for 674d315

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  c0ab689

  Copy full SHA for c0ab689

• Update milly_whately_dialogue.json

  Maleclypse

  committed
  9c99547

  Copy full SHA for 9c99547

Commits on Jul 30, 2020

• spacing fixes

  Maleclypse

  committed
  3f24b79

  Copy full SHA for 3f24b79

• Update BGRS_dreamer.json

  Maleclypse

  authored
  52a3f08

  Copy full SHA for 52a3f08

• Update cyrus_whately.json

  Maleclypse

  authored
  8ef6d65

  Copy full SHA for 8ef6d65

• Update cyrus_whately.json

  Maleclypse

  committed
  e57509a

  Copy full SHA for e57509a

Commits on Jul 31, 2020

• Update cyrus_whately.json

  Maleclypse

  committed
  db5806f

  Copy full SHA for db5806f

• Update frankenstein_items.json

  Maleclypse

  committed
  1c91ab2

  Copy full SHA for 1c91ab2

Commits on Aug 1, 2020

• fixes and backgrounds

  Maleclypse

  committed
  61b8f20

  Copy full SHA for 61b8f20

• a linting we will go

  Maleclypse

  committed
  06d2a92

  Copy full SHA for 06d2a92

Commits on Aug 3, 2020

• Apply suggestions from code review

  ZhilkinSerg

  authored
  f9d76cb

  Copy full SHA for f9d76cb

• Merge branch 'master' into Brain-Jar-NPCs

  ZhilkinSerg

  authored
  b9584bf

  Copy full SHA for b9584bf