Code

Spiral mine jsonify#48003

Code

Merged

ZhilkinSerg merged 61 commits intoCleverRaven:0.F-devCleverRaven/Cataclysm-DDA:0.F-devfrom Night-Pryanik:mine-tunnels-jsonifyCopy head branch name to clipboardMar 14, 2021

+546-161

Commits

Commits on Mar 12, 2021

• Created separate file for mine overmap specials and moved definition of Mine Entrance to this file

  

  Valiant

  committed
  d793a43

  Copy full SHA for d793a43

• Fixed hardcoded tunnels not spawning

  

  Valiant

  committed
  b945eee

  Copy full SHA for b945eee

• Added pillar terrain

  

  Valiant

  committed
  d70a241

  Copy full SHA for d70a241

• Added pillars to lower section of mine shaft

  Show description for 823fb55
  

  Valiant

  committed
  823fb55

  Copy full SHA for 823fb55

• Added overmap terrain definitions for spiral mine variant

  

  Valiant

  committed
  be9f399

  Copy full SHA for be9f399

• Created Spiral mine overmap special

  

  Valiant

  committed
  21aa342

  Copy full SHA for 21aa342

• Added nested mapgen for mine locations

  

  Valiant

  committed
  056a481

  Copy full SHA for 056a481

• Added spiral madman NPC and its responses

  

  Valiant

  committed
  79f65a7

  Copy full SHA for 79f65a7

• Added Spiral mine mapgen

  

  Valiant

  committed
  8d9ae6b

  Copy full SHA for 8d9ae6b

• Moved spiral and spiral_hub OMTs to obsolete terrain list

  

  Valiant

  committed
  ef4aca8

  Copy full SHA for ef4aca8

• Removed spiral and spiral_hub OMTs from mods

  

  Valiant

  committed
  d2079ef

  Copy full SHA for d2079ef

• Removed all mentions of old hardcoded spiral and spiral hub mapgen

  Show description for 67234a2
  

  Valiant

  committed
  67234a2

  Copy full SHA for 67234a2

Commits on Mar 13, 2021

• Valentine Cards (#47438)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  c0697f5

  Copy full SHA for c0697f5

• Add a proficiency for handloading, and a new profession (#47244)

  

  LaVeyanFiend

  authored and

  ZhilkinSerg

  committed
  fd263ed

  Copy full SHA for fd263ed

• Drug Dealer Profession (#47255)

  

  slimeboy460

  authored and

  ZhilkinSerg

  committed
  e7011f7

  Copy full SHA for e7011f7

• Adds hallula, a type of bread popular in Bolivia and Chile

  

  ToxiClay

  authored and

  ZhilkinSerg

  committed
  e03e778

  Copy full SHA for e03e778

• Arm mounted pouch (#46946)

  

  Jamuro-g

  authored and

  ZhilkinSerg

  committed
  005caf8

  Copy full SHA for 005caf8

• Tazer drone iii (#47353)

  

  Xenomorph-III

  authored and

  ZhilkinSerg

  committed
  ec6e6c1

  Copy full SHA for ec6e6c1

• Added Gelatin and Several Gelatin Based Recipes (#47080)

  

  GrubGrubgit

  authored and

  ZhilkinSerg

  committed
  79f615c

  Copy full SHA for 79f615c

• Content: bread in a can (#45680)

  

  Xaleth

  authored and

  ZhilkinSerg

  committed
  f38b0aa

  Copy full SHA for f38b0aa

• New random mission (#44999)

  

  El-Jekozo

  authored and

  ZhilkinSerg

  committed
  14c7a89

  Copy full SHA for 14c7a89

• Mycus fruit Juice (#44952)

  

  Chambs-15

  authored and

  ZhilkinSerg

  committed
  23fb60e

  Copy full SHA for 23fb60e

• Milleable corn (#46254)

  

  Zukulini

  authored and

  ZhilkinSerg

  committed
  7602a6e

  Copy full SHA for 7602a6e

• Talk Tag Additions (#47010)

  

  klorpa

  authored and

  ZhilkinSerg

  committed
  71b9a8b

  Copy full SHA for 71b9a8b

• Fix typo in Valentines Card (#47583)

  

  UmbralReaper

  authored and

  ZhilkinSerg

  committed
  208b9f6

  Copy full SHA for 208b9f6

• (CrazyCataclysm) Crazy Hallucinations (#47386)

  

  SariusSkelrets

  authored and

  ZhilkinSerg

  committed
  be9bdaa

  Copy full SHA for be9bdaa

• Mealgurb (#47685)

  

  Fosheze

  authored and

  ZhilkinSerg

  committed
  f43a8d8

  Copy full SHA for f43a8d8

• Add duct tape blindfold for old reciepe plus tweaks for reciepe (#47527)

  

  Lamandus

  authored and

  ZhilkinSerg

  committed
  3b5ab3b

  Copy full SHA for 3b5ab3b

• Prepare npc, spell, character, and item for new ai (#47207)

  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  8477818

  Copy full SHA for 8477818

• Make acetylene torch cut metal walls. (#46255)

  

  NeviNovat

  authored and

  ZhilkinSerg

  committed
  3988f39

  Copy full SHA for 3988f39

• Added disassembly recipes for several items (#46316)

  

  Karol1223

  authored and

  ZhilkinSerg

  committed
  cd4dbb8

  Copy full SHA for cd4dbb8

• Celsius temperature for freezing point (#47028)

  

  Hirmuolio

  authored and

  ZhilkinSerg

  committed
  1e94713

  Copy full SHA for 1e94713

• Stand up peek (#47257)

  

  Moltenhead

  authored and

  ZhilkinSerg

  committed
  4a44956

  Copy full SHA for 4a44956

• [AFTERSHOCK] Basic Ballistic Weapons (#47559)

  

  Mom-Bun

  authored and

  ZhilkinSerg

  committed
  e641428

  Copy full SHA for e641428

• makes glass walls and glass doors constructable (#47692)

  

  OromisElf

  authored and

  ZhilkinSerg

  committed
  e2f00cf

  Copy full SHA for e2f00cf

• Crackers as bread and jam&cheese sandwich (#47649)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  215da75

  Copy full SHA for 215da75

• [Aftershock] misc typograpical fixes (#47783)

  

  casswedson

  authored and

  ZhilkinSerg

  committed
  f96b96d

  Copy full SHA for f96b96d

• Tweaks for teas (#47848)

  

  Lamandus

  authored and

  ZhilkinSerg

  committed
  7225311

  Copy full SHA for 7225311

• Have travis run for 0.F-dev

  Show description for c3d1540
  

  actual-nh

  authored and

  ZhilkinSerg

  committed
  c3d1540

  Copy full SHA for c3d1540

• Tweakes to copper and metal pipes. (#47825)

  

  Lamandus

  authored and

  ZhilkinSerg

  committed
  7044406

  Copy full SHA for 7044406

• Fried eggs deluxe, sandwiches, and condiment list (#47786)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  195fe40

  Copy full SHA for 195fe40

• Homemade toastems, buttercream frosting and recipes (#47696)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  f49d2c5

  Copy full SHA for f49d2c5

• Chocolate Cow don't drop "cow pies"

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  fca63de

  Copy full SHA for fca63de

• Remove unused FATIGUE energy source from spells

  

  Fris0uman

  authored and

  ZhilkinSerg

  committed
  c5d362a

  Copy full SHA for c5d362a

• [Magiclysm] add owlbear origin snippet (#47752)

  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  5b101f1

  Copy full SHA for 5b101f1

• [Magiclysm] add lesser banishment spell, buff greater banishment (#47537)

  

  KorGgenT

  authored and

  ZhilkinSerg

  committed
  a25422c

  Copy full SHA for a25422c

• Unhardcode bio_heatsink and bio_climate

  

  Ramza13

  authored and

  ZhilkinSerg

  committed
  0728b18

  Copy full SHA for 0728b18

• Hunting lodge Location (#44378)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  4f1fca0

  Copy full SHA for 4f1fca0

• fungal evolution (#47247)

  

  LyleSY

  authored and

  ZhilkinSerg

  committed
  432d078

  Copy full SHA for 432d078

• Add book strap carrier (#47665)

  

  FuelType-Memes

  authored and

  ZhilkinSerg

  committed
  714767d

  Copy full SHA for 714767d

• Partial mine jsonify; new zombie miner (#47790)

  Show description for 68abdd9
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  68abdd9

  Copy full SHA for 68abdd9

• Add 0.F-dev to matrix.yml

  Show description for 2d3e9d9
  

  actual-nh

  authored and

  ZhilkinSerg

  committed
  2d3e9d9

  Copy full SHA for 2d3e9d9

• 0.F-dev workflows (#47875)

  

  actual-nh

  authored and

  ZhilkinSerg

  committed
  7a5f2dc

  Copy full SHA for 7a5f2dc

• Alter brown bread recipe to match canned version

  Show description for 9574872
  

  actual-nh

  authored and

  ZhilkinSerg

  committed
  9574872

  Copy full SHA for 9574872

• Mine entrance expand (#47928)

  Show description for 34a2af5
  

  Anton Burmistrov

  authored and

  ZhilkinSerg

  committed
  34a2af5

  Copy full SHA for 34a2af5

• [DinoMod] Mushroom Madness (#47907)

  

  LyleSY

  authored and

  ZhilkinSerg

  committed
  d7c6292

  Copy full SHA for d7c6292

• misc typograpical fixes

  

  casswedson

  authored and

  ZhilkinSerg

  committed
  2a0ebcb

  Copy full SHA for 2a0ebcb

• body pillow recipe makes makeshift body pillow now (#47917)

  

  OromisElf

  authored and

  ZhilkinSerg

  committed
  744ea57

  Copy full SHA for 744ea57

• Apply suggestion from code review

  

  Valiant

  committed
  2d53283

  Copy full SHA for 2d53283

• Merge branch '0.F-dev' into mine-tunnels-jsonify

  

  Anton Burmistrov

  authored
  42df336

  Copy full SHA for 42df336

Commits on Mar 14, 2021

• Merge branch '0.F-dev' into mine-tunnels-jsonify

  ZhilkinSerg

  authored
  de634c7

  Copy full SHA for de634c7