Code

SUS Bathroom Dec 31st#38

Code

Merged

xanderrootslayer merged 119 commits intoxanderrootslayer:masterxanderrootslayer/Cataclysm-DDA:masterfrom CleverRaven:masterCleverRaven/Cataclysm-DDA:masterCopy head branch name to clipboardJan 1, 2020

+15,406-4,187

Commits

Commits on Dec 19, 2019

• Allow defining anonymous item groups in mapgen

  

  ymber

  committed
  70d90ec

• Add example item group to apartment_palette

  

  ymber

  committed
  839e8e0

• Update mapgen documentation

  

  ymber

  committed
  553f5af

Commits on Dec 21, 2019

• Extracted mon_info_update from mon_info to make safe mode work independent of the compass.

  ipcyborg

  committed
  18e7ce1

Commits on Dec 22, 2019

• Struct monster_visible_info moved to avatar.

  Show description for 4c11a48
  ipcyborg

  committed
  4c11a48

Commits on Dec 23, 2019

• Wreaths and trees

  Maleclypse

  committed
  1e03fe4

• Linting

  Maleclypse

  committed
  d08608d

• Update furniture-decorative.json

  Show description for 5b55cd9
  Maleclypse

  committed
  5b55cd9

• Update furniture-decorative.json

  Maleclypse

  committed
  c4d26a7

• Update furniture-decorative.json

  Maleclypse

  committed
  8b69dee

• corrected stick

  Maleclypse

  committed
  ef0ad76

Commits on Dec 25, 2019

• new tileset retrodays+

  

  captnblood

  committed
  e4e33a0

• Tweak vinegar recipe.

  arijust

  authored
  44c2b56

• Decorative

  Maleclypse

  committed
  78615d2

• Moving #36438 to Aftershock

  Show description for 6d3ae1a
  Maleclypse

  committed
  6d3ae1a

• Update afs_weapons.json

  Maleclypse

  committed
  7193ff1

Commits on Dec 26, 2019

• move no spawn condition

  Hirmuolio

  authored
  e00de80

• reworked spawning from group

  Hirmuolio

  committed
  cf24631

Commits on Dec 28, 2019

• Refactor code in npc::wield to be safer:

  Show description for 6ae8cde
  BevapDin

  committed
  6ae8cde

• Stop process of wielding when the item has been taken from the holster.

  BevapDin

  committed
  420fd68

• Update recipes_holiday.json

  Maleclypse

  committed
  dd50731

Commits on Dec 29, 2019

• Update recipes_holiday.json

  Maleclypse

  committed
  30d0f4d

• Update recipes_holiday.json

  Maleclypse

  committed
  610e1da

• Update recipes_holiday.json

  Maleclypse

  committed
  4385b95

• Merge branch 'master' into Chicken-tripod-tankbot-to-aftershock

  Maleclypse

  authored
  35ca90a

• Update afs_deconstruction.json

  Maleclypse

  committed
  c883261

• Update afs_deconstruction.json

  Maleclypse

  committed
  d35eca8

• Fix box drawing characters of bitmap fonts not shown when SDL line drawing is disabled

  Qrox

  committed
  237904a

• Workshop toolbox item and recipe

  RarkGrames

  committed
  ffe1540

• Added workshop toolbox to itemgroups

  RarkGrames

  committed
  b4eab76

• Conserve escape sequences in json formatter & add json formatter to CMake lists

  Qrox

  committed
  342170a

• Update afs_robots.json

  Maleclypse

  committed
  cf52fe3

Commits on Dec 30, 2019

• Reduced weight (#36539)

  

  RarkGrames

  authored and

  kevingranade

  committed
  b9a503d

• fix units::serialize (#36546)

  

  KorGgenT

  authored and

  kevingranade

  committed
  63f1be8

• refactor drop activity and associated functions (#36205)

  

  KorGgenT

  authored and

  kevingranade

  committed
  1c9dafc

• Merge pull request #36235 from ymber/mapgen_items

  Show description for 13b78c9
  kevingranade

  authored
  13b78c9

• Increased mass, decreased volume and prying ability of makeshift crowbar

  

  Night-Pryanik

  authored and

  kevingranade

  committed
  a71df6b

• Obsolete chickenbot, tripod, tankbot (#36438)

  

  Matthew Taylor

  authored and

  kevingranade

  committed
  0dbf8c6

• Merge pull request #36451 from Hirmuolio/no-spawn-fix

  Show description for 73660c1
  kevingranade

  authored
  73660c1

• Add weapon ammo to the weapon name (#36474)

  

  Hirmuolio

  authored and

  kevingranade

  committed
  e4f70f4

• Merge pull request #36506 from BevapDin/ucw

  Show description for a0d976e
  kevingranade

  authored
  a0d976e

• Improve unvisited member warning format

  

  Qrox

  authored and

  kevingranade

  committed
  a34f59a

• Refactor profession item substitution:

  Show description for 174ee9e
  

  BevapDin

  authored and

  kevingranade

  committed
  174ee9e

• Axe ring holster (#36521)

  

  NeevAsteria

  authored and

  kevingranade

  committed
  6891eb5

• is it typical for aluminum to shatter?

  

  Jerimee

  authored and

  kevingranade

  committed
  d54a76e

• Update 454.json

  Show description for beef170
  

  Shotgunface

  authored and

  kevingranade

  committed
  beef170

• Merge pull request #36537 from RarkGrames/Toolbox-qualities-fix

  Show description for c532fc4
  kevingranade

  authored
  c532fc4

• Merge pull request #36447 from Maleclypse/Chicken-tripod-tankbot-to-aftershock

  Show description for 976c1d9
  Rivet-the-Zombie

  authored
  976c1d9

• Add libpulse dependencies for clang 6 build as well

  kevingranade

  authored
  0e2a286

• bump savegame version

  

  KorGgenT

  authored and

  kevingranade

  committed
  8bc6c43

• Merge pull request #36368 from Maleclypse/Christmas-2019

  Show description for 775e2d4
  kevingranade

  authored
  775e2d4

• Merge pull request #36322 from ipcyborg/fix-36236-safe-mode

  Show description for 0eecf62
  kevingranade

  authored
  0eecf62

• Fixed body window to show broken limb healing progress. (#36550)

  Show description for 5b3dcd7
  

  Ramza13

  authored and

  kevingranade

  committed
  5b3dcd7

• Fix linking error by explicitly instantiating advanced_inv_area::i_stacked

  Qrox

  committed
  efcccf8

• check for never_learn before adding candidate recipes to sdcard

  

  David Brown

  committed
  d5d1a97

• Use empty() method

  

  Fris0uman

  committed
  a8597e0

• Removed cooking skill requirement from makeshift pot and copper pot recipes

  Night-Pryanik

  committed
  4224568

• Sugar kin don't get thirst from food or drink

  

  Fris0uman

  committed
  5e74d4b

• Sugar kins can't get sick

  

  Fris0uman

  committed
  94ed5ce

• radiation is private

  

  Fris0uman

  committed
  75681c3

• missing radiation entries

  

  Fris0uman

  committed
  5d9879a

• Sugar kins are immune to radiations

  

  Fris0uman

  committed
  76f7f28

• Sugar kin can eat honey

  

  Fris0uman

  committed
  88a4e31

• Fix flooring of house_inner_garden

  John-Candlebury

  committed
  9141fc0

• Add missing whitespace

  ZhilkinSerg

  authored
  4159f6a

• Merge pull request #36567 from Fris0uman/ammotext

  Show description for 3237ce1
  ZhilkinSerg

  authored
  3237ce1

• Merge pull request #36573 from John-Candlebury/house-fix

  Show description for 2fb561c
  ZhilkinSerg

  authored
  2fb561c

• Merge pull request #36569 from Night-Pryanik/remove-cooking-skill-req-from-crafting-makeshift-pot

  Show description for d56be42
  ZhilkinSerg

  authored
  d56be42

• Merge pull request #36566 from davidpwbrown/sd_card_teaches_debug_fix

  Show description for d0d0722
  ZhilkinSerg

  authored
  d0d0722

• Merge pull request #36555 from Qrox/template-instantiation

  Show description for 0b45fa8
  ZhilkinSerg

  authored
  0b45fa8

• Fix bathroom SUS groups (#36529)

  

  Matthew Taylor

  authored and

  ZhilkinSerg

  committed
  45f85d2

• Merge pull request #36536 from Qrox/bitmap-font-box-drawing

  Show description for 3f950bf
  ZhilkinSerg

  authored
  3f950bf

• astyle

  

  Fris0uman

  committed
  26ec5c8

• Assorted Aftershock fixes

  ZhilkinSerg

  committed
  0406bae

• Assorted generic guns fixes

  ZhilkinSerg

  committed
  377fce1

• Assorted blazemod fixes

  ZhilkinSerg

  committed
  2749f76

• Assorted CRT expansion fixes

  ZhilkinSerg

  committed
  49e9e57

Commits on Dec 31, 2019

• Add city block (#36540)

  Show description for f216867
  

  curstwist

  authored and

  I-am-Erk

  committed
  f216867

• Update cooking_components.json (#36559)

  

  RarkGrames

  authored and

  I-am-Erk

  committed
  d12d605

• Carbon fiber crossbow bolts (#36552)

  Show description for b91f879
  

  RarkGrames

  authored and

  I-am-Erk

  committed
  b91f879

• Veteran survivor zombies (#36557)

  Show description for 22dd2b5
  

  RarkGrames

  authored and

  I-am-Erk

  committed
  22dd2b5

• Update materials section of JSON_INFO.md (#36476)

  Show description for a8dfebc
  

  Jerimee

  and

  I-am-Erk

  committed
  a8dfebc

• Remove pointless check before adding to values of map.

  Show description for 78fbf61
  BevapDin

  committed
  78fbf61

• Iterate via map::points_on_zlevel

  Show description for 45e8aad
  BevapDin

  committed
  45e8aad

• Convert functionality of tinymap::fake_load into its own class.

  Show description for 61dcc4d
  BevapDin

  committed
  61dcc4d

• Fix building with ccache.

  Show description for 0269822
  BevapDin

  committed
  0269822

• Fix exporting comments through ccache in a different way:

  Show description for 44c66e8
  BevapDin

  committed
  44c66e8

• Fix level of indention error.

  kevingranade

  committed
  9f94abe

• Merge pull request #36568 from ZhilkinSerg/mod-fix-2019-12-30

  Show description for 55987e0
  kevingranade

  authored
  55987e0

• Merge pull request #36571 from Fris0uman/sweet_misc

  Show description for 125ef83
  kevingranade

  authored
  125ef83

• Fix savegame migration for Hazardous Waste Sarcophagus

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  0e9401d

• Update Android build parameters on Travis

  

  ZhilkinSerg

  authored and

  kevingranade

  committed
  36a95fa

• Slight rewrite of first intercom mission.

  

  John-Candlebury

  authored and

  kevingranade

  committed
  93d8a1d

• Merge pull request #36582 from BevapDin/bpi

  Show description for 02408f0
  kevingranade

  authored
  02408f0

• Magiclysm - Golems (#35658)

  Show description for ab4acd2
  

  arijust

  and

  KorGgenT

  committed
  ab4acd2

• Options to allow previous behavior around prompt for dangerous terrain (#36037)

  Show description for 1e3f85e
  

  Ramza13

  authored and

  kevingranade

  committed
  1e3f85e

• refactor inventory_item_menu (#36206)

  

  KorGgenT

  authored and

  kevingranade

  committed
  521066c

• Prevent npc's jumping from ledges or running into dangerous tiles (#36475)

  

  Ramza13

  authored and

  kevingranade

  committed
  48df630

• Extended pickup window (#36492)

  

  8street

  authored and

  kevingranade

  committed
  b693d93

• Jsonize crafting skill penalty from mutations (#36565)

  Show description for 528f49b
  

  Fris0uman

  authored and

  kevingranade

  committed
  528f49b

• Replace characters in the Graphical Overmap mod with escape sequences

  Qrox

  committed
  fe47a3b

• Merge pull request #36431 from arijust/vinegar_rebalance

  Show description for 2414634
  Rivet-the-Zombie

  authored
  2414634

• Add the mandatory override specifier to make clang-tidy happy

  kevingranade

  authored
  e8cc67e

• Deprecate atomic cars

  kevingranade

  authored
  54d4135

• change <last_name> to <family_name>

  k4gi

  committed
  8e33e31

• Merge pull request #36589 from CleverRaven/kevingranade-clang-tidy-override

  Show description for 5206f9b
  ZhilkinSerg

  authored
  5206f9b

• Merge pull request #36583 from BevapDin/zsz

  Show description for 0e50d26
  ZhilkinSerg

  authored
  0e50d26

• Merge pull request #36591 from k4gi/fix-vampire-snippet

  Show description for e99b427
  ZhilkinSerg

  authored
  e99b427

• Merge pull request #36590 from CleverRaven/kevingranade-no-atomic-vehicles

  Show description for 44775fc
  ZhilkinSerg

  authored
  44775fc

• Fix token from %d to %s

  ZhilkinSerg

  authored
  472ed39

• Add new 10" wheel type (#36564)

  

  Matthew Taylor

  authored and

  ZhilkinSerg

  committed
  327c276

• Adds new 4-door Hatchback vehicle. (#36584)

  Show description for 31e1e8b
  

  martin509

  authored and

  ZhilkinSerg

  committed
  31e1e8b

• Merge pull request #36538 from Qrox/conserve-escape-sequence

  Show description for 566392c
  ZhilkinSerg

  authored
  566392c

• Merge pull request #36535 from Qrox/graphical-overmap-escaped-char

  Show description for 27499e0
  ZhilkinSerg

  authored
  27499e0

• Merge pull request #36592 from CleverRaven/fix-color-debugmsg

  Show description for f9d5d1d
  ZhilkinSerg

  authored
  f9d5d1d

• Allow autotravel to autoswim (#36547)

  Show description for 2bc8ccf
  

  davidpwbrown

  authored and

  ZhilkinSerg

  committed
  2bc8ccf

• Merge pull request #36424 from captnblood/retrodays+

  Show description for 51b0689
  ZhilkinSerg

  authored
  51b0689

• Add Triffid flowers (#36325)

  Show description for b1541cd
  

  arijust

  authored and

  I-am-Erk

  committed
  b1541cd

Commits on Jan 1, 2020

• Remove unnecessary, incorrect forward declaration (#36607)

  Show description for 2169375
  

  jbytheway

  authored and

  kevingranade

  committed
  2169375