Code

Add map_bash_info to fields #37865

Code

Merged

ZhilkinSerg merged 39 commits intoCleverRaven:devCleverRaven/Cataclysm-DDA:devfrom Fris0uman:json_bash_fieldFris0uman/Cataclysm-DDA:json_bash_fieldCopy head branch name to clipboardMar 10, 2020

+84-17

Commits

Commits on Feb 9, 2020

• Add map_bash_info to fields

  

  Fris0uman

  committed
  d475900

Commits on Feb 10, 2020

• drop_group for fields

  

  Fris0uman

  committed
  ae131da

• succes msg and move cost to basing fields

  

  Fris0uman

  committed
  6ce0a11

• jsonize bashing cobwebs

  

  Fris0uman

  committed
  0a04746

• doc for bash in fields

  

  Fris0uman

  committed
  ee31ca5

• doc move_cost

  

  Fris0uman

  committed
  101d9f9

• Merge branch 'master' into json_bash_field

  Fris0uman

  authored
  b015958

• Update src/handle_action.cpp

  Show description for f8a93f1
  

  Fris0uman

  and

  BevapDin

  authored
  f8a93f1

Commits on Feb 11, 2020

• Apply suggestions from code review

  Show description for 11f83e4
  

  Fris0uman

  and

  ZhilkinSerg

  authored
  11f83e4

• Apply suggestions from code review

  Show description for 20825d3
  

  Fris0uman

  and

  ZhilkinSerg

  authored
  20825d3

Commits on Mar 7, 2020

• [Aftershock] Millyficent whately and the migo (CleverRaven#36908)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  b5c78e7

• DinoModv3: DinoDNA (CleverRaven#26525)

  

  LyleSY

  authored and

  ZhilkinSerg

  committed
  b62f1e5

• Dark Skies Part 2: Blacklists

  Show description for 69527a1
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  69527a1

• Dark Skies Part 3: Effects and Items

  Show description for ce5f6c7
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  ce5f6c7

• Part 3.1

  Show description for 8c8984e
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  8c8984e

• Dark Skies Part 4: Overrides (CleverRaven#38526)

  Show description for 08a98dc
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  08a98dc

• Override scraps

  Show description for 70708bc
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  70708bc

• adds snippets

  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  f7e0228

• Adds files related to monsters

  Show description for de1caa4
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  de1caa4

• Removes door opening from certain soldiers

  Show description for 7c681af
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  7c681af

• Slows down consecrators

  Show description for db65552
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  db65552

• Slows down emissaries

  Show description for 813090f
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  813090f

• Lints neworder_loworder

  Show description for 0b85f94
  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  0b85f94

• [Aftershock] Mutant npcs to aftershock (CleverRaven#37530)

  

  Maleclypse

  authored and

  ZhilkinSerg

  committed
  1b58c70

• Aftershock Crafting System (CleverRaven#37707)

  

  John-Candlebury

  authored and

  ZhilkinSerg

  committed
  584bb08

• Adds new starting scenario - Crazy party and new starting profession - Frat Boy/Sorority Girl (CleverRaven#37512)

  

  CountAlex

  authored and

  ZhilkinSerg

  committed
  5ba0257

• Add subway maps (CleverRaven#37540)

  

  wapcaplet

  authored and

  ZhilkinSerg

  committed
  1208879

• Add The Satanic Bible (CleverRaven#37806)

  

  karthas077

  authored and

  ZhilkinSerg

  committed
  5af8e88

• add shot counter to mods and gun

  

  dpwb

  authored and

  ZhilkinSerg

  committed
  3d18006

• Refluff power armour and adjust stats slightly (CleverRaven#37578)

  

  I-am-Erk

  authored and

  ZhilkinSerg

  committed
  2b6e39b

• Fix line endings

  ZhilkinSerg

  committed
  51e0405

• Allow professions to start with a nearby vehicle - trucker profession (CleverRaven#37314)

  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  974886d

• Dark Skies 8: Adds strays, lurker, enemies; updates modinfo (CleverRaven#38596)

  

  ephemeralstoryteller

  authored and

  ZhilkinSerg

  committed
  ed6a6d7

Commits on Mar 8, 2020

• updates for spell fixes (CleverRaven#38643)

  Show description for e409ccb
  ephemeralstoryteller

  authored
  e409ccb

• [Magiclysm] Add Magiclysm academy (CleverRaven#38511)

  Show description for 414f387
  

  curstwist

  and

  KorGgenT

  authored
  414f387

• Magiclysm: Forest Tomb (CleverRaven#37699)

  Show description for 6e83cb4
  

  arijust

  and

  KorGgenT

  authored
  6e83cb4

Commits on Mar 9, 2020

• Merge branch 'dev' into json_bash_field

  ZhilkinSerg

  authored
  5ff4f80

Commits on Mar 10, 2020

• Update power_armor.json

  ZhilkinSerg

  authored
  43d55a3

• Merge branch 'dev' into json_bash_field

  ZhilkinSerg

  authored
  c6da2b8