Mailing List Archive | ports@openbsd.org

I had been maintaining 0.H release candidates for a while locally, and the official release finally arrived. I get an error on package target: Warning: symlink(s) point to non-existent /usr/ports/pobj/cataclysm-dda-0.H/fake-amd64/usr/local/share/cataclysm-dda/doc/doc/../data/json/LOADING_ORDER.md Unsure if this is a bug in the port, or something upstream. I switched the port to use DIST_TUPLE instead, which required changing a patch and SUBST_VARS to use TAG instead of GH_TAGNAME. Index: Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile 22 Jan 2024 01:51:25 -0000 1.29 +++ Makefile 24 Nov 2024 00:29:32 -0000 @@ -1,12 +1,10 @@ COMMENT= rogue-like zombie survival game CATEGORIES= games -GH_ACCOUNT= CleverRaven -GH_PROJECT= Cataclysm-DDA -GH_TAGNAME= 0.G -DISTNAME= cataclysm-dda-${GH_TAGNAME} +TAG= 0.H-RELEASE +DIST_TUPLE+= github CleverRaven Cataclysm-DDA ${TAG} . +PKGNAME= cataclysm-dda-0.H EPOCH= 0 -REVISION= 0 HOMEPAGE= https://cataclysmdda.org MAINTAINER= Kirill Bychkov <kirby@openbsd.org> @@ -17,9 +15,9 @@ PERMIT_PACKAGE= Yes FLAVORS= no_x11 FLAVOR?= -WANTLIB= ${COMPILER_LIBCXX} c iconv intl m z +WANTLIB += ${COMPILER_LIBCXX} FLAC c iconv intl m z -# C++14 +# C++17 COMPILER= base-clang ports-gcc MODULES= devel/cmake textproc/intltool @@ -29,16 +27,17 @@ BUILD_DEPENDS = devel/abseil-cpp RUN_DEPENDS= devel/desktop-file-utils \ x11/gtk+4,-guic -LIB_DEPENDS= devel/gettext,-runtime +LIB_DEPENDS= audio/flac \ + devel/gettext,-runtime CONFIGURE_ARGS = -DLOCALIZE=ON \ -DBACKTRACE=OFF \ - -DGIT_VERSION=${GH_TAGNAME} \ + -DGIT_VERSION=${TAG} \ -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -lintl -liconv" -SUBST_VARS += GH_TAGNAME +SUBST_VARS += TAG .if ${FLAVOR:Mno_x11} WANTLIB+= curses form Index: distinfo =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 8 Mar 2023 20:00:59 -0000 1.15 +++ distinfo 24 Nov 2024 00:29:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-0.G.tar.gz) = 5VnQ1JWzFO05iQkgsiK0rlBn2xg7XTnUJjcAv9ZvNvs= -SIZE (cataclysm-dda-0.G.tar.gz) = 157200161 +SHA256 (CleverRaven-Cataclysm-DDA-0.H-RELEASE.tar.gz) = n72A0TMhMh1u0fWnNquHTgbTNUKfKlGjnu/S+lH+rmg= +SIZE (CleverRaven-Cataclysm-DDA-0.H-RELEASE.tar.gz) = 199269075 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 8 Mar 2023 20:00:59 -0000 1.1 +++ patches/patch-CMakeLists_txt 24 Nov 2024 00:29:32 -0000 @@ -1,12 +1,23 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -120,7 +120,7 @@ else () +@@ -84,6 +84,10 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") + set(_OS_FREEBSD_ 1) endif () - # System specific actions --if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin)") -+if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin|OpenBSD)") - if (NOT DATA_PREFIX) - set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda) - endif () ++if ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD") ++ set(_OS_OPENBSD_ 1) ++endif () ++ + if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") + set(_OS_DARWIN_ 1) + add_definitions(-DMACOSX) +@@ -171,7 +175,7 @@ else () + add_definitions(-DRELEASE) + # Use CMAKE_INSTALL_PREFIX as storage of data,gfx, etc.. Useful only on *nix OS. + if(USE_PREFIX_DATA_DIR) +- if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin)") ++ if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin|OpenBSD)") + set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda") + add_definitions(-DPREFIX=${CMAKE_INSTALL_PREFIX}) + configure_file( Index: patches/patch-src_version_cmake =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-src_version_cmake,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_version_cmake --- patches/patch-src_version_cmake 8 Mar 2023 20:00:59 -0000 1.1 +++ patches/patch-src_version_cmake 24 Nov 2024 00:29:32 -0000 @@ -7,7 +7,7 @@ Index: src/version.cmake ELSE(GIT_EXECUTABLE) - MESSAGE(WARNING "Git binary not found. Build version will be set to NULL. Install Git package or use -DGIT_BINARY to set path to git binary.") - SET (VERSION "NULL") -+ SET (VERSION "${GH_TAGNAME}") ++ SET (VERSION "${TAG}") ENDIF(GIT_EXECUTABLE) CONFIGURE_FILE(${SRC} ${DST} @ONLY) Index: pkg/PFRAG.no-no_x11 =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v retrieving revision 1.12 diff -u -p -r1.12 PFRAG.no-no_x11 --- pkg/PFRAG.no-no_x11 8 Mar 2023 20:00:59 -0000 1.12 +++ pkg/PFRAG.no-no_x11 24 Nov 2024 00:29:32 -0000 @@ -1,6 +1,5 @@ @bin bin/cataclysm-tiles @man man/man6/cataclysm-tiles.6 -share/cataclysm-dda/LICENSE-OFL-Terminus-Font.txt share/cataclysm-dda/font/ share/cataclysm-dda/font/Terminus.ttf share/cataclysm-dda/font/VecTerminus12Medium.otf @@ -14,6 +13,11 @@ share/cataclysm-dda/gfx/ASCIITileset/ASC share/cataclysm-dda/gfx/ASCIITileset/fallback.png share/cataclysm-dda/gfx/ASCIITileset/tile_config.json share/cataclysm-dda/gfx/ASCIITileset/tileset.txt +share/cataclysm-dda/gfx/ASCII_Overmap/ +share/cataclysm-dda/gfx/ASCII_Overmap/ASCIITiles.png +share/cataclysm-dda/gfx/ASCII_Overmap/fallback.png +share/cataclysm-dda/gfx/ASCII_Overmap/tile_config.json +share/cataclysm-dda/gfx/ASCII_Overmap/tileset.txt share/cataclysm-dda/gfx/Altica/ share/cataclysm-dda/gfx/Altica/centered.png share/cataclysm-dda/gfx/Altica/character.png @@ -26,27 +30,17 @@ share/cataclysm-dda/gfx/Altica/giant.png share/cataclysm-dda/gfx/Altica/huge.png share/cataclysm-dda/gfx/Altica/human_body.png share/cataclysm-dda/gfx/Altica/human_body_plus.png -share/cataclysm-dda/gfx/Altica/human_body_wielded.png share/cataclysm-dda/gfx/Altica/incomplete.png share/cataclysm-dda/gfx/Altica/incomplete_large.png share/cataclysm-dda/gfx/Altica/large.png share/cataclysm-dda/gfx/Altica/large_ridden.png share/cataclysm-dda/gfx/Altica/layering.json -share/cataclysm-dda/gfx/Altica/monsters_plus.png share/cataclysm-dda/gfx/Altica/normal.png share/cataclysm-dda/gfx/Altica/small.png share/cataclysm-dda/gfx/Altica/tall.png -share/cataclysm-dda/gfx/Altica/tall_furniture.png -share/cataclysm-dda/gfx/Altica/tall_magiclysm.png -share/cataclysm-dda/gfx/Altica/tall_overmap.png -share/cataclysm-dda/gfx/Altica/tall_terrain.png -share/cataclysm-dda/gfx/Altica/tall_vehicle.png -share/cataclysm-dda/gfx/Altica/tall_wielded.png share/cataclysm-dda/gfx/Altica/tile_config.json share/cataclysm-dda/gfx/Altica/tileset.txt -share/cataclysm-dda/gfx/Altica/traps_plus.png share/cataclysm-dda/gfx/Altica/ultica-tall.png -share/cataclysm-dda/gfx/Altica/vehicle_plus.png share/cataclysm-dda/gfx/BrownLikeBears/ share/cataclysm-dda/gfx/BrownLikeBears/big.png share/cataclysm-dda/gfx/BrownLikeBears/fallback.png @@ -64,11 +58,11 @@ share/cataclysm-dda/gfx/ChibiUltica/Chib share/cataclysm-dda/gfx/ChibiUltica/ChibiNormal.png share/cataclysm-dda/gfx/ChibiUltica/ChibiSmall.png share/cataclysm-dda/gfx/ChibiUltica/ChibiTall.png -share/cataclysm-dda/gfx/ChibiUltica/ChibiTaller.png share/cataclysm-dda/gfx/ChibiUltica/ChibiWide.png share/cataclysm-dda/gfx/ChibiUltica/centered.png share/cataclysm-dda/gfx/ChibiUltica/dcss.png share/cataclysm-dda/gfx/ChibiUltica/fallback.png +share/cataclysm-dda/gfx/ChibiUltica/filler.png share/cataclysm-dda/gfx/ChibiUltica/fillergiant.png share/cataclysm-dda/gfx/ChibiUltica/fillerhoder.png share/cataclysm-dda/gfx/ChibiUltica/giant.png @@ -103,6 +97,16 @@ share/cataclysm-dda/gfx/Cuteclysm/tile_c share/cataclysm-dda/gfx/Cuteclysm/tileset.txt share/cataclysm-dda/gfx/Cuteclysm/ui.png share/cataclysm-dda/gfx/Cuteclysm/ultratallbackdrop.png +share/cataclysm-dda/gfx/GiantDays/ +share/cataclysm-dda/gfx/GiantDays/cursor.png +share/cataclysm-dda/gfx/GiantDays/fallback.png +share/cataclysm-dda/gfx/GiantDays/items.png +share/cataclysm-dda/gfx/GiantDays/large.png +share/cataclysm-dda/gfx/GiantDays/layering.json +share/cataclysm-dda/gfx/GiantDays/mobs.png +share/cataclysm-dda/gfx/GiantDays/tile_config.json +share/cataclysm-dda/gfx/GiantDays/tiles.png +share/cataclysm-dda/gfx/GiantDays/tileset.txt share/cataclysm-dda/gfx/HollowMoon/ share/cataclysm-dda/gfx/HollowMoon/fallback.png share/cataclysm-dda/gfx/HollowMoon/giant.png @@ -119,7 +123,6 @@ share/cataclysm-dda/gfx/Larwick_Overmap/ share/cataclysm-dda/gfx/Larwick_Overmap/tile_config.json share/cataclysm-dda/gfx/Larwick_Overmap/tileset.txt share/cataclysm-dda/gfx/MshockXotto+/ -share/cataclysm-dda/gfx/MshockXotto+/Credit.txt share/cataclysm-dda/gfx/MshockXotto+/big.png share/cataclysm-dda/gfx/MshockXotto+/dcss.png share/cataclysm-dda/gfx/MshockXotto+/dcssTall.png @@ -143,12 +146,24 @@ share/cataclysm-dda/gfx/MshockXotto+/wid share/cataclysm-dda/gfx/NeoDaysTileset/ share/cataclysm-dda/gfx/NeoDaysTileset/fallback.png share/cataclysm-dda/gfx/NeoDaysTileset/large.png +share/cataclysm-dda/gfx/NeoDaysTileset/layering.json share/cataclysm-dda/gfx/NeoDaysTileset/tile_config.json share/cataclysm-dda/gfx/NeoDaysTileset/tiles.png share/cataclysm-dda/gfx/NeoDaysTileset/tileset.txt +share/cataclysm-dda/gfx/PenAndPaper/ +share/cataclysm-dda/gfx/PenAndPaper/backgrounds.png +share/cataclysm-dda/gfx/PenAndPaper/cursor.png +share/cataclysm-dda/gfx/PenAndPaper/fallback.png +share/cataclysm-dda/gfx/PenAndPaper/icons-h.png +share/cataclysm-dda/gfx/PenAndPaper/icons-v.png +share/cataclysm-dda/gfx/PenAndPaper/icons.png +share/cataclysm-dda/gfx/PenAndPaper/overmap.png +share/cataclysm-dda/gfx/PenAndPaper/tile_config.json +share/cataclysm-dda/gfx/PenAndPaper/tileset.txt +share/cataclysm-dda/gfx/PenAndPaper/weather.png +share/cataclysm-dda/gfx/PenAndPaper/weather_unknown.png share/cataclysm-dda/gfx/RetroDaysTileset/ share/cataclysm-dda/gfx/RetroDaysTileset/fallback.png -share/cataclysm-dda/gfx/RetroDaysTileset/overlay_ordering.json share/cataclysm-dda/gfx/RetroDaysTileset/tile_config.json share/cataclysm-dda/gfx/RetroDaysTileset/tiles.png share/cataclysm-dda/gfx/RetroDaysTileset/tiles_20x20.png @@ -168,8 +183,7 @@ share/cataclysm-dda/gfx/SurveyorsMap/til share/cataclysm-dda/gfx/Ultica_iso/ share/cataclysm-dda/gfx/Ultica_iso/cursors.png share/cataclysm-dda/gfx/Ultica_iso/fallback.png -share/cataclysm-dda/gfx/Ultica_iso/fillergiant.png -share/cataclysm-dda/gfx/Ultica_iso/giant.png +share/cataclysm-dda/gfx/Ultica_iso/guns.png share/cataclysm-dda/gfx/Ultica_iso/human_body_2x.png share/cataclysm-dda/gfx/Ultica_iso/human_body_plus_2x.png share/cataclysm-dda/gfx/Ultica_iso/incomplete.png @@ -186,8 +200,8 @@ share/cataclysm-dda/gfx/Ultica_iso/iso_h share/cataclysm-dda/gfx/Ultica_iso/iso_high_wide.png share/cataclysm-dda/gfx/Ultica_iso/iso_large.png share/cataclysm-dda/gfx/Ultica_iso/iso_tall.png +share/cataclysm-dda/gfx/Ultica_iso/iso_tall_plus.png share/cataclysm-dda/gfx/Ultica_iso/iso_tall_r.png -share/cataclysm-dda/gfx/Ultica_iso/large.png share/cataclysm-dda/gfx/Ultica_iso/layering.json share/cataclysm-dda/gfx/Ultica_iso/normal.png share/cataclysm-dda/gfx/Ultica_iso/normal_2x.png Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 8 Mar 2023 20:00:59 -0000 1.15 +++ pkg/PLIST 24 Nov 2024 00:29:34 -0000 @@ -1,12 +1,10 @@ %%no_x11%% !%%no_x11%% share/cataclysm-dda/ -share/cataclysm-dda/LICENSE.txt -share/cataclysm-dda/README.md -share/cataclysm-dda/VERSION.txt share/cataclysm-dda/cataicon.ico share/cataclysm-dda/changelog.txt share/cataclysm-dda/core/ +share/cataclysm-dda/core/damage_indicators.json share/cataclysm-dda/core/game_balance.json share/cataclysm-dda/core/sentinels.json share/cataclysm-dda/core/tips.json @@ -35,101 +33,134 @@ share/cataclysm-dda/credits/uk_UA.credit share/cataclysm-dda/credits/zh_CN.credits share/cataclysm-dda/credits/zh_TW.credits share/cataclysm-dda/doc/ -share/cataclysm-dda/doc/ARMOR_BALANCE_AND_DESIGN.md -share/cataclysm-dda/doc/ARTIFACTS.md -share/cataclysm-dda/doc/ASCII_ART.md -share/cataclysm-dda/doc/BASECAMP.md -share/cataclysm-dda/doc/Blank_Building_Template.txt -share/cataclysm-dda/doc/CHANGELOG_GUIDELINES.md -share/cataclysm-dda/doc/CODE_STYLE.md -share/cataclysm-dda/doc/COLOR.md -share/cataclysm-dda/doc/COMPILING/ -share/cataclysm-dda/doc/COMPILING/COMPILER_SUPPORT.md -share/cataclysm-dda/doc/COMPILING/COMPILING-CMAKE-VCPKG.md -share/cataclysm-dda/doc/COMPILING/COMPILING-CMAKE.md -share/cataclysm-dda/doc/COMPILING/COMPILING-CYGWIN.md -share/cataclysm-dda/doc/COMPILING/COMPILING-FLATPAK.md -share/cataclysm-dda/doc/COMPILING/COMPILING-MSYS.md -share/cataclysm-dda/doc/COMPILING/COMPILING-VS-VCPKG.md -share/cataclysm-dda/doc/COMPILING/COMPILING.md -share/cataclysm-dda/doc/CONSRTUCTION_BALANCE.md -share/cataclysm-dda/doc/CONTRIBUTING.md -share/cataclysm-dda/doc/DEVELOPER_FAQ.md -share/cataclysm-dda/doc/DEVELOPER_TOOLING.md -share/cataclysm-dda/doc/EFFECTS_JSON.md -share/cataclysm-dda/doc/EFFECT_ON_CONDITION.md -share/cataclysm-dda/doc/EXAMINE.md -share/cataclysm-dda/doc/FACTIONS.md -share/cataclysm-dda/doc/GAME_BALANCE.md -share/cataclysm-dda/doc/GUIDE_COMESTIBLES.md -share/cataclysm-dda/doc/HOW_YOU_CAN_HELP.md -share/cataclysm-dda/doc/IN_REPO_MODS.md -share/cataclysm-dda/doc/ITEM_SPAWN.md -share/cataclysm-dda/doc/JSON_FLAGS.md -share/cataclysm-dda/doc/JSON_INFO.md -share/cataclysm-dda/doc/JSON_INHERITANCE.md -share/cataclysm-dda/doc/JSON_LOADING_ORDER.md -share/cataclysm-dda/doc/JSON_Mapping_Guides/ -share/cataclysm-dda/doc/JSON_Mapping_Guides/Guide_for_beginning_mapgen.md -share/cataclysm-dda/doc/JSON_Mapping_Guides/Guide_for_intermediate_mapgen.md -share/cataclysm-dda/doc/JSON_Mapping_Guides/JSON_ROOF_MAPGEN.md -share/cataclysm-dda/doc/JSON_STYLE.md -share/cataclysm-dda/doc/JSON_TOOLS.md -share/cataclysm-dda/doc/MAGIC.md -share/cataclysm-dda/doc/MANUAL_OF_STYLE.md -share/cataclysm-dda/doc/MAPGEN.md -share/cataclysm-dda/doc/MARTIALART_JSON.md -share/cataclysm-dda/doc/MISSIONS_JSON.md -share/cataclysm-dda/doc/MODDING.md -share/cataclysm-dda/doc/MONSTERS.md -share/cataclysm-dda/doc/MONSTER_SPECIAL_ATTACKS.md -share/cataclysm-dda/doc/MOVE_MODE.md -share/cataclysm-dda/doc/MUTATIONS.md -share/cataclysm-dda/doc/NPCs.md -share/cataclysm-dda/doc/OVERMAP.md -share/cataclysm-dda/doc/PLAYER_ACTIVITY.md -share/cataclysm-dda/doc/POINTS_COORDINATES.md -share/cataclysm-dda/doc/POSTAPOC_PRICE_GUIDE.md -share/cataclysm-dda/doc/PRACTICE_RECIPES.md -share/cataclysm-dda/doc/PROFICIENCY.md -share/cataclysm-dda/doc/PROFICIENCY_LIST.md -share/cataclysm-dda/doc/REGION_SETTINGS.md -share/cataclysm-dda/doc/RELEASE_DIFF.md -share/cataclysm-dda/doc/Ranged Ballistic Damage Modifier Calculator.ods -share/cataclysm-dda/doc/SOUNDPACKS.md -share/cataclysm-dda/doc/STEEL_CRAFTING.md -share/cataclysm-dda/doc/TER_FURN_TRANSFORM.md -share/cataclysm-dda/doc/TESTING.md -share/cataclysm-dda/doc/TILESET.md -share/cataclysm-dda/doc/TRANSLATING.md -share/cataclysm-dda/doc/TRANSLATING_MOD.md -share/cataclysm-dda/doc/USER_INTERFACE_AND_ACCESSIBILITY.md -share/cataclysm-dda/doc/VEHICLES_JSON.md -share/cataclysm-dda/doc/VITAMIN.md -share/cataclysm-dda/doc/WEATHER_TYPE.md -share/cataclysm-dda/doc/WIDGETS.md -share/cataclysm-dda/doc/cataclysm-tiles.6 -share/cataclysm-dda/doc/cataclysm.6 -share/cataclysm-dda/doc/img/ -share/cataclysm-dda/doc/img/autotile_edge_rotation.svg -share/cataclysm-dda/doc/img/autotile_full_rotation.svg -share/cataclysm-dda/doc/img/autotile_ortho_template.svg -share/cataclysm-dda/doc/img/translating-editor.png -share/cataclysm-dda/doc/img/translating-join.png -share/cataclysm-dda/doc/img/translating-list.png -share/cataclysm-dda/doc/img/translating-resource.png -share/cataclysm-dda/doc/img/translating-start.png -share/cataclysm-dda/doc/melee_weapons/ -share/cataclysm-dda/doc/melee_weapons/MELEE_BALANCE_SPREADSHEET.md -share/cataclysm-dda/doc/melee_weapons/Melee Weapon Evaluation.ods -share/cataclysm-dda/doc/unicode_chars_palette.txt +share/cataclysm-dda/doc/LICENSE-OFL-Terminus-Font.txt +share/cataclysm-dda/doc/LICENSE.txt +share/cataclysm-dda/doc/README.md +share/cataclysm-dda/doc/VERSION.txt +share/cataclysm-dda/doc/doc/ +share/cataclysm-dda/doc/doc/ARMOR_BALANCE_AND_DESIGN.md +share/cataclysm-dda/doc/doc/ARTIFACTS.md +share/cataclysm-dda/doc/doc/ASCII_ART.md +share/cataclysm-dda/doc/doc/BASECAMP.md +share/cataclysm-dda/doc/doc/Blank_Building_Template.txt +share/cataclysm-dda/doc/doc/CHANGELOG_GUIDELINES.md +share/cataclysm-dda/doc/doc/CLIMBING.md +share/cataclysm-dda/doc/doc/CODE_STYLE.md +share/cataclysm-dda/doc/doc/COLOR.md +share/cataclysm-dda/doc/doc/COMPILING/ +share/cataclysm-dda/doc/doc/COMPILING/COMPILER_SUPPORT.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-CMAKE-VCPKG.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-CMAKE.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-CYGWIN.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-DEVCONTAINER.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-FLATPAK.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-MSYS.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING-VS-VCPKG.md +share/cataclysm-dda/doc/doc/COMPILING/COMPILING.md +share/cataclysm-dda/doc/doc/CONSRTUCTION_BALANCE.md +share/cataclysm-dda/doc/doc/CONTRIBUTING.md +share/cataclysm-dda/doc/doc/DEVELOPER_FAQ.md +share/cataclysm-dda/doc/doc/DEVELOPER_TOOLING.md +share/cataclysm-dda/doc/doc/EFFECTS_JSON.md +share/cataclysm-dda/doc/doc/EFFECT_ON_CONDITION.md +share/cataclysm-dda/doc/doc/EXAMINE.md +share/cataclysm-dda/doc/doc/FACTIONS.md +share/cataclysm-dda/doc/doc/FREQUENTLY_MADE_SUGGESTIONS.md +share/cataclysm-dda/doc/doc/GAME_BALANCE.md +share/cataclysm-dda/doc/doc/GUIDE_COMESTIBLES.md +share/cataclysm-dda/doc/doc/HOW_YOU_CAN_HELP.md +share/cataclysm-dda/doc/doc/IN_REPO_MODS.md +share/cataclysm-dda/doc/doc/ITEM_SPAWN.md +share/cataclysm-dda/doc/doc/JSON_FLAGS.md +share/cataclysm-dda/doc/doc/JSON_INFO.md +share/cataclysm-dda/doc/doc/JSON_INHERITANCE.md +share/cataclysm-dda/doc/doc/JSON_LOADING_ORDER.md +share/cataclysm-dda/doc/doc/JSON_Mapping_Guides/ +share/cataclysm-dda/doc/doc/JSON_Mapping_Guides/Guide_for_beginning_mapgen.md +share/cataclysm-dda/doc/doc/JSON_Mapping_Guides/Guide_for_intermediate_mapgen.md +share/cataclysm-dda/doc/doc/JSON_Mapping_Guides/JSON_ROOF_MAPGEN.md +share/cataclysm-dda/doc/doc/JSON_STYLE.md +share/cataclysm-dda/doc/doc/JSON_TOOLS.md +share/cataclysm-dda/doc/doc/LORE.md +share/cataclysm-dda/doc/doc/Lore/ +share/cataclysm-dda/doc/doc/Lore/design-balance.md +share/cataclysm-dda/doc/doc/Lore/design-doc.md +share/cataclysm-dda/doc/doc/Lore/design-gameplay.md +share/cataclysm-dda/doc/doc/Lore/design-user-experience.md +share/cataclysm-dda/doc/doc/Lore/lore-background.md +share/cataclysm-dda/doc/doc/Lore/lore-factions.md +share/cataclysm-dda/doc/doc/Lore/lore.md +share/cataclysm-dda/doc/doc/Lore/technology.md +share/cataclysm-dda/doc/doc/MAGIC.md +share/cataclysm-dda/doc/doc/MANUAL_OF_STYLE.md +share/cataclysm-dda/doc/doc/MAPGEN.md +share/cataclysm-dda/doc/doc/MARTIALART_JSON.md +share/cataclysm-dda/doc/doc/MISSIONS_JSON.md +share/cataclysm-dda/doc/doc/MODDING.md +share/cataclysm-dda/doc/doc/MONSTERS.md +share/cataclysm-dda/doc/doc/MONSTER_SPECIAL_ATTACKS.md +share/cataclysm-dda/doc/doc/MOVE_MODE.md +share/cataclysm-dda/doc/doc/MUTATIONS.md +share/cataclysm-dda/doc/doc/NPCs.md +share/cataclysm-dda/doc/doc/OVERMAP.md +share/cataclysm-dda/doc/doc/PLAYER_ACTIVITY.md +share/cataclysm-dda/doc/doc/POINTS_COORDINATES.md +share/cataclysm-dda/doc/doc/PORTAL_STORM_BALANCE_AND_DESIGN.md +share/cataclysm-dda/doc/doc/POSTAPOC_PRICE_GUIDE.md +share/cataclysm-dda/doc/doc/PRACTICE_RECIPES.md +share/cataclysm-dda/doc/doc/PROFICIENCY.md +share/cataclysm-dda/doc/doc/PROFICIENCY_LIST.md +share/cataclysm-dda/doc/doc/REGION_SETTINGS.md +share/cataclysm-dda/doc/doc/RELEASE_DIFF.md +share/cataclysm-dda/doc/doc/Ranged Ballistic Damage Modifier Calculator.ods +share/cataclysm-dda/doc/doc/SOUNDPACKS.md +share/cataclysm-dda/doc/doc/STEEL_CRAFTING.md +share/cataclysm-dda/doc/doc/TER_FURN_TRANSFORM.md +share/cataclysm-dda/doc/doc/TESTING.md +share/cataclysm-dda/doc/doc/TESTING_YOUR_CHANGES.md +share/cataclysm-dda/doc/doc/TILESET.md +share/cataclysm-dda/doc/doc/TRANSLATING.md +share/cataclysm-dda/doc/doc/TRANSLATING_MOD.md +share/cataclysm-dda/doc/doc/USER_INTERFACE_AND_ACCESSIBILITY.md +share/cataclysm-dda/doc/doc/VEHICLES_JSON.md +share/cataclysm-dda/doc/doc/VITAMIN.md +share/cataclysm-dda/doc/doc/WEATHER_TYPE.md +share/cataclysm-dda/doc/doc/WIDGETS.md +share/cataclysm-dda/doc/doc/cataclysm-tiles.6 +share/cataclysm-dda/doc/doc/cataclysm.6 +share/cataclysm-dda/doc/doc/img/ +share/cataclysm-dda/doc/doc/img/Devcontainer-Add-User-To-Docker-Group.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Commented-Out-Qt5-Linux-Libs.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Dockerfile-Changed-Prompt-Click-Rebuild.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Enter-Build-Command-Object-Creator-Terminal.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Find-Commented-QT5-Commands-In-Dockerfile.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Find-Commented-Windows-Commands-In-Dockerfile.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Find-Uncommented-Linux-QT5-Libs.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Make-File-Configs.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Makefile-Settings-Crosscompile-Windows.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Re-Open-In-Container.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Running-Cataclysm-Devcontainer.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Uncomment-QT5-Part-In-Dockerfile.png +share/cataclysm-dda/doc/doc/img/Devcontainer-Uncomment-Windows-Part-In-Dockerfile.png +share/cataclysm-dda/doc/doc/img/Devcontainer-User-Does-Not-Have-Access-Add-To-Group-First.png +share/cataclysm-dda/doc/doc/img/autotile_edge_rotation.svg +share/cataclysm-dda/doc/doc/img/autotile_full_rotation.svg +share/cataclysm-dda/doc/doc/img/autotile_ortho_template.svg +share/cataclysm-dda/doc/doc/img/translating-editor.png +share/cataclysm-dda/doc/doc/img/translating-join.png +share/cataclysm-dda/doc/doc/img/translating-list.png +share/cataclysm-dda/doc/doc/img/translating-resource.png +share/cataclysm-dda/doc/doc/img/translating-start.png +share/cataclysm-dda/doc/doc/melee_weapons/ +share/cataclysm-dda/doc/doc/melee_weapons/MELEE_BALANCE_SPREADSHEET.md +share/cataclysm-dda/doc/doc/melee_weapons/Melee Weapon Evaluation.ods +share/cataclysm-dda/doc/doc/unicode_chars_palette.txt share/cataclysm-dda/help/ share/cataclysm-dda/help/texts.json share/cataclysm-dda/json/ share/cataclysm-dda/json/LOADING_ORDER.md share/cataclysm-dda/json/achievements.json share/cataclysm-dda/json/addictions.json -share/cataclysm-dda/json/addictions_eocs.json share/cataclysm-dda/json/ammo_effects.json share/cataclysm-dda/json/anatomy.json share/cataclysm-dda/json/artifact/ @@ -140,8 +171,67 @@ share/cataclysm-dda/json/artifact/legacy share/cataclysm-dda/json/artifact/premade_artifacts.json share/cataclysm-dda/json/artifact/relic_procgen_data.json share/cataclysm-dda/json/ascii_art/ +share/cataclysm-dda/json/ascii_art/ammo/ +share/cataclysm-dda/json/ascii_art/ammo/10mm.json +share/cataclysm-dda/json/ascii_art/ammo/12mm.json +share/cataclysm-dda/json/ascii_art/ammo/20x66mm.json +share/cataclysm-dda/json/ascii_art/ammo/22.json +share/cataclysm-dda/json/ascii_art/ammo/223.json +share/cataclysm-dda/json/ascii_art/ammo/270win.json +share/cataclysm-dda/json/ascii_art/ammo/300.json +share/cataclysm-dda/json/ascii_art/ammo/3006.json +share/cataclysm-dda/json/ascii_art/ammo/300blk.json +share/cataclysm-dda/json/ascii_art/ammo/308.json +share/cataclysm-dda/json/ascii_art/ammo/30carbine.json +share/cataclysm-dda/json/ascii_art/ammo/32.json +share/cataclysm-dda/json/ascii_art/ammo/357mag.json +share/cataclysm-dda/json/ascii_art/ammo/357sig.json +share/cataclysm-dda/json/ascii_art/ammo/36paper.json +share/cataclysm-dda/json/ascii_art/ammo/38.json +share/cataclysm-dda/json/ascii_art/ammo/380.json +share/cataclysm-dda/json/ascii_art/ammo/38super.json +share/cataclysm-dda/json/ascii_art/ammo/40.json +share/cataclysm-dda/json/ascii_art/ammo/40x46mm.json +share/cataclysm-dda/json/ascii_art/ammo/40x53mm.json +share/cataclysm-dda/json/ascii_art/ammo/410shot.json +share/cataclysm-dda/json/ascii_art/ammo/44.json +share/cataclysm-dda/json/ascii_art/ammo/44paper.json +share/cataclysm-dda/json/ascii_art/ammo/45.json +share/cataclysm-dda/json/ascii_art/ammo/454.json +share/cataclysm-dda/json/ascii_art/ammo/4570.json +share/cataclysm-dda/json/ascii_art/ammo/458wm.json +share/cataclysm-dda/json/ascii_art/ammo/45colt.json +share/cataclysm-dda/json/ascii_art/ammo/46.json +share/cataclysm-dda/json/ascii_art/ammo/460.json +share/cataclysm-dda/json/ascii_art/ammo/50.json +share/cataclysm-dda/json/ascii_art/ammo/500.json +share/cataclysm-dda/json/ascii_art/ammo/545x39.json +share/cataclysm-dda/json/ascii_art/ammo/57.json +share/cataclysm-dda/json/ascii_art/ammo/66mm.json +share/cataclysm-dda/json/ascii_art/ammo/762.json +share/cataclysm-dda/json/ascii_art/ammo/762R.json +share/cataclysm-dda/json/ascii_art/ammo/762x25.json +share/cataclysm-dda/json/ascii_art/ammo/84x246.json +share/cataclysm-dda/json/ascii_art/ammo/8x40mm.json +share/cataclysm-dda/json/ascii_art/ammo/9mm.json +share/cataclysm-dda/json/ascii_art/ammo/9x18.json +share/cataclysm-dda/json/ascii_art/ammo/atgm.json +share/cataclysm-dda/json/ascii_art/ammo/blank.json +share/cataclysm-dda/json/ascii_art/ammo/cannon.json +share/cataclysm-dda/json/ascii_art/ammo/flintlock.json +share/cataclysm-dda/json/ascii_art/ammo/nail.json +share/cataclysm-dda/json/ascii_art/ammo/paintball.json +share/cataclysm-dda/json/ascii_art/ammo/shot.json +share/cataclysm-dda/json/ascii_art/ammo/shotpaper.json +share/cataclysm-dda/json/ascii_art/ammo/signal_flare.json +share/cataclysm-dda/json/ascii_art/ammo/sling-ready_grenade.json +share/cataclysm-dda/json/ascii_art/ammo/weldgas.json +share/cataclysm-dda/json/ascii_art/battery.json share/cataclysm-dda/json/ascii_art/generic_ascii.json share/cataclysm-dda/json/ascii_art/gun_ascii.json +share/cataclysm-dda/json/ascii_art/vehicle/ +share/cataclysm-dda/json/ascii_art/vehicle/battery.json +share/cataclysm-dda/json/bionic_spells.json share/cataclysm-dda/json/bionics.json share/cataclysm-dda/json/body_parts.json share/cataclysm-dda/json/bodypart_graphs/ @@ -156,24 +246,62 @@ share/cataclysm-dda/json/bodypart_graphs share/cataclysm-dda/json/bodypart_graphs/torso.json share/cataclysm-dda/json/butchery_requirements.json share/cataclysm-dda/json/character_modifiers.json +share/cataclysm-dda/json/climbing.json share/cataclysm-dda/json/clothing_mods.json share/cataclysm-dda/json/conducts.json share/cataclysm-dda/json/connect_groups.json share/cataclysm-dda/json/construction.json share/cataclysm-dda/json/construction_category.json share/cataclysm-dda/json/construction_group.json +share/cataclysm-dda/json/damage_types.json share/cataclysm-dda/json/deconstruction.json share/cataclysm-dda/json/default_blacklist.json share/cataclysm-dda/json/disease.json share/cataclysm-dda/json/dreams.json -share/cataclysm-dda/json/effect_on_condition.json share/cataclysm-dda/json/effects.json +share/cataclysm-dda/json/effects_on_condition/ +share/cataclysm-dda/json/effects_on_condition/addictions_eocs.json +share/cataclysm-dda/json/effects_on_condition/bionic_eocs.json +share/cataclysm-dda/json/effects_on_condition/computer_eocs.json +share/cataclysm-dda/json/effects_on_condition/dream_eocs.json +share/cataclysm-dda/json/effects_on_condition/effects_eocs.json +share/cataclysm-dda/json/effects_on_condition/example_eocs.json +share/cataclysm-dda/json/effects_on_condition/generalized_eocs.json +share/cataclysm-dda/json/effects_on_condition/item_eocs.json +share/cataclysm-dda/json/effects_on_condition/mapgen_eocs/ +share/cataclysm-dda/json/effects_on_condition/mapgen_eocs/furniture_eocs.json +share/cataclysm-dda/json/effects_on_condition/mapgen_eocs/godco_mapgen_eocs.json +share/cataclysm-dda/json/effects_on_condition/mapgen_eocs/lab_mapgen_eocs.json +share/cataclysm-dda/json/effects_on_condition/mapgen_eocs/vanilla_map_weight_eocs.json +share/cataclysm-dda/json/effects_on_condition/melee_eocs.json +share/cataclysm-dda/json/effects_on_condition/misc_effect_on_condition.json +share/cataclysm-dda/json/effects_on_condition/mutation_eocs/ +share/cataclysm-dda/json/effects_on_condition/mutation_eocs/changing_eocs.json +share/cataclysm-dda/json/effects_on_condition/mutation_eocs/mutation_activation_eocs.json +share/cataclysm-dda/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json +share/cataclysm-dda/json/effects_on_condition/nether_eocs/ +share/cataclysm-dda/json/effects_on_condition/nether_eocs/nether_glass_effect_on_condition.json +share/cataclysm-dda/json/effects_on_condition/nether_eocs/portal_dependent_effect_on_condition.json +share/cataclysm-dda/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json +share/cataclysm-dda/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json +share/cataclysm-dda/json/effects_on_condition/npc_eocs/ +share/cataclysm-dda/json/effects_on_condition/npc_eocs/generic_npc_eocs.json +share/cataclysm-dda/json/effects_on_condition/npc_eocs/godco_npc_eocs.json +share/cataclysm-dda/json/effects_on_condition/npc_eocs/hallucination_eocs.json +share/cataclysm-dda/json/effects_on_condition/scenario_specific_eocs.json +share/cataclysm-dda/json/effects_on_condition/weather_eocs.json share/cataclysm-dda/json/emit.json share/cataclysm-dda/json/enchantments.json share/cataclysm-dda/json/encounters/ -share/cataclysm-dda/json/encounters/randec_valhallist_cult.json share/cataclysm-dda/json/encounters/randenc_caravans.json share/cataclysm-dda/json/encounters/randenc_refugee_center.json +share/cataclysm-dda/json/faults/ +share/cataclysm-dda/json/faults/faults_bionics.json +share/cataclysm-dda/json/faults/faults_guns.json +share/cataclysm-dda/json/faults/faults_vehicles.json +share/cataclysm-dda/json/faults/fixes_bionic.json +share/cataclysm-dda/json/faults/fixes_gun.json +share/cataclysm-dda/json/faults/fixes_vehicles.json share/cataclysm-dda/json/field_type.json share/cataclysm-dda/json/flags/ share/cataclysm-dda/json/flags.json @@ -209,6 +337,10 @@ share/cataclysm-dda/json/furniture_and_t share/cataclysm-dda/json/furniture_and_terrain/furniture-terrains.json share/cataclysm-dda/json/furniture_and_terrain/furniture-tools.json share/cataclysm-dda/json/furniture_and_terrain/furniture-triffid.json +share/cataclysm-dda/json/furniture_and_terrain/furniture_nether_monster.json +share/cataclysm-dda/json/furniture_and_terrain/furniture_vitrified.json +share/cataclysm-dda/json/furniture_and_terrain/special_use/ +share/cataclysm-dda/json/furniture_and_terrain/special_use/bullet_trailer.json share/cataclysm-dda/json/furniture_and_terrain/terrain-bridges-docks.json share/cataclysm-dda/json/furniture_and_terrain/terrain-doors.json share/cataclysm-dda/json/furniture_and_terrain/terrain-embrasures.json @@ -233,6 +365,8 @@ share/cataclysm-dda/json/furniture_and_t share/cataclysm-dda/json/furniture_and_terrain/terrain-walls.json share/cataclysm-dda/json/furniture_and_terrain/terrain-windows.json share/cataclysm-dda/json/furniture_and_terrain/terrain-zlevel-transitions.json +share/cataclysm-dda/json/furniture_and_terrain/terrain_nether_monster.json +share/cataclysm-dda/json/furniture_and_terrain/terrain_vitrified.json share/cataclysm-dda/json/gates.json share/cataclysm-dda/json/harvest.json share/cataclysm-dda/json/harvest_dissect.json @@ -266,6 +400,8 @@ share/cataclysm-dda/json/itemgroups/Labs share/cataclysm-dda/json/itemgroups/Labs/labs_mutagen.json share/cataclysm-dda/json/itemgroups/Locations_MapExtras/ share/cataclysm-dda/json/itemgroups/Locations_MapExtras/Arsonist_stock.json +share/cataclysm-dda/json/itemgroups/Locations_MapExtras/airdrop.json +share/cataclysm-dda/json/itemgroups/Locations_MapExtras/airdrop_mil.json share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations.json share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations_commercial.json share/cataclysm-dda/json/itemgroups/Locations_MapExtras/locations_mapextras.json @@ -302,6 +438,7 @@ share/cataclysm-dda/json/itemgroups/Weap share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_mg.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/308_sniper.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/338lapua_sniper.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x46.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/40x53.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/50_mg.json @@ -310,12 +447,28 @@ share/cataclysm-dda/json/itemgroups/Weap share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/84x246.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/9mm_submachine_gun.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_223.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_300aac.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_300wm.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_308.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_338.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_40x46.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_40x53.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_50.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_84x246.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_9mm.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/ammo_shot.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/armor.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/atgm.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/collections.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/explosive.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/arsenal/shot.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/conversions/ +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/conversions/conversion_guns.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_gunmods.json +share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/conversions/nested_conversion_guns.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/field_drops.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/gunmod.json share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -344,7 +497,6 @@ share/cataclysm-dda/json/itemgroups/main share/cataclysm-dda/json/itemgroups/military.json share/cataclysm-dda/json/itemgroups/misc.json share/cataclysm-dda/json/itemgroups/oa_shared_item_groups.json -share/cataclysm-dda/json/itemgroups/obsolete.json share/cataclysm-dda/json/itemgroups/portal_storm_loot.json share/cataclysm-dda/json/itemgroups/portalmancy.json share/cataclysm-dda/json/itemgroups/roof.json @@ -368,9 +520,11 @@ share/cataclysm-dda/json/items/ammo/270w share/cataclysm-dda/json/items/ammo/300.json share/cataclysm-dda/json/items/ammo/3006.json share/cataclysm-dda/json/items/ammo/300blk.json +share/cataclysm-dda/json/items/ammo/303.json share/cataclysm-dda/json/items/ammo/308.json share/cataclysm-dda/json/items/ammo/30carbine.json share/cataclysm-dda/json/items/ammo/32.json +share/cataclysm-dda/json/items/ammo/338lapua.json share/cataclysm-dda/json/items/ammo/357mag.json share/cataclysm-dda/json/items/ammo/357sig.json share/cataclysm-dda/json/items/ammo/36paper.json @@ -384,21 +538,24 @@ share/cataclysm-dda/json/items/ammo/410s share/cataclysm-dda/json/items/ammo/44.json share/cataclysm-dda/json/items/ammo/44paper.json share/cataclysm-dda/json/items/ammo/45.json +share/cataclysm-dda/json/items/ammo/450bushmaster.json share/cataclysm-dda/json/items/ammo/454.json share/cataclysm-dda/json/items/ammo/4570.json +share/cataclysm-dda/json/items/ammo/458wm.json share/cataclysm-dda/json/items/ammo/45colt.json share/cataclysm-dda/json/items/ammo/46.json share/cataclysm-dda/json/items/ammo/460.json share/cataclysm-dda/json/items/ammo/50.json share/cataclysm-dda/json/items/ammo/500.json +share/cataclysm-dda/json/items/ammo/50_beowulf.json +share/cataclysm-dda/json/items/ammo/50ae.json share/cataclysm-dda/json/items/ammo/545x39.json share/cataclysm-dda/json/items/ammo/57.json -share/cataclysm-dda/json/items/ammo/5x50.json share/cataclysm-dda/json/items/ammo/66mm.json -share/cataclysm-dda/json/items/ammo/700nx.json share/cataclysm-dda/json/items/ammo/762.json share/cataclysm-dda/json/items/ammo/762R.json share/cataclysm-dda/json/items/ammo/762x25.json +share/cataclysm-dda/json/items/ammo/77mm_jap.json share/cataclysm-dda/json/items/ammo/84x246mm.json share/cataclysm-dda/json/items/ammo/8x40mm.json share/cataclysm-dda/json/items/ammo/9mm.json @@ -412,7 +569,6 @@ share/cataclysm-dda/json/items/ammo/exod share/cataclysm-dda/json/items/ammo/flintlock.json share/cataclysm-dda/json/items/ammo/nail.json share/cataclysm-dda/json/items/ammo/paintball.json -share/cataclysm-dda/json/items/ammo/rpg.json share/cataclysm-dda/json/items/ammo/shot.json share/cataclysm-dda/json/items/ammo/shotpaper.json share/cataclysm-dda/json/items/ammo/signal_flare.json @@ -439,10 +595,12 @@ share/cataclysm-dda/json/items/armor/bes share/cataclysm-dda/json/items/armor/bespoke_armor/cuttingroom.json share/cataclysm-dda/json/items/armor/bespoke_armor/utility.json share/cataclysm-dda/json/items/armor/boots.json +share/cataclysm-dda/json/items/armor/brigandine.json share/cataclysm-dda/json/items/armor/cloaks.json share/cataclysm-dda/json/items/armor/coats.json share/cataclysm-dda/json/items/armor/exotic.json share/cataclysm-dda/json/items/armor/eyewear.json +share/cataclysm-dda/json/items/armor/gambesons.json share/cataclysm-dda/json/items/armor/gloves.json share/cataclysm-dda/json/items/armor/hats.json share/cataclysm-dda/json/items/armor/head_attachments.json @@ -535,8 +693,8 @@ share/cataclysm-dda/json/items/comestibl share/cataclysm-dda/json/items/comestibles/egg.json share/cataclysm-dda/json/items/comestibles/frozen.json share/cataclysm-dda/json/items/comestibles/fruit_dishes.json -share/cataclysm-dda/json/items/comestibles/irradiated_fruit.json -share/cataclysm-dda/json/items/comestibles/irradiated_veggy.json +share/cataclysm-dda/json/items/comestibles/irradiated_fruit_migration.json +share/cataclysm-dda/json/items/comestibles/irradiated_veggy_migration.json share/cataclysm-dda/json/items/comestibles/junkfood.json share/cataclysm-dda/json/items/comestibles/meat_dishes.json share/cataclysm-dda/json/items/comestibles/med.json @@ -548,6 +706,7 @@ share/cataclysm-dda/json/items/comestibl share/cataclysm-dda/json/items/comestibles/other.json share/cataclysm-dda/json/items/comestibles/protein.json share/cataclysm-dda/json/items/comestibles/raw_fruit.json +share/cataclysm-dda/json/items/comestibles/raw_grain.json share/cataclysm-dda/json/items/comestibles/raw_veggy.json share/cataclysm-dda/json/items/comestibles/sandwich.json share/cataclysm-dda/json/items/comestibles/seed.json @@ -556,7 +715,9 @@ share/cataclysm-dda/json/items/comestibl share/cataclysm-dda/json/items/comestibles/veggy_dishes.json share/cataclysm-dda/json/items/comestibles/wheat.json share/cataclysm-dda/json/items/containers/ -share/cataclysm-dda/json/items/containers.json +share/cataclysm-dda/json/items/containers/containers.json +share/cataclysm-dda/json/items/containers/conversions.json +share/cataclysm-dda/json/items/containers/generic.json share/cataclysm-dda/json/items/containers/military.json share/cataclysm-dda/json/items/corpses/ share/cataclysm-dda/json/items/corpses/corpses.json @@ -565,10 +726,12 @@ share/cataclysm-dda/json/items/corpses/d share/cataclysm-dda/json/items/corpses/inactive_bots.json share/cataclysm-dda/json/items/electronics.json share/cataclysm-dda/json/items/fake.json -share/cataclysm-dda/json/items/faults_bionic.json share/cataclysm-dda/json/items/fluff.json share/cataclysm-dda/json/items/fuel.json -share/cataclysm-dda/json/items/furniture.json +share/cataclysm-dda/json/items/furniture/ +share/cataclysm-dda/json/items/furniture/decorative.json +share/cataclysm-dda/json/items/furniture/seating.json +share/cataclysm-dda/json/items/furniture/storage.json share/cataclysm-dda/json/items/generic/ share/cataclysm-dda/json/items/generic.json share/cataclysm-dda/json/items/generic/ammolink.json @@ -594,9 +757,11 @@ share/cataclysm-dda/json/items/gun/270wi share/cataclysm-dda/json/items/gun/300.json share/cataclysm-dda/json/items/gun/3006.json share/cataclysm-dda/json/items/gun/300BLK.json +share/cataclysm-dda/json/items/gun/303.json share/cataclysm-dda/json/items/gun/308.json share/cataclysm-dda/json/items/gun/30carbine.json share/cataclysm-dda/json/items/gun/32.json +share/cataclysm-dda/json/items/gun/338lapua.json share/cataclysm-dda/json/items/gun/357sig.json share/cataclysm-dda/json/items/gun/36paper.json share/cataclysm-dda/json/items/gun/38.json @@ -609,8 +774,10 @@ share/cataclysm-dda/json/items/gun/410sh share/cataclysm-dda/json/items/gun/44.json share/cataclysm-dda/json/items/gun/44paper.json share/cataclysm-dda/json/items/gun/45.json +share/cataclysm-dda/json/items/gun/450bushmaster.json share/cataclysm-dda/json/items/gun/454.json share/cataclysm-dda/json/items/gun/4570.json +share/cataclysm-dda/json/items/gun/458wm.json share/cataclysm-dda/json/items/gun/45colt.json share/cataclysm-dda/json/items/gun/46.json share/cataclysm-dda/json/items/gun/460.json @@ -618,12 +785,11 @@ share/cataclysm-dda/json/items/gun/50.js share/cataclysm-dda/json/items/gun/500.json share/cataclysm-dda/json/items/gun/545x39.json share/cataclysm-dda/json/items/gun/57.json -share/cataclysm-dda/json/items/gun/5x50.json share/cataclysm-dda/json/items/gun/66mm.json -share/cataclysm-dda/json/items/gun/700nx.json share/cataclysm-dda/json/items/gun/762.json share/cataclysm-dda/json/items/gun/762R.json share/cataclysm-dda/json/items/gun/762x25.json +share/cataclysm-dda/json/items/gun/77mm_jap.json share/cataclysm-dda/json/items/gun/84x246mm.json share/cataclysm-dda/json/items/gun/8x40mm.json share/cataclysm-dda/json/items/gun/9mm.json @@ -635,8 +801,8 @@ share/cataclysm-dda/json/items/gun/blund share/cataclysm-dda/json/items/gun/cannon.json share/cataclysm-dda/json/items/gun/chemical_spray.json share/cataclysm-dda/json/items/gun/combination.json +share/cataclysm-dda/json/items/gun/converted.json share/cataclysm-dda/json/items/gun/exodii.json -share/cataclysm-dda/json/items/gun/faults_gun.json share/cataclysm-dda/json/items/gun/flammable.json share/cataclysm-dda/json/items/gun/flintlock.json share/cataclysm-dda/json/items/gun/nail.json @@ -648,7 +814,6 @@ share/cataclysm-dda/json/items/gun/ups.j share/cataclysm-dda/json/items/gunmod/ share/cataclysm-dda/json/items/gunmod/accessories.json share/cataclysm-dda/json/items/gunmod/barrel.json -share/cataclysm-dda/json/items/gunmod/bionicmods.json share/cataclysm-dda/json/items/gunmod/brass_catcher.json share/cataclysm-dda/json/items/gunmod/conversions.json share/cataclysm-dda/json/items/gunmod/grip.json @@ -673,9 +838,12 @@ share/cataclysm-dda/json/items/magazine/ share/cataclysm-dda/json/items/magazine/223.json share/cataclysm-dda/json/items/magazine/300.json share/cataclysm-dda/json/items/magazine/3006.json +share/cataclysm-dda/json/items/magazine/303.json share/cataclysm-dda/json/items/magazine/308.json share/cataclysm-dda/json/items/magazine/30carbine.json share/cataclysm-dda/json/items/magazine/32.json +share/cataclysm-dda/json/items/magazine/338lapua.json +share/cataclysm-dda/json/items/magazine/357mag.json share/cataclysm-dda/json/items/magazine/357sig.json share/cataclysm-dda/json/items/magazine/38.json share/cataclysm-dda/json/items/magazine/380.json @@ -685,23 +853,27 @@ share/cataclysm-dda/json/items/magazine/ share/cataclysm-dda/json/items/magazine/410shot.json share/cataclysm-dda/json/items/magazine/44.json share/cataclysm-dda/json/items/magazine/45.json +share/cataclysm-dda/json/items/magazine/450bushmaster.json share/cataclysm-dda/json/items/magazine/454.json share/cataclysm-dda/json/items/magazine/46.json share/cataclysm-dda/json/items/magazine/460.json share/cataclysm-dda/json/items/magazine/50.json share/cataclysm-dda/json/items/magazine/500.json +share/cataclysm-dda/json/items/magazine/50ae.json +share/cataclysm-dda/json/items/magazine/50beowulf.json share/cataclysm-dda/json/items/magazine/545x39.json share/cataclysm-dda/json/items/magazine/57.json -share/cataclysm-dda/json/items/magazine/5x50.json share/cataclysm-dda/json/items/magazine/66mm.json share/cataclysm-dda/json/items/magazine/762.json share/cataclysm-dda/json/items/magazine/762R.json share/cataclysm-dda/json/items/magazine/762x25.json +share/cataclysm-dda/json/items/magazine/77mm_jap.json share/cataclysm-dda/json/items/magazine/8x40mm.json share/cataclysm-dda/json/items/magazine/9mm.json share/cataclysm-dda/json/items/magazine/9x18.json share/cataclysm-dda/json/items/magazine/chemical_spray.json share/cataclysm-dda/json/items/magazine/exodii.json +share/cataclysm-dda/json/items/magazine/filter.json share/cataclysm-dda/json/items/magazine/liquid.json share/cataclysm-dda/json/items/magazine/methanol_fuelcell.json share/cataclysm-dda/json/items/magazine/nail.json @@ -715,11 +887,9 @@ share/cataclysm-dda/json/items/melee/mis share/cataclysm-dda/json/items/melee/spears_and_polearms.json share/cataclysm-dda/json/items/melee/swords_and_blades.json share/cataclysm-dda/json/items/melee/unarmed_weapons.json -share/cataclysm-dda/json/items/migration.json share/cataclysm-dda/json/items/mutagen_ingredients.json share/cataclysm-dda/json/items/nether.json share/cataclysm-dda/json/items/newspaper.json -share/cataclysm-dda/json/items/obsolete.json share/cataclysm-dda/json/items/ranged/ share/cataclysm-dda/json/items/ranged/archery.json share/cataclysm-dda/json/items/ranged/crossbows.json @@ -748,6 +918,7 @@ share/cataclysm-dda/json/items/resources share/cataclysm-dda/json/items/robot_parts.json share/cataclysm-dda/json/items/software.json share/cataclysm-dda/json/items/tool/ +share/cataclysm-dda/json/items/tool/cables.json share/cataclysm-dda/json/items/tool/container.json share/cataclysm-dda/json/items/tool/cooking.json share/cataclysm-dda/json/items/tool/debug_tools.json @@ -775,7 +946,7 @@ share/cataclysm-dda/json/items/tool/rain share/cataclysm-dda/json/items/tool/science.json share/cataclysm-dda/json/items/tool/shelters.json share/cataclysm-dda/json/items/tool/smoking.json -share/cataclysm-dda/json/items/tool/stationary.json +share/cataclysm-dda/json/items/tool/stationery.json share/cataclysm-dda/json/items/tool/stoneworking.json share/cataclysm-dda/json/items/tool/tailoring.json share/cataclysm-dda/json/items/tool/toiletries.json @@ -785,13 +956,13 @@ share/cataclysm-dda/json/items/tool/wood share/cataclysm-dda/json/items/tool/workshop.json share/cataclysm-dda/json/items/tool_armor.json share/cataclysm-dda/json/items/toolmod.json +share/cataclysm-dda/json/items/toy.json share/cataclysm-dda/json/items/vehicle/ share/cataclysm-dda/json/items/vehicle/alternator.json share/cataclysm-dda/json/items/vehicle/animals.json share/cataclysm-dda/json/items/vehicle/armor.json share/cataclysm-dda/json/items/vehicle/battery.json share/cataclysm-dda/json/items/vehicle/boat.json -share/cataclysm-dda/json/items/vehicle/cables.json share/cataclysm-dda/json/items/vehicle/cargo.json share/cataclysm-dda/json/items/vehicle/controls.json share/cataclysm-dda/json/items/vehicle/engine.json @@ -843,16 +1014,19 @@ share/cataclysm-dda/json/mapgen/airport/ share/cataclysm-dda/json/mapgen/animalpound.json share/cataclysm-dda/json/mapgen/animalshelter.json share/cataclysm-dda/json/mapgen/antique_store.json +share/cataclysm-dda/json/mapgen/apartment_complex/ +share/cataclysm-dda/json/mapgen/apartment_complex/apartment_complex_apt.json +share/cataclysm-dda/json/mapgen/apartment_complex/apartment_complex_nested.json +share/cataclysm-dda/json/mapgen/apartment_complex/apartment_complex_other.json +share/cataclysm-dda/json/mapgen/apartment_complex/apartment_complex_roof.json share/cataclysm-dda/json/mapgen/apartment_con_new.json share/cataclysm-dda/json/mapgen/apartment_mod_new.json share/cataclysm-dda/json/mapgen/arcade.json share/cataclysm-dda/json/mapgen/art_gallery.json share/cataclysm-dda/json/mapgen/bakery.json -share/cataclysm-dda/json/mapgen/bandit_cabin.json -share/cataclysm-dda/json/mapgen/bandit_camp.json -share/cataclysm-dda/json/mapgen/bandit_garage.json share/cataclysm-dda/json/mapgen/bank.json share/cataclysm-dda/json/mapgen/bar.json +share/cataclysm-dda/json/mapgen/barber_shop.json share/cataclysm-dda/json/mapgen/basecamps/ share/cataclysm-dda/json/mapgen/basecamps/base/ share/cataclysm-dda/json/mapgen/basecamps/base/bare_bones_basecamp/ @@ -860,13 +1034,7 @@ share/cataclysm-dda/json/mapgen/basecamp share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/ share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_beds.json share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_common.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_metal.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_rock.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_wood.json +share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_fire_lookout_tower/fbmc_fire_lookout_tower_construction.json share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_helipad/ share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_common.json share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_helipad/fbmc_helipad_garage.json @@ -895,13 +1063,7 @@ share/cataclysm-dda/json/mapgen/basecamp share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/ share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_beds.json share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_common.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_metal.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_rock.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_wood.json +share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_radio_tower/fbmc_radio_tower_construction.json share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_sealab_small/ share/cataclysm-dda/json/mapgen/basecamps/base/fbmc_sealab_small/fbmc_sealab_small_common.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_firestation_1/ @@ -910,70 +1072,35 @@ share/cataclysm-dda/json/mapgen/basecamp share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/ share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/ share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_common.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_construction.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_defenses.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_metal.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_rock.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_palettes.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_tent.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/modular_field_wood.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_1/primitive_field.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/ share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_common.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_concrete.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_metal.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_rock.json.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_construction.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_palettes.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_tent.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_hub/version_2/modular_field_wood.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/ share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_common.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_rock.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_standard.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_wood.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter/modular_shelter_construction.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/ share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_common.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_rock.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_standard.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_wood.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_1/modular_shelter_1_construction.json share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/ share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_common.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_log.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_rock.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_standard.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wad.json -share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_wood.json +share/cataclysm-dda/json/mapgen/basecamps/base/modular_shelter_2/modular_shelter_2_construction.json share/cataclysm-dda/json/mapgen/basecamps/expansion/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_wood.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_construction.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_1/modular_canteen_palettes.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_concrete.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_migo_resin.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_construction.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_palettes.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_canteen/version_2/modular_canteen_wood.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_farm/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_farm/version_1/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_farm/version_1/primitive_farm.json @@ -984,36 +1111,17 @@ share/cataclysm-dda/json/mapgen/basecamp share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_1/primitive_garage.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_concrete.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_migo_resin.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_construction.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_palettes.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_garage/version_2/modular_garage_wood.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_wood.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_construction.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_1/modular_livestock_palettes.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_concrete.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_migo_resin.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_construction.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_palettes.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_livestock/version_2/modular_livestock_wood.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_saltworks/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_saltworks/version_1/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_saltworks/version_1/modular_saltworks_common.json @@ -1027,53 +1135,24 @@ share/cataclysm-dda/json/mapgen/basecamp share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_wood.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_construction.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_1/modular_storehouse_palettes.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/ -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_bookcase.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_concrete.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_dresser.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_locker.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_migo_resin.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_construction.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_palettes.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rack.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_warehouse_shelf.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wood.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_wooden_rack.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_storehouse/version_2/modular_storehouse_storage.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_migo_resin.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_wood.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_construction.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_1/modular_workshop_palettes.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/ share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_common.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_concrete.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_log.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_metal.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_migo_resin.json +share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_construction.json share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_palettes.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rammed_earth.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_rock.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wad.json -share/cataclysm-dda/json/mapgen/basecamps/expansion/modular_workshop/version_2/modular_workshop_wood.json share/cataclysm-dda/json/mapgen/basecamps/expansion/salt_water_pipe.json -share/cataclysm-dda/json/mapgen/basecamps/modular_shacks.json +share/cataclysm-dda/json/mapgen/basecamps/fbmc_modular_shack.json share/cataclysm-dda/json/mapgen/basement/ share/cataclysm-dda/json/mapgen/basement/basement_bionic.json share/cataclysm-dda/json/mapgen/basement/basement_chem.json @@ -1085,12 +1164,16 @@ share/cataclysm-dda/json/mapgen/basement share/cataclysm-dda/json/mapgen/basement/basement_survival.json share/cataclysm-dda/json/mapgen/basement/basement_weed.json share/cataclysm-dda/json/mapgen/basement/basements.json +share/cataclysm-dda/json/mapgen/basic/ +share/cataclysm-dda/json/mapgen/basic/field.json +share/cataclysm-dda/json/mapgen/basic/lake.json share/cataclysm-dda/json/mapgen/bike_shop.json share/cataclysm-dda/json/mapgen/bowling_alley.json share/cataclysm-dda/json/mapgen/boxing.json share/cataclysm-dda/json/mapgen/bridges.json share/cataclysm-dda/json/mapgen/bugs/ share/cataclysm-dda/json/mapgen/bugs/ants.json +share/cataclysm-dda/json/mapgen/bugs/beehive.json share/cataclysm-dda/json/mapgen/bugs/nest_dermatik.json share/cataclysm-dda/json/mapgen/bugs/spider_pit.json share/cataclysm-dda/json/mapgen/bugs/wasp_tower.json @@ -1142,6 +1225,9 @@ share/cataclysm-dda/json/mapgen/city_blo share/cataclysm-dda/json/mapgen/city_blocks/urban_25_dense_diner_apt.json share/cataclysm-dda/json/mapgen/collapsed_tower.json share/cataclysm-dda/json/mapgen/construction_site.json +share/cataclysm-dda/json/mapgen/convention_center/ +share/cataclysm-dda/json/mapgen/convention_center/convention_center.json +share/cataclysm-dda/json/mapgen/convention_center/convention_center_nested.json share/cataclysm-dda/json/mapgen/crater.json share/cataclysm-dda/json/mapgen/cs_car_dealership.json share/cataclysm-dda/json/mapgen/cs_car_showroom.json @@ -1158,6 +1244,10 @@ share/cataclysm-dda/json/mapgen/cs_tire_ share/cataclysm-dda/json/mapgen/daycare.json share/cataclysm-dda/json/mapgen/debug_ramps.json share/cataclysm-dda/json/mapgen/derelict_property.json +share/cataclysm-dda/json/mapgen/deserter_city/ +share/cataclysm-dda/json/mapgen/deserter_city/deserter_city_gate.json +share/cataclysm-dda/json/mapgen/deserter_city/deserter_city_office.json +share/cataclysm-dda/json/mapgen/deserter_city/deserter_city_park.json share/cataclysm-dda/json/mapgen/diner.json share/cataclysm-dda/json/mapgen/dispensary.json share/cataclysm-dda/json/mapgen/dive_shop.json @@ -1165,6 +1255,7 @@ share/cataclysm-dda/json/mapgen/dock.jso share/cataclysm-dda/json/mapgen/dojo.json share/cataclysm-dda/json/mapgen/dollar_store.json share/cataclysm-dda/json/mapgen/drive-in_theater.json +share/cataclysm-dda/json/mapgen/drug_lab.json share/cataclysm-dda/json/mapgen/dummy/ share/cataclysm-dda/json/mapgen/dummy/dummy.json share/cataclysm-dda/json/mapgen/dump.json @@ -1172,6 +1263,7 @@ share/cataclysm-dda/json/mapgen/dumpsite share/cataclysm-dda/json/mapgen/earth.json share/cataclysm-dda/json/mapgen/exodii/ share/cataclysm-dda/json/mapgen/exodii/exo_safehouse.json +share/cataclysm-dda/json/mapgen/exodii/exo_warehouse.json share/cataclysm-dda/json/mapgen/exodii/exodii_base.json share/cataclysm-dda/json/mapgen/exodii/exodii_nested.json share/cataclysm-dda/json/mapgen/exodii/exodii_nested_singletile.json @@ -1195,7 +1287,6 @@ share/cataclysm-dda/json/mapgen/fema/FEM share/cataclysm-dda/json/mapgen/fema/FEMA_brc_01.json share/cataclysm-dda/json/mapgen/fema/FEMA_brc_02.json share/cataclysm-dda/json/mapgen/fema/FEMA_brc_03.json -share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_00.json share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_01.json share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_02.json share/cataclysm-dda/json/mapgen/fema/FEMA_entrance_03.json @@ -1245,15 +1336,21 @@ share/cataclysm-dda/json/mapgen/gas_stat share/cataclysm-dda/json/mapgen/gas_stations/s_gas.json share/cataclysm-dda/json/mapgen/godco/ share/cataclysm-dda/json/mapgen/godco/church_retreat.json -share/cataclysm-dda/json/mapgen/godco/godco_eocs.json share/cataclysm-dda/json/mapgen/godco/mapgen_updates.json share/cataclysm-dda/json/mapgen/godco/nested.json share/cataclysm-dda/json/mapgen/golfcourse.json share/cataclysm-dda/json/mapgen/gunsmith.json share/cataclysm-dda/json/mapgen/gym.json +share/cataclysm-dda/json/mapgen/haunting.json share/cataclysm-dda/json/mapgen/hazardous_waste_sarcophagus.json share/cataclysm-dda/json/mapgen/headshop.json share/cataclysm-dda/json/mapgen/helipad.json +share/cataclysm-dda/json/mapgen/hells_raiders/ +share/cataclysm-dda/json/mapgen/hells_raiders/bandit_cabin.json +share/cataclysm-dda/json/mapgen/hells_raiders/bandit_camp.json +share/cataclysm-dda/json/mapgen/hells_raiders/bandit_drug_lab.json +share/cataclysm-dda/json/mapgen/hells_raiders/bandit_garage.json +share/cataclysm-dda/json/mapgen/hells_raiders/bandit_work_camp.json share/cataclysm-dda/json/mapgen/homeimprovement.json share/cataclysm-dda/json/mapgen/homeimprovement_superstore_new.json share/cataclysm-dda/json/mapgen/homeless_camp.json @@ -1273,6 +1370,23 @@ share/cataclysm-dda/json/mapgen/house/bu share/cataclysm-dda/json/mapgen/house/bungalow06.json share/cataclysm-dda/json/mapgen/house/bungalow07.json share/cataclysm-dda/json/mapgen/house/bungalow08.json +share/cataclysm-dda/json/mapgen/house/bungalow09.json +share/cataclysm-dda/json/mapgen/house/bungalow10.json +share/cataclysm-dda/json/mapgen/house/bungalow11.json +share/cataclysm-dda/json/mapgen/house/bungalow12.json +share/cataclysm-dda/json/mapgen/house/bungalow13.json +share/cataclysm-dda/json/mapgen/house/bungalow14.json +share/cataclysm-dda/json/mapgen/house/bungalow15.json +share/cataclysm-dda/json/mapgen/house/bungalow16.json +share/cataclysm-dda/json/mapgen/house/bungalow17.json +share/cataclysm-dda/json/mapgen/house/bungalow18.json +share/cataclysm-dda/json/mapgen/house/bungalow19.json +share/cataclysm-dda/json/mapgen/house/bungalow20.json +share/cataclysm-dda/json/mapgen/house/bungalow21.json +share/cataclysm-dda/json/mapgen/house/bungalow22.json +share/cataclysm-dda/json/mapgen/house/bungalow23.json +share/cataclysm-dda/json/mapgen/house/bungalow24.json +share/cataclysm-dda/json/mapgen/house/bungalow25.json share/cataclysm-dda/json/mapgen/house/crack_house.json share/cataclysm-dda/json/mapgen/house/garden_house_1.json share/cataclysm-dda/json/mapgen/house/house01.json @@ -1341,6 +1455,11 @@ share/cataclysm-dda/json/mapgen/house/ho share/cataclysm-dda/json/mapgen/house/house_duplex7.json share/cataclysm-dda/json/mapgen/house/house_duplex8.json share/cataclysm-dda/json/mapgen/house/house_duplex9.json +share/cataclysm-dda/json/mapgen/house/house_fence01.json +share/cataclysm-dda/json/mapgen/house/house_fence02.json +share/cataclysm-dda/json/mapgen/house/house_fence03.json +share/cataclysm-dda/json/mapgen/house/house_fence04.json +share/cataclysm-dda/json/mapgen/house/house_fence05.json share/cataclysm-dda/json/mapgen/house/house_fortified.json share/cataclysm-dda/json/mapgen/house/house_garage.json share/cataclysm-dda/json/mapgen/house/house_garage2.json @@ -1380,6 +1499,7 @@ share/cataclysm-dda/json/mapgen/house/ur share/cataclysm-dda/json/mapgen/house/urban_17_house_ranch.json share/cataclysm-dda/json/mapgen/house/urban_18_victorian.json share/cataclysm-dda/json/mapgen/house/urban_1_house.json +share/cataclysm-dda/json/mapgen/house/urban_20_house.json share/cataclysm-dda/json/mapgen/house/urban_29_dense_row.json share/cataclysm-dda/json/mapgen/house/urban_2_house.json share/cataclysm-dda/json/mapgen/house/urban_2_house_dd.json @@ -1428,11 +1548,11 @@ share/cataclysm-dda/json/mapgen/lab/lab_ share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_health_clinic.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_maintenance_areas.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/ -share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_cargo.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_common.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_maintenance.json +share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mapgen_updates.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_medical.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mutagen.json share/cataclysm-dda/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_residential.json @@ -1453,7 +1573,6 @@ share/cataclysm-dda/json/mapgen/lab/lab_ share/cataclysm-dda/json/mapgen/lab/lab_surface/lab_surface_nested.json share/cataclysm-dda/json/mapgen/lab/lab_trains.json share/cataclysm-dda/json/mapgen/lab_subway_vent_shaft.json -share/cataclysm-dda/json/mapgen/lake.json share/cataclysm-dda/json/mapgen/lake_buildings/ share/cataclysm-dda/json/mapgen/lake_buildings/cabin_lake.json share/cataclysm-dda/json/mapgen/lake_buildings/freshwater_research_station.json @@ -1478,30 +1597,42 @@ share/cataclysm-dda/json/mapgen/mall/mal share/cataclysm-dda/json/mapgen/mall/mall_second_floor.json share/cataclysm-dda/json/mapgen/mall/mall_upper_roof.json share/cataclysm-dda/json/mapgen/mansion.json +share/cataclysm-dda/json/mapgen/mansion_boarded.json share/cataclysm-dda/json/mapgen/mansion_roof.json share/cataclysm-dda/json/mapgen/map_extras/ +share/cataclysm-dda/json/mapgen/map_extras/airdrop.json +share/cataclysm-dda/json/mapgen/map_extras/airdrop_mil.json +share/cataclysm-dda/json/mapgen/map_extras/bandits_block.json +share/cataclysm-dda/json/mapgen/map_extras/beehives.json share/cataclysm-dda/json/mapgen/map_extras/bugouts.json +share/cataclysm-dda/json/mapgen/map_extras/clearcut.json share/cataclysm-dda/json/mapgen/map_extras/college_kids.json share/cataclysm-dda/json/mapgen/map_extras/crater.json share/cataclysm-dda/json/mapgen/map_extras/drug_dealers.json share/cataclysm-dda/json/mapgen/map_extras/exodii_crashes.json share/cataclysm-dda/json/mapgen/map_extras/grave.json +share/cataclysm-dda/json/mapgen/map_extras/house_wasp.json share/cataclysm-dda/json/mapgen/map_extras/lab_extras.json +share/cataclysm-dda/json/mapgen/map_extras/laststand.json share/cataclysm-dda/json/mapgen/map_extras/marloss_voice.json share/cataclysm-dda/json/mapgen/map_extras/mass_grave.json +share/cataclysm-dda/json/mapgen/map_extras/mayhem.json share/cataclysm-dda/json/mapgen/map_extras/military.json share/cataclysm-dda/json/mapgen/map_extras/nest_dermatik.json share/cataclysm-dda/json/mapgen/map_extras/nest_wasp.json share/cataclysm-dda/json/mapgen/map_extras/portal.json share/cataclysm-dda/json/mapgen/map_extras/prison_bus.json share/cataclysm-dda/json/mapgen/map_extras/prison_van.json +share/cataclysm-dda/json/mapgen/map_extras/riverside_boats.json +share/cataclysm-dda/json/mapgen/map_extras/roadblock.json +share/cataclysm-dda/json/mapgen/map_extras/roadblock_mil.json share/cataclysm-dda/json/mapgen/map_extras/sand.json share/cataclysm-dda/json/mapgen/map_extras/scientists.json -share/cataclysm-dda/json/mapgen/map_extras/sewers.json share/cataclysm-dda/json/mapgen/map_extras/spider.json share/cataclysm-dda/json/mapgen/map_extras/toxic_waste.json share/cataclysm-dda/json/mapgen/map_extras/trapdoor_spider_den.json share/cataclysm-dda/json/mapgen/map_extras/wilderness.json +share/cataclysm-dda/json/mapgen/map_extras/yrax_research.json share/cataclysm-dda/json/mapgen/marina.json share/cataclysm-dda/json/mapgen/megastore.json share/cataclysm-dda/json/mapgen/mi-go/ @@ -1522,9 +1653,14 @@ share/cataclysm-dda/json/mapgen/microlab share/cataclysm-dda/json/mapgen/microlab/microlab_hallway.json share/cataclysm-dda/json/mapgen/microlab/microlab_hallway_start.json share/cataclysm-dda/json/mapgen/microlab/microlab_isolated_stairs.json +share/cataclysm-dda/json/mapgen/microlab/microlab_meat/ +share/cataclysm-dda/json/mapgen/microlab/microlab_meat/microlab_meat_chunks.json share/cataclysm-dda/json/mapgen/microlab/microlab_portal/ +share/cataclysm-dda/json/mapgen/microlab/microlab_portal/microlab_MSU14.json share/cataclysm-dda/json/mapgen/microlab/microlab_portal/microlab_portal_security_checkpoint.json share/cataclysm-dda/json/mapgen/microlab/microlab_portal/microlab_portal_unique.json +share/cataclysm-dda/json/mapgen/microlab/microlab_ratkin/ +share/cataclysm-dda/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json share/cataclysm-dda/json/mapgen/microlab/microlab_reactor.json share/cataclysm-dda/json/mapgen/microlab/microlab_shifting_hall.json share/cataclysm-dda/json/mapgen/microlab/microlab_special_tiles.json @@ -1566,6 +1702,7 @@ share/cataclysm-dda/json/mapgen/nested/c share/cataclysm-dda/json/mapgen/nested/city_npc_nested_spawns.json share/cataclysm-dda/json/mapgen/nested/farm_nested.json share/cataclysm-dda/json/mapgen/nested/fema_nested.json +share/cataclysm-dda/json/mapgen/nested/forest_trail_nested.json share/cataclysm-dda/json/mapgen/nested/homeless_missions_nested.json share/cataclysm-dda/json/mapgen/nested/house_nested.json share/cataclysm-dda/json/mapgen/nested/lmoe_nested.json @@ -1578,14 +1715,19 @@ share/cataclysm-dda/json/mapgen/nested/n share/cataclysm-dda/json/mapgen/nested/nursing_home_nested.json share/cataclysm-dda/json/mapgen/nested/office_nested.json share/cataclysm-dda/json/mapgen/nested/retail_nested.json +share/cataclysm-dda/json/mapgen/nested/riverside_boats_nested.json +share/cataclysm-dda/json/mapgen/nested/road_nested.json +share/cataclysm-dda/json/mapgen/nested/road_vehicles_nested.json share/cataclysm-dda/json/mapgen/nested/rural_outdoors_nested.json share/cataclysm-dda/json/mapgen/nested/shelter_nested.json +share/cataclysm-dda/json/mapgen/nested/skyscraper_nested.json share/cataclysm-dda/json/mapgen/nested/strip_mall_nested.json share/cataclysm-dda/json/mapgen/nether_fade.json share/cataclysm-dda/json/mapgen/nether_monster_corpse/ share/cataclysm-dda/json/mapgen/nether_monster_corpse/monster_bowels.json share/cataclysm-dda/json/mapgen/nether_monster_corpse/monster_head.json share/cataclysm-dda/json/mapgen/nether_monster_corpse/monster_misc.json +share/cataclysm-dda/json/mapgen/nether_monster_corpse/monster_nested.json share/cataclysm-dda/json/mapgen/nether_monster_corpse/monster_tentacles.json share/cataclysm-dda/json/mapgen/nuclear_plant/ share/cataclysm-dda/json/mapgen/nuclear_plant/nuclear_plant_z0.json @@ -1599,8 +1741,10 @@ share/cataclysm-dda/json/mapgen/nuclear_ share/cataclysm-dda/json/mapgen/nursing_home.json share/cataclysm-dda/json/mapgen/occupied_lumber_mill/ share/cataclysm-dda/json/mapgen/occupied_lumber_mill/occupied_lumber_mill.json +share/cataclysm-dda/json/mapgen/ocean.json share/cataclysm-dda/json/mapgen/office_cubical.json share/cataclysm-dda/json/mapgen/office_doctor.json +share/cataclysm-dda/json/mapgen/office_skyscraper.json share/cataclysm-dda/json/mapgen/office_small.json share/cataclysm-dda/json/mapgen/office_tower.json share/cataclysm-dda/json/mapgen/office_tower_2.json @@ -1613,6 +1757,7 @@ share/cataclysm-dda/json/mapgen/park_maz share/cataclysm-dda/json/mapgen/park_skate.json share/cataclysm-dda/json/mapgen/park_state.json share/cataclysm-dda/json/mapgen/parking_garage.json +share/cataclysm-dda/json/mapgen/parking_garage2x2.json share/cataclysm-dda/json/mapgen/parking_lot.json share/cataclysm-dda/json/mapgen/pavilion.json share/cataclysm-dda/json/mapgen/pawn_shop.json @@ -1637,28 +1782,13 @@ share/cataclysm-dda/json/mapgen/private_ share/cataclysm-dda/json/mapgen/public_works.json share/cataclysm-dda/json/mapgen/pump_station.json share/cataclysm-dda/json/mapgen/radio_tower.json -share/cataclysm-dda/json/mapgen/railroad/ -share/cataclysm-dda/json/mapgen/railroad/railroad_level_crossing.json -share/cataclysm-dda/json/mapgen/railroad/railroad_station.json share/cataclysm-dda/json/mapgen/ranch_camp.json share/cataclysm-dda/json/mapgen/ravine.json share/cataclysm-dda/json/mapgen/recycle_center.json share/cataclysm-dda/json/mapgen/refugee_center/ -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_e.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_n.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_ne.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_nw.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_s.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_se.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_sw.json -share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds_w.json +share/cataclysm-dda/json/mapgen/refugee_center/rc_grounds.json share/cataclysm-dda/json/mapgen/refugee_center/refugee_center.json -share/cataclysm-dda/json/mapgen/refugee_center/z-1_refugee_center.json -share/cataclysm-dda/json/mapgen/refugee_center/z-2_refugee_center.json -share/cataclysm-dda/json/mapgen/refugee_center/z-3_refugee_center.json -share/cataclysm-dda/json/mapgen/refugee_center/z-4_refugee_center.json share/cataclysm-dda/json/mapgen/refugee_center/z1_refugee_center.json -share/cataclysm-dda/json/mapgen/refugee_center/z2_refugee_center.json share/cataclysm-dda/json/mapgen/regional_airport.json share/cataclysm-dda/json/mapgen/restaurant.json share/cataclysm-dda/json/mapgen/restaurant_fast.json @@ -1670,6 +1800,7 @@ share/cataclysm-dda/json/mapgen/riversid share/cataclysm-dda/json/mapgen/riverside/potters_cottage.json share/cataclysm-dda/json/mapgen/riverside/whaleys_boat_rental.json share/cataclysm-dda/json/mapgen/riverside/whaleys_house_river.json +share/cataclysm-dda/json/mapgen/road.json share/cataclysm-dda/json/mapgen/roadstop.json share/cataclysm-dda/json/mapgen/robofachq_static.json share/cataclysm-dda/json/mapgen/robofaq_locs/ @@ -1696,13 +1827,19 @@ share/cataclysm-dda/json/mapgen/s_lighti share/cataclysm-dda/json/mapgen/s_liquor.json share/cataclysm-dda/json/mapgen/sai.json share/cataclysm-dda/json/mapgen/salon.json +share/cataclysm-dda/json/mapgen/scenario/ +share/cataclysm-dda/json/mapgen/scenario/cabin_liam.json share/cataclysm-dda/json/mapgen/school_1.json share/cataclysm-dda/json/mapgen/sewage_treatment.json +share/cataclysm-dda/json/mapgen/sewer.json share/cataclysm-dda/json/mapgen/shelter.json share/cataclysm-dda/json/mapgen/shooting_range.json share/cataclysm-dda/json/mapgen/slime_pit.json share/cataclysm-dda/json/mapgen/smallscrapyard.json share/cataclysm-dda/json/mapgen/smoke_lounge.json +share/cataclysm-dda/json/mapgen/solar_farm.json +share/cataclysm-dda/json/mapgen/special.json +share/cataclysm-dda/json/mapgen/speedway.json share/cataclysm-dda/json/mapgen/sports_store.json share/cataclysm-dda/json/mapgen/stadium_baseball.json share/cataclysm-dda/json/mapgen/stadium_football.json @@ -1726,14 +1863,18 @@ share/cataclysm-dda/json/mapgen/store/s_ share/cataclysm-dda/json/mapgen/strange_temple.json share/cataclysm-dda/json/mapgen/strip_mall.json share/cataclysm-dda/json/mapgen/stripclub.json +share/cataclysm-dda/json/mapgen/sub_ramp.json share/cataclysm-dda/json/mapgen/sub_station.json share/cataclysm-dda/json/mapgen/sugar_house.json +share/cataclysm-dda/json/mapgen/survivor_forest_camp.json share/cataclysm-dda/json/mapgen/swamp_shack.json +share/cataclysm-dda/json/mapgen/synagogue.json share/cataclysm-dda/json/mapgen/teashop.json share/cataclysm-dda/json/mapgen/textile_mill_museum.json share/cataclysm-dda/json/mapgen/thrift.json share/cataclysm-dda/json/mapgen/town_hall.json share/cataclysm-dda/json/mapgen/toxic_dump.json +share/cataclysm-dda/json/mapgen/trail.json share/cataclysm-dda/json/mapgen/trail_nature.json share/cataclysm-dda/json/mapgen/trail_small.json share/cataclysm-dda/json/mapgen/trailhead.json @@ -1747,12 +1888,12 @@ share/cataclysm-dda/json/mapgen/triffid/ share/cataclysm-dda/json/mapgen/triffid/triffid_roots.json share/cataclysm-dda/json/mapgen/tutorial.json share/cataclysm-dda/json/mapgen/urban_35_hospital.json -share/cataclysm-dda/json/mapgen/valhalla_cult/ -share/cataclysm-dda/json/mapgen/valhalla_cult/car_spawns.json -share/cataclysm-dda/json/mapgen/valhalla_cult/mapgen.json -share/cataclysm-dda/json/mapgen/valhalla_cult/mapgen_updates.json share/cataclysm-dda/json/mapgen/veterinarian.json share/cataclysm-dda/json/mapgen/vfw.json +share/cataclysm-dda/json/mapgen/vitrification/ +share/cataclysm-dda/json/mapgen/vitrification/unvitrified_farm.json +share/cataclysm-dda/json/mapgen/vitrification/vitrified_farm.json +share/cataclysm-dda/json/mapgen/void_spider.json share/cataclysm-dda/json/mapgen/warehouse.json share/cataclysm-dda/json/mapgen/wind_turbine.json share/cataclysm-dda/json/mapgen/ws_biker_dump.json @@ -1769,6 +1910,7 @@ share/cataclysm-dda/json/mapgen_palettes share/cataclysm-dda/json/mapgen_palettes/aircraft_carrier_palette.json share/cataclysm-dda/json/mapgen_palettes/airliner_palette.json share/cataclysm-dda/json/mapgen_palettes/apartment.json +share/cataclysm-dda/json/mapgen_palettes/apartment_complex.json share/cataclysm-dda/json/mapgen_palettes/bandit_camp.json share/cataclysm-dda/json/mapgen_palettes/basement.json share/cataclysm-dda/json/mapgen_palettes/bike_shop_palette.json @@ -1778,13 +1920,16 @@ share/cataclysm-dda/json/mapgen_palettes share/cataclysm-dda/json/mapgen_palettes/campus/ share/cataclysm-dda/json/mapgen_palettes/campus/common.json share/cataclysm-dda/json/mapgen_palettes/cathedral_palette.json -share/cataclysm-dda/json/mapgen_palettes/cground.json share/cataclysm-dda/json/mapgen_palettes/church.json share/cataclysm-dda/json/mapgen_palettes/church_retreat.json share/cataclysm-dda/json/mapgen_palettes/city_block_palette.json share/cataclysm-dda/json/mapgen_palettes/clothes_store_palette.json share/cataclysm-dda/json/mapgen_palettes/collapsed_tower.json +share/cataclysm-dda/json/mapgen_palettes/construction.json share/cataclysm-dda/json/mapgen_palettes/construction_site_palette.json +share/cataclysm-dda/json/mapgen_palettes/convention_center_palette.json +share/cataclysm-dda/json/mapgen_palettes/debug.json +share/cataclysm-dda/json/mapgen_palettes/deserter_city.json share/cataclysm-dda/json/mapgen_palettes/electronic_palette.json share/cataclysm-dda/json/mapgen_palettes/exodii/ share/cataclysm-dda/json/mapgen_palettes/exodii/homebase.json @@ -1803,6 +1948,7 @@ share/cataclysm-dda/json/mapgen_palettes share/cataclysm-dda/json/mapgen_palettes/hotel_tower_palette.json share/cataclysm-dda/json/mapgen_palettes/house_general_abandoned.json share/cataclysm-dda/json/mapgen_palettes/house_general_palette.json +share/cataclysm-dda/json/mapgen_palettes/house_survivor_palette.json share/cataclysm-dda/json/mapgen_palettes/house_variant_palette.json share/cataclysm-dda/json/mapgen_palettes/house_w_palette.json share/cataclysm-dda/json/mapgen_palettes/hunting_store_palette.json @@ -1823,19 +1969,20 @@ share/cataclysm-dda/json/mapgen_palettes share/cataclysm-dda/json/mapgen_palettes/mil_surplus.json share/cataclysm-dda/json/mapgen_palettes/military/ share/cataclysm-dda/json/mapgen_palettes/military/mil_base_palette.json -share/cataclysm-dda/json/mapgen_palettes/military/mil_base_roof_palette.json share/cataclysm-dda/json/mapgen_palettes/miniature_railway_palette.json share/cataclysm-dda/json/mapgen_palettes/movie_theater_palette.json +share/cataclysm-dda/json/mapgen_palettes/nether_monster_palette.json share/cataclysm-dda/json/mapgen_palettes/nuclear_plant_palette.json +share/cataclysm-dda/json/mapgen_palettes/null.json share/cataclysm-dda/json/mapgen_palettes/nursing_home_palette.json share/cataclysm-dda/json/mapgen_palettes/office.json share/cataclysm-dda/json/mapgen_palettes/office_doctor.json +share/cataclysm-dda/json/mapgen_palettes/office_skyscraper.json share/cataclysm-dda/json/mapgen_palettes/orchard_apple.json share/cataclysm-dda/json/mapgen_palettes/park_palette.json share/cataclysm-dda/json/mapgen_palettes/police_dept_palette.json share/cataclysm-dda/json/mapgen_palettes/prison.json share/cataclysm-dda/json/mapgen_palettes/private_resort.json -share/cataclysm-dda/json/mapgen_palettes/railroad.json share/cataclysm-dda/json/mapgen_palettes/ranch_camp.json share/cataclysm-dda/json/mapgen_palettes/refugee_center.json share/cataclysm-dda/json/mapgen_palettes/regional_dump_palette.json @@ -1851,28 +1998,42 @@ share/cataclysm-dda/json/mapgen_palettes share/cataclysm-dda/json/mapgen_palettes/steel_mill_palette.json share/cataclysm-dda/json/mapgen_palettes/subway.json share/cataclysm-dda/json/mapgen_palettes/textile_mill_museum.json +share/cataclysm-dda/json/mapgen_palettes/trail.json share/cataclysm-dda/json/mapgen_palettes/triffid.json share/cataclysm-dda/json/mapgen_palettes/underwater_structures_palette.json +share/cataclysm-dda/json/mapgen_palettes/vitrified_farm_palette.json share/cataclysm-dda/json/mapgen_palettes/wasp_palette.json share/cataclysm-dda/json/martialarts.json share/cataclysm-dda/json/martialarts_fictional.json share/cataclysm-dda/json/materials.json share/cataclysm-dda/json/monster_factions.json share/cataclysm-dda/json/monster_special_attacks/ +share/cataclysm-dda/json/monster_special_attacks/feral_weapon_attacks.json share/cataclysm-dda/json/monster_special_attacks/monster_attacks.json share/cataclysm-dda/json/monster_special_attacks/monster_deaths.json share/cataclysm-dda/json/monster_special_attacks/monster_gun.json share/cataclysm-dda/json/monster_special_attacks/spells.json +share/cataclysm-dda/json/monster_special_attacks/void_spider_mechanics.json share/cataclysm-dda/json/monster_special_attacks/weapon_spells.json +share/cataclysm-dda/json/monster_special_attacks/yrax_special_attacks.json share/cataclysm-dda/json/monster_weakpoints/ share/cataclysm-dda/json/monster_weakpoints/abomination_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/amphibian_weakpoints.json share/cataclysm-dda/json/monster_weakpoints/arthropod_weakpoints.json share/cataclysm-dda/json/monster_weakpoints/bird_weakpoints.json share/cataclysm-dda/json/monster_weakpoints/cyborg_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/fungaloid_weakpoints.json share/cataclysm-dda/json/monster_weakpoints/generic_weakpoints.json share/cataclysm-dda/json/monster_weakpoints/humanoid_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/migo_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/netherium_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/power_leech_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/slime_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/triffid_weakpoints.json +share/cataclysm-dda/json/monster_weakpoints/turret_weakpoints.json share/cataclysm-dda/json/monsterdrops/ share/cataclysm-dda/json/monsterdrops/clothing_christmas.json +share/cataclysm-dda/json/monsterdrops/clothing_halloween.json share/cataclysm-dda/json/monsterdrops/feral_humans.json share/cataclysm-dda/json/monsterdrops/marloss.json share/cataclysm-dda/json/monsterdrops/misc.json @@ -1895,6 +2056,7 @@ share/cataclysm-dda/json/monsterdrops/zo share/cataclysm-dda/json/monsterdrops/zombie_survivor.json share/cataclysm-dda/json/monsterdrops/zombie_technician.json share/cataclysm-dda/json/monstergroups/ +share/cataclysm-dda/json/monstergroups/amphibian.json share/cataclysm-dda/json/monstergroups/blob.json share/cataclysm-dda/json/monstergroups/bugs.json share/cataclysm-dda/json/monstergroups/eggs.json @@ -1910,7 +2072,6 @@ share/cataclysm-dda/json/monstergroups/m share/cataclysm-dda/json/monstergroups/missions.json share/cataclysm-dda/json/monstergroups/mutant_upgrades.json share/cataclysm-dda/json/monstergroups/nether.json -share/cataclysm-dda/json/monstergroups/obsolete.json share/cataclysm-dda/json/monstergroups/resort.json share/cataclysm-dda/json/monstergroups/robots.json share/cataclysm-dda/json/monstergroups/triffid.json @@ -1921,6 +2082,7 @@ share/cataclysm-dda/json/monstergroups/z share/cataclysm-dda/json/monstergroups/zombies.json share/cataclysm-dda/json/monsters/ share/cataclysm-dda/json/monsters/bird.json +share/cataclysm-dda/json/monsters/civilians.json share/cataclysm-dda/json/monsters/cyborgs.json share/cataclysm-dda/json/monsters/defense_bot.json share/cataclysm-dda/json/monsters/drones.json @@ -1938,11 +2100,12 @@ share/cataclysm-dda/json/monsters/mechsu share/cataclysm-dda/json/monsters/mi-go.json share/cataclysm-dda/json/monsters/misc.json share/cataclysm-dda/json/monsters/mollusk.json +share/cataclysm-dda/json/monsters/monster_flags.json share/cataclysm-dda/json/monsters/monster_goals.json share/cataclysm-dda/json/monsters/mutant.json share/cataclysm-dda/json/monsters/mutant_mammal.json share/cataclysm-dda/json/monsters/nether.json -share/cataclysm-dda/json/monsters/obsolete.json +share/cataclysm-dda/json/monsters/nether_animal.json share/cataclysm-dda/json/monsters/power_leech.json share/cataclysm-dda/json/monsters/reptile_amphibian.json share/cataclysm-dda/json/monsters/robofac_robots.json @@ -1964,11 +2127,13 @@ share/cataclysm-dda/json/monsters/zed_am share/cataclysm-dda/json/monsters/zed_burned.json share/cataclysm-dda/json/monsters/zed_children.json share/cataclysm-dda/json/monsters/zed_command.json +share/cataclysm-dda/json/monsters/zed_dormant.json share/cataclysm-dda/json/monsters/zed_electric.json share/cataclysm-dda/json/monsters/zed_explosive.json share/cataclysm-dda/json/monsters/zed_ferrous.json share/cataclysm-dda/json/monsters/zed_fusion.json share/cataclysm-dda/json/monsters/zed_lab.json +share/cataclysm-dda/json/monsters/zed_lieutenant.json share/cataclysm-dda/json/monsters/zed_misc.json share/cataclysm-dda/json/monsters/zed_prisoner.json share/cataclysm-dda/json/monsters/zed_radiation.json @@ -1980,19 +2145,16 @@ share/cataclysm-dda/json/morale_types.js share/cataclysm-dda/json/move_modes.json share/cataclysm-dda/json/mutations/ share/cataclysm-dda/json/mutations/appearance_hair_styles.json -share/cataclysm-dda/json/mutations/changing_eocs.json share/cataclysm-dda/json/mutations/cybernetic_traits.json -share/cataclysm-dda/json/mutations/migration.json share/cataclysm-dda/json/mutations/mutation_appearance.json share/cataclysm-dda/json/mutations/mutation_category.json -share/cataclysm-dda/json/mutations/mutation_eocs.json share/cataclysm-dda/json/mutations/mutation_item_traits.json share/cataclysm-dda/json/mutations/mutation_ordering.json share/cataclysm-dda/json/mutations/mutation_spells.json share/cataclysm-dda/json/mutations/mutation_techs.json share/cataclysm-dda/json/mutations/mutation_type.json share/cataclysm-dda/json/mutations/mutations.json -share/cataclysm-dda/json/nether_glass_effect_on_condition.json +share/cataclysm-dda/json/mutations/npc_personality.json share/cataclysm-dda/json/npcs/ share/cataclysm-dda/json/npcs/BG_trait_groups.json share/cataclysm-dda/json/npcs/BG_traits.json @@ -2046,7 +2208,6 @@ share/cataclysm-dda/json/npcs/Background share/cataclysm-dda/json/npcs/Backgrounds/no_past_3.json share/cataclysm-dda/json/npcs/Backgrounds/no_past_4.json share/cataclysm-dda/json/npcs/Backgrounds/no_past_5.json -share/cataclysm-dda/json/npcs/Backgrounds/othersurvivors_table_of_contents.json share/cataclysm-dda/json/npcs/Backgrounds/out_of_town_1.json share/cataclysm-dda/json/npcs/Backgrounds/out_of_town_2.json share/cataclysm-dda/json/npcs/Backgrounds/prepper_1.json @@ -2063,7 +2224,10 @@ share/cataclysm-dda/json/npcs/Background share/cataclysm-dda/json/npcs/Backgrounds/soldier_1.json share/cataclysm-dda/json/npcs/Backgrounds/soldier_2.json share/cataclysm-dda/json/npcs/Backgrounds/wedding_1.json -share/cataclysm-dda/json/npcs/Backgrounds/whathappened_table_of_contents.json +share/cataclysm-dda/json/npcs/EOC_talkers/ +share/cataclysm-dda/json/npcs/EOC_talkers/portal_storm.json +share/cataclysm-dda/json/npcs/EOC_talkers/vitrified_farm.json +share/cataclysm-dda/json/npcs/EOC_talkers/xedra_merc.json share/cataclysm-dda/json/npcs/Kindred/ share/cataclysm-dda/json/npcs/Kindred/NPC_Brigitte_LaCroix.json share/cataclysm-dda/json/npcs/Kindred/NPC_Darren_Cooper.json @@ -2077,18 +2241,23 @@ share/cataclysm-dda/json/npcs/NC_ARMY.js share/cataclysm-dda/json/npcs/NC_ARSONIST.json share/cataclysm-dda/json/npcs/NC_BARTENDER.json share/cataclysm-dda/json/npcs/NC_BOUNTY_HUNTER.json +share/cataclysm-dda/json/npcs/NC_CARAVAN_GUARD.json +share/cataclysm-dda/json/npcs/NC_CARAVAN_MERCHANT.json share/cataclysm-dda/json/npcs/NC_CITY_COP.json share/cataclysm-dda/json/npcs/NC_COWBOY.json share/cataclysm-dda/json/npcs/NC_CYBORG.json share/cataclysm-dda/json/npcs/NC_DEBUG.json share/cataclysm-dda/json/npcs/NC_DOCTOR.json +share/cataclysm-dda/json/npcs/NC_EVAC_BROKER.json share/cataclysm-dda/json/npcs/NC_FARMER.json share/cataclysm-dda/json/npcs/NC_HACKER.json share/cataclysm-dda/json/npcs/NC_HUNTER.json share/cataclysm-dda/json/npcs/NC_JUNK_SHOPKEEP.json share/cataclysm-dda/json/npcs/NC_MARLOSS_VOICE.json +share/cataclysm-dda/json/npcs/NC_MOTORHEAD.json share/cataclysm-dda/json/npcs/NC_NINJA.json share/cataclysm-dda/json/npcs/NC_OPS.json +share/cataclysm-dda/json/npcs/NC_REFUGEE_DOCTOR.json share/cataclysm-dda/json/npcs/NC_SCAVENGER.json share/cataclysm-dda/json/npcs/NC_SCIENTIST.json share/cataclysm-dda/json/npcs/NC_SOLDIER.json @@ -2117,6 +2286,16 @@ share/cataclysm-dda/json/npcs/cabin_chem share/cataclysm-dda/json/npcs/cabin_chemist/chemist_missions.json share/cataclysm-dda/json/npcs/cabin_chemist/chemist_npc.json share/cataclysm-dda/json/npcs/cabin_chemist/item_groups.json +share/cataclysm-dda/json/npcs/campus/ +share/cataclysm-dda/json/npcs/campus/NPC_Elvira_Fish.json +share/cataclysm-dda/json/npcs/campus/NPC_campus_guard_generic.json +share/cataclysm-dda/json/npcs/campus/generic_class_definitions.json +share/cataclysm-dda/json/npcs/campus/great_library_librarian_goods.json +share/cataclysm-dda/json/npcs/campus/great_library_librarian_itemlist.json +share/cataclysm-dda/json/npcs/campus/great_library_librarian_talk.json +share/cataclysm-dda/json/npcs/campus/great_library_librarian_talk_fluff.json +share/cataclysm-dda/json/npcs/civilians/ +share/cataclysm-dda/json/npcs/civilians/civilians.json share/cataclysm-dda/json/npcs/classes.json share/cataclysm-dda/json/npcs/common_chat/ share/cataclysm-dda/json/npcs/common_chat/TALK_COMMON_ALLY.json @@ -2126,12 +2305,14 @@ share/cataclysm-dda/json/npcs/common_cha share/cataclysm-dda/json/npcs/common_chat/TALK_FRIEND_CONVERSATION.json share/cataclysm-dda/json/npcs/computers/ share/cataclysm-dda/json/npcs/computers/TALK_COMPUTER.json +share/cataclysm-dda/json/npcs/computers/TALK_MSU14.json share/cataclysm-dda/json/npcs/computers/TALK_NURSING_HOME.json share/cataclysm-dda/json/npcs/computers/TALK_PREPPER_1_COMPUTER.json share/cataclysm-dda/json/npcs/computers/TALK_RET_COMM.json share/cataclysm-dda/json/npcs/computers/TALK_TRAIN_DATA.json share/cataclysm-dda/json/npcs/destination_locations.json share/cataclysm-dda/json/npcs/exodii/ +share/cataclysm-dda/json/npcs/exodii/exodii_Luliya.json share/cataclysm-dda/json/npcs/exodii/exodii_merchant_definitions.json share/cataclysm-dda/json/npcs/exodii/exodii_merchant_itemlist.json share/cataclysm-dda/json/npcs/exodii/exodii_merchant_missions.json @@ -2141,31 +2322,39 @@ share/cataclysm-dda/json/npcs/exodii/non share/cataclysm-dda/json/npcs/expertise_traits.json share/cataclysm-dda/json/npcs/factions.json share/cataclysm-dda/json/npcs/godco/ -share/cataclysm-dda/json/npcs/godco/NPC_Arturo_Maldonado.json -share/cataclysm-dda/json/npcs/godco/NPC_Aunt_Theresa.json -share/cataclysm-dda/json/npcs/godco/NPC_Chloe_Taylor_King.json -share/cataclysm-dda/json/npcs/godco/NPC_Corrie_Kaja_Dosia.json -share/cataclysm-dda/json/npcs/godco/NPC_Darryl_Johnstone.json -share/cataclysm-dda/json/npcs/godco/NPC_Father_Greenwood.json -share/cataclysm-dda/json/npcs/godco/NPC_Felicity_Powell.json -share/cataclysm-dda/json/npcs/godco/NPC_Gemma_Johnstone.json -share/cataclysm-dda/json/npcs/godco/NPC_Helena_Misinter.json -share/cataclysm-dda/json/npcs/godco/NPC_Jane_Schulz.json -share/cataclysm-dda/json/npcs/godco/NPC_Jeremiah_Weaver.json -share/cataclysm-dda/json/npcs/godco/NPC_Julian_Ray.json -share/cataclysm-dda/json/npcs/godco/NPC_Katherine_Weaver.json -share/cataclysm-dda/json/npcs/godco/NPC_Kostas_Walsman.json -share/cataclysm-dda/json/npcs/godco/NPC_Maria_Serrano.json -share/cataclysm-dda/json/npcs/godco/NPC_Olwen_Powell.json -share/cataclysm-dda/json/npcs/godco/NPC_Russell_Connelly.json -share/cataclysm-dda/json/npcs/godco/NPC_Sonia_Greene.json -share/cataclysm-dda/json/npcs/godco/NPC_Tom_Powell.json -share/cataclysm-dda/json/npcs/godco/NPC_Zachary_Montes.json +share/cataclysm-dda/json/npcs/godco/NECC_INFO.md share/cataclysm-dda/json/npcs/godco/classes.json -share/cataclysm-dda/json/npcs/godco/cook.json -share/cataclysm-dda/json/npcs/godco/foodguard.json share/cataclysm-dda/json/npcs/godco/godco_missions.json +share/cataclysm-dda/json/npcs/godco/members/ +share/cataclysm-dda/json/npcs/godco/members/NPC_Arturo_Maldonado.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Aunt_Theresa.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Chloe_Taylor_King.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Corrie_Kaja_Dosia.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Darryl_Johnstone.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Father_Greenwood.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Felicity_Powell.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Gemma_Johnstone.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Helena_Misinter.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Jane_Schulz.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Jeremiah_Weaver.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Julian_Ray.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Katherine_Weaver.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Kostas_Walsman.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Maria_Serrano.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Olwen_Powell.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Russell_Connelly.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Sonia_Greene.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Tom_Powell.json +share/cataclysm-dda/json/npcs/godco/members/NPC_Zachary_Montes.json +share/cataclysm-dda/json/npcs/godco/members/cook.json +share/cataclysm-dda/json/npcs/godco/members/foodguard.json share/cataclysm-dda/json/npcs/godco/npcs.json +share/cataclysm-dda/json/npcs/godco/visitors/ +share/cataclysm-dda/json/npcs/godco/visitors/TALK_CARAVAN_GUARD_PREDATORY.json +share/cataclysm-dda/json/npcs/godco/visitors/TALK_CARAVAN_MERCHANT_PREDATORY.json +share/cataclysm-dda/json/npcs/hells_raiders/ +share/cataclysm-dda/json/npcs/hells_raiders/classes.json +share/cataclysm-dda/json/npcs/hells_raiders/npc.json share/cataclysm-dda/json/npcs/hints.json share/cataclysm-dda/json/npcs/holdouts/ share/cataclysm-dda/json/npcs/holdouts/Mr_Lapin.json @@ -2217,11 +2406,14 @@ share/cataclysm-dda/json/npcs/old_guard/ share/cataclysm-dda/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json share/cataclysm-dda/json/npcs/other/ share/cataclysm-dda/json/npcs/other/NPC_pizzaiolo.json +share/cataclysm-dda/json/npcs/other/TALK_ANIMAL_SHELTER_SURVIVOR.json +share/cataclysm-dda/json/npcs/other/TALK_GUN_STORE_SURVIVOR.json share/cataclysm-dda/json/npcs/other/TALK_NPC_APARTMENT_SURVIVOR.json share/cataclysm-dda/json/npcs/other/TALK_NPC_CAMPER.json share/cataclysm-dda/json/npcs/other/TALK_NPC_MOONSHINER.json share/cataclysm-dda/json/npcs/other/TALK_NPC_PREPPER_SURVIVOR.json share/cataclysm-dda/json/npcs/other/TALK_shelter_survivors.json +share/cataclysm-dda/json/npcs/other/camp_start.json share/cataclysm-dda/json/npcs/other/homeless/ share/cataclysm-dda/json/npcs/other/homeless/TALK_homeless_survivor.json share/cataclysm-dda/json/npcs/other/homeless/group_camp/ @@ -2231,11 +2423,14 @@ share/cataclysm-dda/json/npcs/other/home share/cataclysm-dda/json/npcs/other/homeless/group_camp/homeless_broker_sell.json share/cataclysm-dda/json/npcs/other/homeless/group_camp/nested_homeless_missions.json share/cataclysm-dda/json/npcs/other/meteorologist.json +share/cataclysm-dda/json/npcs/portal_storm/ +share/cataclysm-dda/json/npcs/portal_storm/Portal_NPC.json share/cataclysm-dda/json/npcs/prisoners/ share/cataclysm-dda/json/npcs/prisoners/mi-go_prisoners.json share/cataclysm-dda/json/npcs/random_encounters/ share/cataclysm-dda/json/npcs/random_encounters/free_merchant_caravans.json share/cataclysm-dda/json/npcs/random_encounters/john_bailey.json +share/cataclysm-dda/json/npcs/random_encounters/refugee_caravans.json share/cataclysm-dda/json/npcs/refugee_center/ share/cataclysm-dda/json/npcs/refugee_center/FREE_MERCHANTS_INFO.md share/cataclysm-dda/json/npcs/refugee_center/beggars/ @@ -2272,7 +2467,6 @@ share/cataclysm-dda/json/npcs/refugee_ce share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json -share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json share/cataclysm-dda/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json share/cataclysm-dda/json/npcs/refugee_center/surface_staff/Smokes/ @@ -2299,14 +2493,18 @@ share/cataclysm-dda/json/npcs/robofac/RO share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/ share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/ share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_anchor_seller.json +share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_chatting_veterans.json +share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_drugs.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_gunrunner.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_hireable.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json +share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_keycard_seller.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_template_seller.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/NPC_BEMS.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/NC_ANCILLA_GRUNT.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_BARKEEP.json +share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_DOCTOR.json share/cataclysm-dda/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_HQ_GUARD.json share/cataclysm-dda/json/npcs/robofac/robofac_basement_npcs/ share/cataclysm-dda/json/npcs/robofac/robofac_basement_npcs/NPC_Andrea_Dzvonko.json @@ -2321,6 +2519,7 @@ share/cataclysm-dda/json/npcs/robofac/ro share/cataclysm-dda/json/npcs/scrap_trader/ share/cataclysm-dda/json/npcs/scrap_trader/scrap_trader.json share/cataclysm-dda/json/npcs/scrap_trader/scrap_trader_missions.json +share/cataclysm-dda/json/npcs/shop_consumption_rates.json share/cataclysm-dda/json/npcs/slaves/ share/cataclysm-dda/json/npcs/slaves/npcs.json share/cataclysm-dda/json/npcs/starting_traits.json @@ -2342,6 +2541,10 @@ share/cataclysm-dda/json/npcs/tacoma_ran share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_sickly_laborer.json share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json share/cataclysm-dda/json/npcs/tacoma_ranch/NPC_ranch_woodcutter2.json +share/cataclysm-dda/json/npcs/tacoma_ranch/Nunez/ +share/cataclysm-dda/json/npcs/tacoma_ranch/Nunez/Arrival_code.json +share/cataclysm-dda/json/npcs/tacoma_ranch/Nunez/NPC_Dana_Tacoma.json +share/cataclysm-dda/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json share/cataclysm-dda/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json share/cataclysm-dda/json/npcs/talk_tags.json share/cataclysm-dda/json/npcs/talk_tags_chat.json @@ -2355,39 +2558,38 @@ share/cataclysm-dda/json/npcs/valhalla_c share/cataclysm-dda/json/npcs/valhalla_cult/npcs.json share/cataclysm-dda/json/npcs/valhalla_cult/snippets.json share/cataclysm-dda/json/npcs/valhalla_cult/valhallist_leader_backstory.json -share/cataclysm-dda/json/obsolete.json -share/cataclysm-dda/json/obsolete_terrains.json +share/cataclysm-dda/json/npcs/your_followers/ +share/cataclysm-dda/json/npcs/your_followers/liam_main_dialogue.json +share/cataclysm-dda/json/npcs/your_followers/liam_starting_follower.json +share/cataclysm-dda/json/npcs/your_followers/luo_follower.json share/cataclysm-dda/json/obsoletion/ -share/cataclysm-dda/json/obsoletion/charge_removal.json -share/cataclysm-dda/json/obsoletion/fakespecials.json -share/cataclysm-dda/json/obsoletion/faults.json -share/cataclysm-dda/json/obsoletion/mapgen/ -share/cataclysm-dda/json/obsoletion/mapgen/necropolis/ -share/cataclysm-dda/json/obsoletion/mapgen/necropolis/necropolis.json -share/cataclysm-dda/json/obsoletion/mapgen/necropolis/necropolisB1.json -share/cataclysm-dda/json/obsoletion/mapgen/necropolis/necropolisB2.json -share/cataclysm-dda/json/obsoletion/mapgen/necropolis/necropolisB3.json -share/cataclysm-dda/json/obsoletion/mapgen_palettes/ -share/cataclysm-dda/json/obsoletion/mapgen_palettes/necropolis_a.json -share/cataclysm-dda/json/obsoletion/mapgen_palettes/necropolis_b1.json -share/cataclysm-dda/json/obsoletion/mapgen_palettes/necropolis_b2.json -share/cataclysm-dda/json/obsoletion/mapgen_palettes/necropolis_b3.json -share/cataclysm-dda/json/obsoletion/mapgen_palettes/obsolete_palette.json -share/cataclysm-dda/json/obsoletion/mutations.json -share/cataclysm-dda/json/obsoletion/npcs/ -share/cataclysm-dda/json/obsoletion/npcs/necropolis/ -share/cataclysm-dda/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Captain.json -share/cataclysm-dda/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Commo.json -share/cataclysm-dda/json/obsoletion/npcs/necropolis/NPC_Old_Guard_Soldier.json -share/cataclysm-dda/json/obsoletion/obsolete_fake.json +share/cataclysm-dda/json/obsoletion/blacklist_charge_removal.json +share/cataclysm-dda/json/obsoletion/blacklist_scenarios.json +share/cataclysm-dda/json/obsoletion/blacklist_temperature_removal.json +share/cataclysm-dda/json/obsoletion/migrate_to_VEH_TOOLS.json +share/cataclysm-dda/json/obsoletion/migration_bionics.json +share/cataclysm-dda/json/obsoletion/migration_hairstyles.json +share/cataclysm-dda/json/obsoletion/migration_items.json +share/cataclysm-dda/json/obsoletion/migration_oter_ids.json +share/cataclysm-dda/json/obsoletion/migration_overmap_specials.json +share/cataclysm-dda/json/obsoletion/migration_vehicle_parts.json +share/cataclysm-dda/json/obsoletion/obsolete-0.G-items.json +share/cataclysm-dda/json/obsoletion/obsolete-0.G-recipes.json +share/cataclysm-dda/json/obsoletion/obsolete_ammo_types.json +share/cataclysm-dda/json/obsoletion/obsolete_eocs.json +share/cataclysm-dda/json/obsoletion/obsolete_fakespecials.json +share/cataclysm-dda/json/obsoletion/obsolete_items.json share/cataclysm-dda/json/obsoletion/obsolete_mapgen.json +share/cataclysm-dda/json/obsoletion/obsolete_migrations.json +share/cataclysm-dda/json/obsoletion/obsolete_multitile_city_buildings.json share/cataclysm-dda/json/obsoletion/overmap/ share/cataclysm-dda/json/obsoletion/overmap/overmap_terrain/ -share/cataclysm-dda/json/obsoletion/overmap/overmap_terrain/overmap_terrain_necropolis.json share/cataclysm-dda/json/obsoletion/overmap/overmap_terrain/overmap_terrain_obsoletion.json share/cataclysm-dda/json/obsoletion/overmap_special/ share/cataclysm-dda/json/obsoletion/overmap_special/specials.json -share/cataclysm-dda/json/obsoletion/professions.json +share/cataclysm-dda/json/obsoletion/prosthetics.json +share/cataclysm-dda/json/obsoletion_and_migration_0.I/ +share/cataclysm-dda/json/obsoletion_and_migration_0.I/migration_items.json share/cataclysm-dda/json/overmap/ share/cataclysm-dda/json/overmap/map_extras.json share/cataclysm-dda/json/overmap/multitile_city_buildings.json @@ -2397,6 +2599,7 @@ share/cataclysm-dda/json/overmap/overmap share/cataclysm-dda/json/overmap/overmap_mutable/anthill.json share/cataclysm-dda/json/overmap/overmap_mutable/crater.json share/cataclysm-dda/json/overmap/overmap_mutable/dumpsite_mutable.json +share/cataclysm-dda/json/overmap/overmap_mutable/farm_horse_mutable.json share/cataclysm-dda/json/overmap/overmap_mutable/farm_mutable.json share/cataclysm-dda/json/overmap/overmap_mutable/homeless_camp_mutable.json share/cataclysm-dda/json/overmap/overmap_mutable/microlab_mutable.json @@ -2414,7 +2617,7 @@ share/cataclysm-dda/json/overmap/overmap share/cataclysm-dda/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json share/cataclysm-dda/json/overmap/overmap_special/mine.json share/cataclysm-dda/json/overmap/overmap_special/nuclear_plant.json -share/cataclysm-dda/json/overmap/overmap_special/overmap_special_migration.json +share/cataclysm-dda/json/overmap/overmap_special/overmap_special_vitrified.json share/cataclysm-dda/json/overmap/overmap_special/specials.json share/cataclysm-dda/json/overmap/overmap_special/tutorial.json share/cataclysm-dda/json/overmap/overmap_terrain/ @@ -2427,6 +2630,7 @@ share/cataclysm-dda/json/overmap/overmap share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_campus.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_cemetery.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_commercial.json +share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_deserter_city.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_evac_center.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_faction_base.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_fungal.json @@ -2451,28 +2655,33 @@ share/cataclysm-dda/json/overmap/overmap share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_river.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_robofachq.json +share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_special.json +share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_speedway.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_transportation.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_triffid.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json share/cataclysm-dda/json/overmap/overmap_terrain/overmap_terrain_waterbody.json +share/cataclysm-dda/json/overmap/overmap_terrain/overmap_vitrified_terrain.json share/cataclysm-dda/json/overmap/overmap_terrain/river_cave.json share/cataclysm-dda/json/overmap/special_locations.json share/cataclysm-dda/json/player_activities.json -share/cataclysm-dda/json/portal_dependent_effect_on_condition.json -share/cataclysm-dda/json/portal_storm_effect_on_condition.json +share/cataclysm-dda/json/profession_groups.json share/cataclysm-dda/json/professions.json share/cataclysm-dda/json/proficiencies/ +share/cataclysm-dda/json/proficiencies/athletics.json share/cataclysm-dda/json/proficiencies/chemistry.json share/cataclysm-dda/json/proficiencies/comestibles.json share/cataclysm-dda/json/proficiencies/electronics.json share/cataclysm-dda/json/proficiencies/gunsmithing.json share/cataclysm-dda/json/proficiencies/health_care.json share/cataclysm-dda/json/proficiencies/mechanics.json +share/cataclysm-dda/json/proficiencies/melee_weapons.json share/cataclysm-dda/json/proficiencies/metalwork.json share/cataclysm-dda/json/proficiencies/misc.json share/cataclysm-dda/json/proficiencies/proficiency_categories.json share/cataclysm-dda/json/proficiencies/tailoring.json share/cataclysm-dda/json/proficiencies/traps.json +share/cataclysm-dda/json/proficiencies/vehicles.json share/cataclysm-dda/json/proficiencies/weakpoints.json share/cataclysm-dda/json/proficiencies/wilderness.json share/cataclysm-dda/json/proficiencies/woodworking.json @@ -2495,6 +2704,7 @@ share/cataclysm-dda/json/recipes/armor/b share/cataclysm-dda/json/recipes/armor/bespoke_armor/nomad.json share/cataclysm-dda/json/recipes/armor/bespoke_armor/survivor.json share/cataclysm-dda/json/recipes/armor/feet.json +share/cataclysm-dda/json/recipes/armor/gambeson_crafts.json share/cataclysm-dda/json/recipes/armor/hands.json share/cataclysm-dda/json/recipes/armor/head.json share/cataclysm-dda/json/recipes/armor/legs.json @@ -2510,13 +2720,7 @@ share/cataclysm-dda/json/recipes/basecam share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/ share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_beds.json share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_common.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_log.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_metal.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_rock.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_wood.json +share/cataclysm-dda/json/recipes/basecamps/base/fbmc_fire_lookout_tower/recipe_modular_fire_lookout_tower_construction.json share/cataclysm-dda/json/recipes/basecamps/base/fbmc_helipad/ share/cataclysm-dda/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_common.json share/cataclysm-dda/json/recipes/basecamps/base/fbmc_helipad/recipe_modular_helipad_garage.json @@ -2543,16 +2747,11 @@ share/cataclysm-dda/json/recipes/basecam share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/ share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_beds.json share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_common.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_log.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_metal.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_rock.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_wood.json +share/cataclysm-dda/json/recipes/basecamps/base/fbmc_radio_tower/recipe_modular_radio_tower_construction.json share/cataclysm-dda/json/recipes/basecamps/base/fbmc_sealab_small/ share/cataclysm-dda/json/recipes/basecamps/base/fbmc_sealab_small/recipe_sealab_small_common.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_bare_bones_basecamp/ +share/cataclysm-dda/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_personal_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_bare_bones_basecamp/bare_bones_basecamp_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_bare_bones_basecamp/recipe_bare_bones_basecamp.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_firestation_1/ @@ -2562,114 +2761,57 @@ share/cataclysm-dda/json/recipes/basecam share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/ share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/ share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_common.json +share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_construction.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_defenses.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_log.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_metal.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_rock.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_tent.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_modular_field_wood.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_1/recipe_primitive_field.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/ share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/modular_field_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_common.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_concrete.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_log.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_metal.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_rock.json +share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_construction.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_tent.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_hub/version_2/recipe_modular_field_wood.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/ share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/modular_shelter_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_common.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_log.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_rock.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_standard.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_wood.json +share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter/recipe_modular_shelter_construction.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/ share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/modular_shelter_1_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_common.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_log.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_rock.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_standard.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_wood.json +share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_1/recipe_modular_shelter_1_construction.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/ share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/modular_shelter_2_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_common.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_log.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_rock.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_standard.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wad.json -share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_wood.json +share/cataclysm-dda/json/recipes/basecamps/base/recipe_modular_shelter_2/recipe_modular_shelter_2_construction.json share/cataclysm-dda/json/recipes/basecamps/components.json share/cataclysm-dda/json/recipes/basecamps/expansion/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_1/recipe_modular_canteen_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/modular_canteen_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_concrete.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_canteen/version_2/recipe_modular_canteen_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_farm/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_farm/version_1/recipe_primitive_farm.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_farm/version_2/ +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_farm/version_2/modular_farm_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_farm/version_2/recipe_modular_farm_common.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_1/recipe_primitive_garage.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_concrete.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_garage/version_2/recipe_modular_garage_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_1/recipe_modular_livestock_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/modular_livestock_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_concrete.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_livestock/version_2/recipe_modular_livestock_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_saltworks/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_saltworks/version_1/recipe_modular_saltworks_common.json @@ -2683,51 +2825,20 @@ share/cataclysm-dda/json/recipes/basecam share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_1/recipe_modular_storehouse_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/ -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_bookcase.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_concrete.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_dresser.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_locker.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rack.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_warehouse_shelf.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wood.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_wooden_rack.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_construction.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_storehouse/version_2/recipe_modular_storehouse_storage.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_rock.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_wood.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_1/recipe_modular_workshop_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/ share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/modular_workshop_recipe_groups.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_common.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_concrete.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_log.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_metal.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_migo_resin.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_rammed_earth.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_rock.json +share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_construction.json share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_salt_water_pipe.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_wad.json -share/cataclysm-dda/json/recipes/basecamps/expansion/recipe_modular_workshop/version_2/recipe_modular_workshop_wood.json share/cataclysm-dda/json/recipes/basecamps/recipe_groups.json share/cataclysm-dda/json/recipes/chem/ share/cataclysm-dda/json/recipes/chem/chemicals.json @@ -2755,6 +2866,7 @@ share/cataclysm-dda/json/recipes/food/me share/cataclysm-dda/json/recipes/food/offal_dishes.json share/cataclysm-dda/json/recipes/food/other.json share/cataclysm-dda/json/recipes/food/pasta.json +share/cataclysm-dda/json/recipes/food/raw_grain.json share/cataclysm-dda/json/recipes/food/seed.json share/cataclysm-dda/json/recipes/food/vegetable_dishes.json share/cataclysm-dda/json/recipes/nested.json @@ -2770,6 +2882,7 @@ share/cataclysm-dda/json/recipes/other/p share/cataclysm-dda/json/recipes/other/power_supplies.json share/cataclysm-dda/json/recipes/other/vehicle.json share/cataclysm-dda/json/recipes/practice/ +share/cataclysm-dda/json/recipes/practice/applied_science.json share/cataclysm-dda/json/recipes/practice/athletics.json share/cataclysm-dda/json/recipes/practice/computers.json share/cataclysm-dda/json/recipes/practice/devices.json @@ -2789,7 +2902,6 @@ share/cataclysm-dda/json/recipes/recipe_ share/cataclysm-dda/json/recipes/recipe_food.json share/cataclysm-dda/json/recipes/recipe_furniture.json share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json -share/cataclysm-dda/json/recipes/recipe_obsolete.json share/cataclysm-dda/json/recipes/recipe_others.json share/cataclysm-dda/json/recipes/recipe_traps.json share/cataclysm-dda/json/recipes/recipe_vehicle.json @@ -2819,6 +2931,7 @@ share/cataclysm-dda/json/requirements/co share/cataclysm-dda/json/requirements/cooking_tools.json share/cataclysm-dda/json/requirements/explosives.json share/cataclysm-dda/json/requirements/materials.json +share/cataclysm-dda/json/requirements/melee.json share/cataclysm-dda/json/requirements/ranged.json share/cataclysm-dda/json/requirements/tailoring.json share/cataclysm-dda/json/requirements/toolsets.json @@ -2829,17 +2942,20 @@ share/cataclysm-dda/json/rotatable_symbo share/cataclysm-dda/json/scenarios.json share/cataclysm-dda/json/scent_types.json share/cataclysm-dda/json/scores.json -share/cataclysm-dda/json/shop_consumption_rates.json share/cataclysm-dda/json/skillDisplayType.json share/cataclysm-dda/json/skills.json share/cataclysm-dda/json/snippets/ share/cataclysm-dda/json/snippets/addiction.json share/cataclysm-dda/json/snippets/amigara.json +share/cataclysm-dda/json/snippets/ancilla_bar.json +share/cataclysm-dda/json/snippets/children_notes.json share/cataclysm-dda/json/snippets/dimensional_exploration.json +share/cataclysm-dda/json/snippets/e_logs.json share/cataclysm-dda/json/snippets/effect_on_conditions.json share/cataclysm-dda/json/snippets/epilogue_factions.json share/cataclysm-dda/json/snippets/epilogue_npc.json share/cataclysm-dda/json/snippets/fliers.json +share/cataclysm-dda/json/snippets/fungaloid_anatomy.json share/cataclysm-dda/json/snippets/graffiti.json share/cataclysm-dda/json/snippets/grave_labels.json share/cataclysm-dda/json/snippets/harvest_drop_msgs.json @@ -2847,20 +2963,28 @@ share/cataclysm-dda/json/snippets/hazard share/cataclysm-dda/json/snippets/health_msgs.json share/cataclysm-dda/json/snippets/lab.json share/cataclysm-dda/json/snippets/lab_signs.json +share/cataclysm-dda/json/snippets/mi-go_anatomy.json share/cataclysm-dda/json/snippets/missing_posters.json share/cataclysm-dda/json/snippets/music.json share/cataclysm-dda/json/snippets/mutant_anatomy.json +share/cataclysm-dda/json/snippets/names.json share/cataclysm-dda/json/snippets/newspapers.json share/cataclysm-dda/json/snippets/nightmares.json share/cataclysm-dda/json/snippets/npc_quips.json +share/cataclysm-dda/json/snippets/npc_story.json +share/cataclysm-dda/json/snippets/photos.json +share/cataclysm-dda/json/snippets/power_leech_anatomy.json share/cataclysm-dda/json/snippets/radio.json share/cataclysm-dda/json/snippets/robot_finds_kitten.json share/cataclysm-dda/json/snippets/schizophrenia.json share/cataclysm-dda/json/snippets/snippets.json share/cataclysm-dda/json/snippets/survivor_notes.json +share/cataclysm-dda/json/snippets/triffid_anatomy.json share/cataclysm-dda/json/snippets/tutorial.json share/cataclysm-dda/json/snippets/valentines.json +share/cataclysm-dda/json/snippets/vitrified_snippets.json share/cataclysm-dda/json/snippets/weed_messages.json +share/cataclysm-dda/json/snippets/zombie_anatomy.json share/cataclysm-dda/json/species.json share/cataclysm-dda/json/speech.json share/cataclysm-dda/json/speed_descriptions.json @@ -2868,7 +2992,6 @@ share/cataclysm-dda/json/start_locations share/cataclysm-dda/json/starting_missions.json share/cataclysm-dda/json/statistics.json share/cataclysm-dda/json/techniques.json -share/cataclysm-dda/json/test_regions.json share/cataclysm-dda/json/tool_qualities.json share/cataclysm-dda/json/traps.json share/cataclysm-dda/json/ui/ @@ -2893,6 +3016,7 @@ share/cataclysm-dda/json/ui/hunger.json share/cataclysm-dda/json/ui/layout.json share/cataclysm-dda/json/ui/lighting.json share/cataclysm-dda/json/ui/ma_style.json +share/cataclysm-dda/json/ui/mana.json share/cataclysm-dda/json/ui/moon.json share/cataclysm-dda/json/ui/morale.json share/cataclysm-dda/json/ui/movement.json @@ -2909,6 +3033,7 @@ share/cataclysm-dda/json/ui/sidebar-lega share/cataclysm-dda/json/ui/sidebar-legacy-labels.json share/cataclysm-dda/json/ui/sidebar-legacy-one-padding.json share/cataclysm-dda/json/ui/sidebar-mobile.json +share/cataclysm-dda/json/ui/sidebar-thick-cleaner.json share/cataclysm-dda/json/ui/sidebar-thick.json share/cataclysm-dda/json/ui/sidebar.json share/cataclysm-dda/json/ui/sound.json @@ -2919,6 +3044,7 @@ share/cataclysm-dda/json/ui/spacebar/spa share/cataclysm-dda/json/ui/spacebar/spacebar_location_compass_block.json share/cataclysm-dda/json/ui/spacebar/spacebar_mana.json share/cataclysm-dda/json/ui/spacebar/spacebar_movement_block.json +share/cataclysm-dda/json/ui/spacebar/spacebar_overmap.json share/cataclysm-dda/json/ui/spacebar/spacebar_player_weariness_mood_block.json share/cataclysm-dda/json/ui/spacebar/spacebar_separators.json share/cataclysm-dda/json/ui/spacebar/spacebar_waepon_ma_block.json @@ -2928,7 +3054,6 @@ share/cataclysm-dda/json/ui/stats.json share/cataclysm-dda/json/ui/structured/ share/cataclysm-dda/json/ui/structured/sidebar-structured.json share/cataclysm-dda/json/ui/structured/structured_bodygraphs.json -share/cataclysm-dda/json/ui/structured/structured_bodygraphs_tiny.json share/cataclysm-dda/json/ui/structured/structured_compass_block.json share/cataclysm-dda/json/ui/structured/structured_environment_blocks.json share/cataclysm-dda/json/ui/structured/structured_health_blocks.json @@ -2936,7 +3061,6 @@ share/cataclysm-dda/json/ui/structured/s share/cataclysm-dda/json/ui/structured/structured_mana_block.json share/cataclysm-dda/json/ui/structured/structured_overmap.json share/cataclysm-dda/json/ui/structured/structured_speed_vehicle.json -share/cataclysm-dda/json/ui/structured/structured_weariness_block.json share/cataclysm-dda/json/ui/structured/structured_wielding.json share/cataclysm-dda/json/ui/thirst.json share/cataclysm-dda/json/ui/time.json @@ -2958,9 +3082,11 @@ share/cataclysm-dda/json/uncraft/ammo/27 share/cataclysm-dda/json/uncraft/ammo/30-06.json share/cataclysm-dda/json/uncraft/ammo/300.json share/cataclysm-dda/json/uncraft/ammo/300blk.json +share/cataclysm-dda/json/uncraft/ammo/303.json share/cataclysm-dda/json/uncraft/ammo/308.json share/cataclysm-dda/json/uncraft/ammo/30carbine.json share/cataclysm-dda/json/uncraft/ammo/32.json +share/cataclysm-dda/json/uncraft/ammo/338lapua.json share/cataclysm-dda/json/uncraft/ammo/357mag.json share/cataclysm-dda/json/uncraft/ammo/357sig.json share/cataclysm-dda/json/uncraft/ammo/38.json @@ -2972,45 +3098,64 @@ share/cataclysm-dda/json/uncraft/ammo/40 share/cataclysm-dda/json/uncraft/ammo/410shot.json share/cataclysm-dda/json/uncraft/ammo/44.json share/cataclysm-dda/json/uncraft/ammo/45.json +share/cataclysm-dda/json/uncraft/ammo/450bushmaster.json share/cataclysm-dda/json/uncraft/ammo/454.json share/cataclysm-dda/json/uncraft/ammo/4570.json share/cataclysm-dda/json/uncraft/ammo/45colt.json share/cataclysm-dda/json/uncraft/ammo/460.json share/cataclysm-dda/json/uncraft/ammo/46mm.json share/cataclysm-dda/json/uncraft/ammo/500.json +share/cataclysm-dda/json/uncraft/ammo/50beowulf.json share/cataclysm-dda/json/uncraft/ammo/50bmg.json share/cataclysm-dda/json/uncraft/ammo/545.json share/cataclysm-dda/json/uncraft/ammo/556.json share/cataclysm-dda/json/uncraft/ammo/57mm.json -share/cataclysm-dda/json/uncraft/ammo/5x50.json share/cataclysm-dda/json/uncraft/ammo/66mm.json share/cataclysm-dda/json/uncraft/ammo/700nx.json share/cataclysm-dda/json/uncraft/ammo/762x25.json share/cataclysm-dda/json/uncraft/ammo/762x39.json share/cataclysm-dda/json/uncraft/ammo/762x51.json share/cataclysm-dda/json/uncraft/ammo/762x54.json +share/cataclysm-dda/json/uncraft/ammo/77mm_jap.json share/cataclysm-dda/json/uncraft/ammo/84x246mm.json share/cataclysm-dda/json/uncraft/ammo/9mm.json share/cataclysm-dda/json/uncraft/ammo/9x18mm.json share/cataclysm-dda/json/uncraft/ammo/atgm.json +share/cataclysm-dda/json/uncraft/ammo/exodii.json share/cataclysm-dda/json/uncraft/ammo/rpg.json share/cataclysm-dda/json/uncraft/ammo/shot.json share/cataclysm-dda/json/uncraft/armor/ share/cataclysm-dda/json/uncraft/armor.json share/cataclysm-dda/json/uncraft/armor/boots.json +share/cataclysm-dda/json/uncraft/armor/legs.json share/cataclysm-dda/json/uncraft/armor/pets_dog.json share/cataclysm-dda/json/uncraft/armor/scrap_armor.json share/cataclysm-dda/json/uncraft/armor/storage.json share/cataclysm-dda/json/uncraft/armor/suit.json +share/cataclysm-dda/json/uncraft/armor/torso.json share/cataclysm-dda/json/uncraft/cbm/ share/cataclysm-dda/json/uncraft/cbm/cbm.json share/cataclysm-dda/json/uncraft/classes/ share/cataclysm-dda/json/uncraft/classes/ammo.json +share/cataclysm-dda/json/uncraft/comestibles/ +share/cataclysm-dda/json/uncraft/comestibles/fruit.json +share/cataclysm-dda/json/uncraft/comestibles/vegetable.json share/cataclysm-dda/json/uncraft/containers/ share/cataclysm-dda/json/uncraft/containers/military.json +share/cataclysm-dda/json/uncraft/furniture/ +share/cataclysm-dda/json/uncraft/furniture/decorative.json +share/cataclysm-dda/json/uncraft/furniture/storage.json share/cataclysm-dda/json/uncraft/generic.json +share/cataclysm-dda/json/uncraft/resources/ +share/cataclysm-dda/json/uncraft/resources/metal.json share/cataclysm-dda/json/uncraft/tool/ +share/cataclysm-dda/json/uncraft/tool/cooking.json share/cataclysm-dda/json/uncraft/tool/deployable.json +share/cataclysm-dda/json/uncraft/tool/entry_tools.json +share/cataclysm-dda/json/uncraft/tool/metalworking.json +share/cataclysm-dda/json/uncraft/tool/misc.json +share/cataclysm-dda/json/uncraft/tool/science.json +share/cataclysm-dda/json/uncraft/tool/workshop.json share/cataclysm-dda/json/uncraft/tools.json share/cataclysm-dda/json/uncraft/vehicle/ share/cataclysm-dda/json/uncraft/vehicle/alternator.json @@ -3018,6 +3163,7 @@ share/cataclysm-dda/json/uncraft/vehicle share/cataclysm-dda/json/uncraft/vehicle/noise.json share/cataclysm-dda/json/uncraft/vehicle/wheels.json share/cataclysm-dda/json/uncraft/weapon/ +share/cataclysm-dda/json/uncraft/weapon/bashing.json share/cataclysm-dda/json/uncraft/weapon/explosive.json share/cataclysm-dda/json/uncraft/weapon/ranged.json share/cataclysm-dda/json/vehicle_groups.json @@ -3030,14 +3176,12 @@ share/cataclysm-dda/json/vehicleparts/ca share/cataclysm-dda/json/vehicleparts/combustion.json share/cataclysm-dda/json/vehicleparts/doors.json share/cataclysm-dda/json/vehicleparts/engineering.json -share/cataclysm-dda/json/vehicleparts/faults.json share/cataclysm-dda/json/vehicleparts/frames.json share/cataclysm-dda/json/vehicleparts/lights.json share/cataclysm-dda/json/vehicleparts/manual.json -share/cataclysm-dda/json/vehicleparts/migration.json share/cataclysm-dda/json/vehicleparts/mirrors.json +share/cataclysm-dda/json/vehicleparts/modular_tools.json share/cataclysm-dda/json/vehicleparts/motor.json -share/cataclysm-dda/json/vehicleparts/obsolete.json share/cataclysm-dda/json/vehicleparts/rams.json share/cataclysm-dda/json/vehicleparts/rotor.json share/cataclysm-dda/json/vehicleparts/seats.json @@ -3069,23 +3213,110 @@ share/cataclysm-dda/json/vitamin.json share/cataclysm-dda/json/weapon_categories.json share/cataclysm-dda/json/weather_type.json share/cataclysm-dda/json/zones.json +share/cataclysm-dda/locale/ +share/cataclysm-dda/locale/ar/ +share/cataclysm-dda/locale/ar/LC_MESSAGES/ +share/cataclysm-dda/locale/ar/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/cs/ +share/cataclysm-dda/locale/cs/LC_MESSAGES/ +share/cataclysm-dda/locale/cs/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/da/ +share/cataclysm-dda/locale/da/LC_MESSAGES/ +share/cataclysm-dda/locale/da/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/de/ +share/cataclysm-dda/locale/de/LC_MESSAGES/ +share/cataclysm-dda/locale/de/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/el/ +share/cataclysm-dda/locale/el/LC_MESSAGES/ +share/cataclysm-dda/locale/el/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/es_AR/ +share/cataclysm-dda/locale/es_AR/LC_MESSAGES/ +share/cataclysm-dda/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/es_ES/ +share/cataclysm-dda/locale/es_ES/LC_MESSAGES/ +share/cataclysm-dda/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/fil_PH/ +share/cataclysm-dda/locale/fil_PH/LC_MESSAGES/ +share/cataclysm-dda/locale/fil_PH/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/fr/ +share/cataclysm-dda/locale/fr/LC_MESSAGES/ +share/cataclysm-dda/locale/fr/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/ga_IE/ +share/cataclysm-dda/locale/ga_IE/LC_MESSAGES/ +share/cataclysm-dda/locale/ga_IE/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/hu/ +share/cataclysm-dda/locale/hu/LC_MESSAGES/ +share/cataclysm-dda/locale/hu/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/id/ +share/cataclysm-dda/locale/id/LC_MESSAGES/ +share/cataclysm-dda/locale/id/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/is/ +share/cataclysm-dda/locale/is/LC_MESSAGES/ +share/cataclysm-dda/locale/is/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/it_IT/ +share/cataclysm-dda/locale/it_IT/LC_MESSAGES/ +share/cataclysm-dda/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/ja/ +share/cataclysm-dda/locale/ja/LC_MESSAGES/ +share/cataclysm-dda/locale/ja/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/ko/ +share/cataclysm-dda/locale/ko/LC_MESSAGES/ +share/cataclysm-dda/locale/ko/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/nb/ +share/cataclysm-dda/locale/nb/LC_MESSAGES/ +share/cataclysm-dda/locale/nb/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/nl/ +share/cataclysm-dda/locale/nl/LC_MESSAGES/ +share/cataclysm-dda/locale/nl/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/pl/ +share/cataclysm-dda/locale/pl/LC_MESSAGES/ +share/cataclysm-dda/locale/pl/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/pt_BR/ +share/cataclysm-dda/locale/pt_BR/LC_MESSAGES/ +share/cataclysm-dda/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/ro/ +share/cataclysm-dda/locale/ro/LC_MESSAGES/ +share/cataclysm-dda/locale/ro/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/ru/ +share/cataclysm-dda/locale/ru/LC_MESSAGES/ +share/cataclysm-dda/locale/ru/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/sr/ +share/cataclysm-dda/locale/sr/LC_MESSAGES/ +share/cataclysm-dda/locale/sr/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/tr/ +share/cataclysm-dda/locale/tr/LC_MESSAGES/ +share/cataclysm-dda/locale/tr/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/uk_UA/ +share/cataclysm-dda/locale/uk_UA/LC_MESSAGES/ +share/cataclysm-dda/locale/uk_UA/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/zh_CN/ +share/cataclysm-dda/locale/zh_CN/LC_MESSAGES/ +share/cataclysm-dda/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo +share/cataclysm-dda/locale/zh_TW/ +share/cataclysm-dda/locale/zh_TW/LC_MESSAGES/ +share/cataclysm-dda/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo share/cataclysm-dda/mods/ share/cataclysm-dda/mods/Aftershock/ +share/cataclysm-dda/mods/Aftershock/EOC/ +share/cataclysm-dda/mods/Aftershock/EOC/drug_eoc.json share/cataclysm-dda/mods/Aftershock/README.md share/cataclysm-dda/mods/Aftershock/achievements/ share/cataclysm-dda/mods/Aftershock/achievements/achievements.json share/cataclysm-dda/mods/Aftershock/achievements/statistics.json share/cataclysm-dda/mods/Aftershock/ammo_effects.json share/cataclysm-dda/mods/Aftershock/crafting_system.md +share/cataclysm-dda/mods/Aftershock/damage_types.json share/cataclysm-dda/mods/Aftershock/effects.json share/cataclysm-dda/mods/Aftershock/effects_on_condition.json share/cataclysm-dda/mods/Aftershock/emit.json share/cataclysm-dda/mods/Aftershock/field.json share/cataclysm-dda/mods/Aftershock/field_type.json +share/cataclysm-dda/mods/Aftershock/flags.json share/cataclysm-dda/mods/Aftershock/harvest.json share/cataclysm-dda/mods/Aftershock/itemgroups/ share/cataclysm-dda/mods/Aftershock/itemgroups/alien_civ_itemgroups.json share/cataclysm-dda/mods/Aftershock/itemgroups/arcology_groups.json +share/cataclysm-dda/mods/Aftershock/itemgroups/astronaut_mre.json share/cataclysm-dda/mods/Aftershock/itemgroups/bionics_groups.json share/cataclysm-dda/mods/Aftershock/itemgroups/clothing/ share/cataclysm-dda/mods/Aftershock/itemgroups/clothing/armor_sets.json @@ -3097,8 +3328,10 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/itemgroups/item_groups.json share/cataclysm-dda/mods/Aftershock/itemgroups/kitchen_groups.json share/cataclysm-dda/mods/Aftershock/itemgroups/loot_corpse_groups.json +share/cataclysm-dda/mods/Aftershock/itemgroups/medical_groups.json share/cataclysm-dda/mods/Aftershock/itemgroups/nanofab_recipes.json share/cataclysm-dda/mods/Aftershock/itemgroups/nuclear_reactor_groups.json +share/cataclysm-dda/mods/Aftershock/itemgroups/robot_storage.json share/cataclysm-dda/mods/Aftershock/itemgroups/science_groups.json share/cataclysm-dda/mods/Aftershock/itemgroups/scrap_expansion_groups.json share/cataclysm-dda/mods/Aftershock/itemgroups/scrap_groups.json @@ -3120,13 +3353,16 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/items/ammo.json share/cataclysm-dda/mods/Aftershock/items/ammo/10mm.json share/cataclysm-dda/mods/Aftershock/items/ammo/25mm.json +share/cataclysm-dda/mods/Aftershock/items/ammo/5x50.json share/cataclysm-dda/mods/Aftershock/items/ammo/7.50mm.json share/cataclysm-dda/mods/Aftershock/items/ammo/battery.json +share/cataclysm-dda/mods/Aftershock/items/ammo/flashbulb.json share/cataclysm-dda/mods/Aftershock/items/ammo/foam.json share/cataclysm-dda/mods/Aftershock/items/ammo/metal_rail.json share/cataclysm-dda/mods/Aftershock/items/ammo/plasma.json share/cataclysm-dda/mods/Aftershock/items/ammo_effects.json share/cataclysm-dda/mods/Aftershock/items/ammo_type.json +share/cataclysm-dda/mods/Aftershock/items/appliances.json share/cataclysm-dda/mods/Aftershock/items/armor/ share/cataclysm-dda/mods/Aftershock/items/armor.json share/cataclysm-dda/mods/Aftershock/items/armor/civilian_blue_collar.json @@ -3136,6 +3372,7 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_components.json share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_frame.json share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_guide.md +share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_manual.json share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_melee.json share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_modules.json share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_mutations.json @@ -3150,9 +3387,12 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_tool.json share/cataclysm-dda/mods/Aftershock/items/armor/exosuit/exosuit_underlayers.json share/cataclysm-dda/mods/Aftershock/items/armor/jetpacks.json +share/cataclysm-dda/mods/Aftershock/items/armor/military_armor.json +share/cataclysm-dda/mods/Aftershock/items/armor/military_clothing.json share/cataclysm-dda/mods/Aftershock/items/armor/winter_masks.json share/cataclysm-dda/mods/Aftershock/items/armor/winter_suits.json share/cataclysm-dda/mods/Aftershock/items/armor_helmets.json +share/cataclysm-dda/mods/Aftershock/items/bionics_mainline_override.json share/cataclysm-dda/mods/Aftershock/items/bioparts.json share/cataclysm-dda/mods/Aftershock/items/books.json share/cataclysm-dda/mods/Aftershock/items/casing.json @@ -3163,7 +3403,9 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/items/comestibles/bug_brew.json share/cataclysm-dda/mods/Aftershock/items/comestibles/cheap_food.json share/cataclysm-dda/mods/Aftershock/items/comestibles/comestibles.json +share/cataclysm-dda/mods/Aftershock/items/comestibles/flesh.json share/cataclysm-dda/mods/Aftershock/items/comestibles/medicine.json +share/cataclysm-dda/mods/Aftershock/items/comestibles/veggies.json share/cataclysm-dda/mods/Aftershock/items/containers.json share/cataclysm-dda/mods/Aftershock/items/corpses.json share/cataclysm-dda/mods/Aftershock/items/crafting_scrap/ @@ -3194,24 +3436,31 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/items/gun/mining_rod.json share/cataclysm-dda/mods/Aftershock/items/gun/plasma.json share/cataclysm-dda/mods/Aftershock/items/gun/projectile.json +share/cataclysm-dda/mods/Aftershock/items/gun/shot.json share/cataclysm-dda/mods/Aftershock/items/gun/voltaic.json share/cataclysm-dda/mods/Aftershock/items/gunmods/ share/cataclysm-dda/mods/Aftershock/items/gunmods/laser_gunmods.json +share/cataclysm-dda/mods/Aftershock/items/gunmods/shotguns.json share/cataclysm-dda/mods/Aftershock/items/gunmods/sights.json +share/cataclysm-dda/mods/Aftershock/items/id_cards.json share/cataclysm-dda/mods/Aftershock/items/inactiverobot.json +share/cataclysm-dda/mods/Aftershock/items/item_enchants.json share/cataclysm-dda/mods/Aftershock/items/items.json share/cataclysm-dda/mods/Aftershock/items/lore_items.json share/cataclysm-dda/mods/Aftershock/items/magazine/ share/cataclysm-dda/mods/Aftershock/items/magazine/10mm.json share/cataclysm-dda/mods/Aftershock/items/magazine/25mm.json +share/cataclysm-dda/mods/Aftershock/items/magazine/5x50.json share/cataclysm-dda/mods/Aftershock/items/magazine/7.50mm.json share/cataclysm-dda/mods/Aftershock/items/magazine/8x40mm.json share/cataclysm-dda/mods/Aftershock/items/magazine/alien.json share/cataclysm-dda/mods/Aftershock/items/magazine/energy_cell.json share/cataclysm-dda/mods/Aftershock/items/magazine/foam.json share/cataclysm-dda/mods/Aftershock/items/magazine/plasma.json +share/cataclysm-dda/mods/Aftershock/items/magazine/shot.json share/cataclysm-dda/mods/Aftershock/items/magazine/voltaic.json share/cataclysm-dda/mods/Aftershock/items/materials.json +share/cataclysm-dda/mods/Aftershock/items/migration_items.json share/cataclysm-dda/mods/Aftershock/items/mutagen.json share/cataclysm-dda/mods/Aftershock/items/nanofab_templates.json share/cataclysm-dda/mods/Aftershock/items/obsolete.json @@ -3225,14 +3474,18 @@ share/cataclysm-dda/mods/Aftershock/item share/cataclysm-dda/mods/Aftershock/items/weapons.json share/cataclysm-dda/mods/Aftershock/maps/ share/cataclysm-dda/mods/Aftershock/maps/city_buildings.json +share/cataclysm-dda/mods/Aftershock/maps/crashing_ship.json share/cataclysm-dda/mods/Aftershock/maps/furniture.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/ share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/furniture_alienciv.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat.json +share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/furniture_habitat_machinery.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_alienciv.json +share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_card_readers.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_floraxeno.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_groundxeno.json +share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_floor.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_habitat_wall.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_manufactured.json share/cataclysm-dda/mods/Aftershock/maps/furniture_and_terrain/terrain_spaceship.json @@ -3251,14 +3504,13 @@ share/cataclysm-dda/mods/Aftershock/maps share/cataclysm-dda/mods/Aftershock/maps/mapgen/fungal_siege.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/houses/ share/cataclysm-dda/mods/Aftershock/maps/mapgen/houses/houses.json +share/cataclysm-dda/mods/Aftershock/maps/mapgen/landing_pad.json +share/cataclysm-dda/mods/Aftershock/maps/mapgen/maintenance_outpost.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/map_palletes.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/millyficent_lab.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/municipal_microreactor.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/prepnet_orchard.json -share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/ -share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_first_01.json -share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/dispatch_second_01.json -share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch/tpalettes.json +share/cataclysm-dda/mods/Aftershock/maps/mapgen/robot_dispatch.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/s_gas.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/sadie_large_storage.json share/cataclysm-dda/mods/Aftershock/maps/mapgen/stratoscomm_relay.json @@ -3295,6 +3547,7 @@ share/cataclysm-dda/mods/Aftershock/maps share/cataclysm-dda/mods/Aftershock/maps/overmap_terrain/ share/cataclysm-dda/mods/Aftershock/maps/overmap_terrain.json share/cataclysm-dda/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json +share/cataclysm-dda/mods/Aftershock/maps/ter_furn_transforms.json share/cataclysm-dda/mods/Aftershock/martialarts.json share/cataclysm-dda/mods/Aftershock/migration.json share/cataclysm-dda/mods/Aftershock/mobs/ @@ -3319,6 +3572,11 @@ share/cataclysm-dda/mods/Aftershock/mobs share/cataclysm-dda/mods/Aftershock/mobs/uplifted_monsters.json share/cataclysm-dda/mods/Aftershock/mobs/water_mobs.json share/cataclysm-dda/mods/Aftershock/mobs/zombies.json +share/cataclysm-dda/mods/Aftershock/mod_interactions/ +share/cataclysm-dda/mods/Aftershock/mod_interactions/Defense_Mode/ +share/cataclysm-dda/mods/Aftershock/mod_interactions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/Aftershock/mod_interactions/Defense_Mode/monsters.json +share/cataclysm-dda/mods/Aftershock/mod_interactions/Defense_Mode/species.json share/cataclysm-dda/mods/Aftershock/modinfo.json share/cataclysm-dda/mods/Aftershock/monster_attacks.json share/cataclysm-dda/mods/Aftershock/monsterdrops/ @@ -3365,6 +3623,8 @@ share/cataclysm-dda/mods/Aftershock/npcs share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/vatgrown_1.json share/cataclysm-dda/mods/Aftershock/npcs/Backgrounds/whately.json share/cataclysm-dda/mods/Aftershock/npcs/classes.json +share/cataclysm-dda/mods/Aftershock/npcs/computers/ +share/cataclysm-dda/mods/Aftershock/npcs/computers/escape_pod_control.json share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/ share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/ share/cataclysm-dda/mods/Aftershock/npcs/cyborg_npcs/backgrounds/bg_traits_cyborg.json @@ -3389,6 +3649,7 @@ share/cataclysm-dda/mods/Aftershock/opti share/cataclysm-dda/mods/Aftershock/player/ share/cataclysm-dda/mods/Aftershock/player/bionic_eocs.json share/cataclysm-dda/mods/Aftershock/player/bionics.json +share/cataclysm-dda/mods/Aftershock/player/hobbies.json share/cataclysm-dda/mods/Aftershock/player/obsolete.json share/cataclysm-dda/mods/Aftershock/player/professions.json share/cataclysm-dda/mods/Aftershock/player/techniques.json @@ -3408,8 +3669,8 @@ share/cataclysm-dda/mods/Aftershock/reci share/cataclysm-dda/mods/Aftershock/recipes/frankenstein_recipes.json share/cataclysm-dda/mods/Aftershock/recipes/grenades.json share/cataclysm-dda/mods/Aftershock/recipes/gun_recipes.json +share/cataclysm-dda/mods/Aftershock/recipes/gunmods.json share/cataclysm-dda/mods/Aftershock/recipes/mutagens.json -share/cataclysm-dda/mods/Aftershock/recipes/obsolete.json share/cataclysm-dda/mods/Aftershock/recipes/recipe_overrides.json share/cataclysm-dda/mods/Aftershock/recipes/recipes.json share/cataclysm-dda/mods/Aftershock/recipes/recipes_categories.json @@ -3435,8 +3696,8 @@ share/cataclysm-dda/mods/Aftershock/spel share/cataclysm-dda/mods/Aftershock/spells/teleport_spells.json share/cataclysm-dda/mods/Aftershock/start_locations.json share/cataclysm-dda/mods/Aftershock/suit_operating_time.md +share/cataclysm-dda/mods/Aftershock/traps.json share/cataclysm-dda/mods/Aftershock/vehicles/ -share/cataclysm-dda/mods/Aftershock/vehicles/migrations.json share/cataclysm-dda/mods/Aftershock/vehicles/part_items.json share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_groups.json share/cataclysm-dda/mods/Aftershock/vehicles/vehicle_overrides.json @@ -3445,6 +3706,7 @@ share/cataclysm-dda/mods/Aftershock/vehi share/cataclysm-dda/mods/Aftershock/vitamin.json share/cataclysm-dda/mods/Backrooms/ share/cataclysm-dda/mods/Backrooms/README.md +share/cataclysm-dda/mods/Backrooms/artifacts.json share/cataclysm-dda/mods/Backrooms/furniture_terrain.json share/cataclysm-dda/mods/Backrooms/itemgroups.json share/cataclysm-dda/mods/Backrooms/items.json @@ -3456,6 +3718,7 @@ share/cataclysm-dda/mods/Backrooms/palet share/cataclysm-dda/mods/Backrooms/portal_storm_effect_on_condition.json share/cataclysm-dda/mods/Backrooms/regional_map_settings.json share/cataclysm-dda/mods/Backrooms/rooms/ +share/cataclysm-dda/mods/Backrooms/rooms/rooms_autodoc.json share/cataclysm-dda/mods/Backrooms/rooms/rooms_bathroom.json share/cataclysm-dda/mods/Backrooms/rooms/rooms_breakroom.json share/cataclysm-dda/mods/Backrooms/rooms/rooms_common.json @@ -3487,6 +3750,8 @@ share/cataclysm-dda/mods/BlazeIndustries share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_other.json share/cataclysm-dda/mods/BlazeIndustries/items/vehicle/blaze_solar.json share/cataclysm-dda/mods/BlazeIndustries/modinfo.json +share/cataclysm-dda/mods/BlazeIndustries/obsoletion/ +share/cataclysm-dda/mods/BlazeIndustries/obsoletion/migrate_to_VEH_TOOLS.json share/cataclysm-dda/mods/BlazeIndustries/recipes/ share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_construction_recipes.json share/cataclysm-dda/mods/BlazeIndustries/recipes/blaze_gun_recipes.json @@ -3496,65 +3761,53 @@ share/cataclysm-dda/mods/BlazeIndustries share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/ share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_combustion.json share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/blaze_other_parts.json -share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/migrations.json share/cataclysm-dda/mods/BlazeIndustries/vehicleparts/vehicle_parts.json share/cataclysm-dda/mods/BlazeIndustries/vehicles/ share/cataclysm-dda/mods/BlazeIndustries/vehicles/part_items.json share/cataclysm-dda/mods/BlazeIndustries/vehicles/vehicle_spawn.json share/cataclysm-dda/mods/BlazeIndustries/vehicles/vehicles.json -share/cataclysm-dda/mods/CRT_EXPANSION/ -share/cataclysm-dda/mods/CRT_EXPANSION/construction_group.json -share/cataclysm-dda/mods/CRT_EXPANSION/constructions/ -share/cataclysm-dda/mods/CRT_EXPANSION/constructions/crt_constructions.json -share/cataclysm-dda/mods/CRT_EXPANSION/constructions/crt_terrain.json -share/cataclysm-dda/mods/CRT_EXPANSION/crt_gear/ -share/cataclysm-dda/mods/CRT_EXPANSION/crt_gear/advanced_gear.json -share/cataclysm-dda/mods/CRT_EXPANSION/effect_on_condition.json -share/cataclysm-dda/mods/CRT_EXPANSION/effects.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/ -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammo.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_ammotypes.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_armor.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_clothes.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_generic.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_gun.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_gunmods.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_item_enchants.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_item_groups.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_makeshift_survival.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_recipes.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_toolarmor.json -share/cataclysm-dda/mods/CRT_EXPANSION/items/crt_tools.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/ -share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_Bladework.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_EnforcementBuff.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/CRT_MeleeBuffs.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/crt_gun_techniques.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/dragonslayertechn.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/generaltechn.json -share/cataclysm-dda/mods/CRT_EXPANSION/martial/stabtechn.json -share/cataclysm-dda/mods/CRT_EXPANSION/modinfo.json -share/cataclysm-dda/mods/CRT_EXPANSION/monsters/ -share/cataclysm-dda/mods/CRT_EXPANSION/monsters/crt_monster.json -share/cataclysm-dda/mods/CRT_EXPANSION/monsters/crt_monstergroups.json -share/cataclysm-dda/mods/CRT_EXPANSION/monsters/monster.json -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/ -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_mut_itemgroups.json -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_mutatinoc.json -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_vamp_mutations.json -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/crt_wendigo_mutations.json -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/vamp_mut_cat.json -share/cataclysm-dda/mods/CRT_EXPANSION/mutations/wendigo_mut_cat.json -share/cataclysm-dda/mods/CRT_EXPANSION/readme/ -share/cataclysm-dda/mods/CRT_EXPANSION/readme/README.md -share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/ -share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/crt_classes.json -share/cataclysm-dda/mods/CRT_EXPANSION/scenarios/crt_scenarios.json +share/cataclysm-dda/mods/BombasticPerks/ +share/cataclysm-dda/mods/BombasticPerks/corefiles/ +share/cataclysm-dda/mods/BombasticPerks/corefiles/config_menu.json +share/cataclysm-dda/mods/BombasticPerks/corefiles/core_eocs.json +share/cataclysm-dda/mods/BombasticPerks/corefiles/welcomemenu.json +share/cataclysm-dda/mods/BombasticPerks/docs/ +share/cataclysm-dda/mods/BombasticPerks/docs/contributing.md +share/cataclysm-dda/mods/BombasticPerks/docs/expanding_with_mods.md +share/cataclysm-dda/mods/BombasticPerks/modinfo.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/ +share/cataclysm-dda/mods/BombasticPerks/perkdata/closedfist.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/empath.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/frankenstein.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/holdout_pocket.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/ +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/careful.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/intuitive.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/quicken.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/reach.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/silent.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/still.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/metamagic/widen.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/old_guns.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/openpalm.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/pinchedfingers.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/popeye.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/quick_recovery.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/recycler.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/skeleton.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/thick_skull.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/troubleseeker.json +share/cataclysm-dda/mods/BombasticPerks/perkdata/vengeful.json +share/cataclysm-dda/mods/BombasticPerks/perkmenu.json +share/cataclysm-dda/mods/BombasticPerks/perks.json share/cataclysm-dda/mods/CrazyCataclysm/ +share/cataclysm-dda/mods/CrazyCataclysm/crazy_ammo_effects.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_aperturepotato.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_comestibles.json +share/cataclysm-dda/mods/CrazyCataclysm/crazy_effect_on_condition.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_item_groups.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_items.json +share/cataclysm-dda/mods/CrazyCataclysm/crazy_mapgen.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_missions.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_monstergroups.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_monsters.json @@ -3564,79 +3817,64 @@ share/cataclysm-dda/mods/CrazyCataclysm/ share/cataclysm-dda/mods/CrazyCataclysm/crazy_vehicles.json share/cataclysm-dda/mods/CrazyCataclysm/crazy_widgets.json share/cataclysm-dda/mods/CrazyCataclysm/modinfo.json -share/cataclysm-dda/mods/Dark-Skies-Above/ -share/cataclysm-dda/mods/Dark-Skies-Above/DESIGN.md -share/cataclysm-dda/mods/Dark-Skies-Above/README.md -share/cataclysm-dda/mods/Dark-Skies-Above/TODO.md -share/cataclysm-dda/mods/Dark-Skies-Above/ammo_effect.json -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/ -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/item_blacklist.json -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/location_blacklist.json -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/mon_blacklist.json -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/recipes_blacklist.json -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/scenario_blacklist.json -share/cataclysm-dda/mods/Dark-Skies-Above/blacklists/trait_blacklist.json -share/cataclysm-dda/mods/Dark-Skies-Above/effects.json -share/cataclysm-dda/mods/Dark-Skies-Above/factions.json -share/cataclysm-dda/mods/Dark-Skies-Above/harvest.json -share/cataclysm-dda/mods/Dark-Skies-Above/items/ -share/cataclysm-dda/mods/Dark-Skies-Above/items/alien-scrap.json -share/cataclysm-dda/mods/Dark-Skies-Above/items/electronics.json -share/cataclysm-dda/mods/Dark-Skies-Above/mapgen/ -share/cataclysm-dda/mods/Dark-Skies-Above/mapgen/map_extras/ -share/cataclysm-dda/mods/Dark-Skies-Above/mapgen/map_extras/bombed_crater.json -share/cataclysm-dda/mods/Dark-Skies-Above/mapgen/map_extras/patrols.json -share/cataclysm-dda/mods/Dark-Skies-Above/materials.json -share/cataclysm-dda/mods/Dark-Skies-Above/modinfo.json -share/cataclysm-dda/mods/Dark-Skies-Above/monattack.json -share/cataclysm-dda/mods/Dark-Skies-Above/mongun.json -share/cataclysm-dda/mods/Dark-Skies-Above/monspell.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/ -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_cyborgs.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_fauna.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/alien_robots.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/ -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/alienanimal_spawns.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/invader_spawns.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/mon_groups/stray_spawns.json -share/cataclysm-dda/mods/Dark-Skies-Above/monsters/strays.json -share/cataclysm-dda/mods/Dark-Skies-Above/mutations/ -share/cataclysm-dda/mods/Dark-Skies-Above/mutations/traits.json -share/cataclysm-dda/mods/Dark-Skies-Above/obsolete.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/ -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/ -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/indoor_furniture.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/furniture_terrain/outdoor-furniture.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/ -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/armor.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/books.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/carnivore.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/electronic.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/generics.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/newspaper.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/ranged.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/tools.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/vehicle.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/items/weapons.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/ -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/cemetery.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/evac_center.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/locations/overmap_special.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/monsters.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/professions.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/region_settings.json -share/cataclysm-dda/mods/Dark-Skies-Above/overrides/scenarios.json -share/cataclysm-dda/mods/Dark-Skies-Above/recipies/ -share/cataclysm-dda/mods/Dark-Skies-Above/recipies/uncraft.json -share/cataclysm-dda/mods/Dark-Skies-Above/snippets/ -share/cataclysm-dda/mods/Dark-Skies-Above/snippets/fliers.json -share/cataclysm-dda/mods/Dark-Skies-Above/snippets/graffiti.json -share/cataclysm-dda/mods/Dark-Skies-Above/snippets/newspaper.json -share/cataclysm-dda/mods/Dark-Skies-Above/snippets/radio.json -share/cataclysm-dda/mods/Dark-Skies-Above/snippets/survnotes.json -share/cataclysm-dda/mods/Dark-Skies-Above/species.json -share/cataclysm-dda/mods/Dark-Skies-Above/speech/ -share/cataclysm-dda/mods/Dark-Skies-Above/speech/neworder_speech.json +share/cataclysm-dda/mods/Defense_Mode/ +share/cataclysm-dda/mods/Defense_Mode/dialogue/ +share/cataclysm-dda/mods/Defense_Mode/dialogue/TALK_DM_MERCHANT.json +share/cataclysm-dda/mods/Defense_Mode/dialogue/TALK_WANDERING_SURVIVOR.json +share/cataclysm-dda/mods/Defense_Mode/dialogue/menu_screen.json +share/cataclysm-dda/mods/Defense_Mode/effects_on_condition/ +share/cataclysm-dda/mods/Defense_Mode/effects_on_condition/altered_eocs.json +share/cataclysm-dda/mods/Defense_Mode/effects_on_condition/backend_eocs.json +share/cataclysm-dda/mods/Defense_Mode/effects_on_condition/random_event_eocs.json +share/cataclysm-dda/mods/Defense_Mode/effects_on_condition/wave_eocs.json +share/cataclysm-dda/mods/Defense_Mode/game_win.json +share/cataclysm-dda/mods/Defense_Mode/items.json +share/cataclysm-dda/mods/Defense_Mode/jmath.json +share/cataclysm-dda/mods/Defense_Mode/mapgen/ +share/cataclysm-dda/mods/Defense_Mode/mapgen/hospital.json +share/cataclysm-dda/mods/Defense_Mode/mapgen/mansion.json +share/cataclysm-dda/mods/Defense_Mode/mapgen/megastore.json +share/cataclysm-dda/mods/Defense_Mode/mapgen/public_works.json +share/cataclysm-dda/mods/Defense_Mode/mapgen/survivor_forest_camp.json +share/cataclysm-dda/mods/Defense_Mode/mapgen/updates.json +share/cataclysm-dda/mods/Defense_Mode/missions.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Aftershock/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Aftershock/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/BombasticPerks/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/BombasticPerks/perkdata/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/BombasticPerks/perkdata/money_maker.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/BombasticPerks/perkdata/troubleseeker.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/BombasticPerks/perkmenu.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/BombasticPerks/perks.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/DinoMod/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/DinoMod/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/DinoMod/species.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Magiclysm/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Magiclysm/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Megafauna/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Megafauna/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/MindOverMatter/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/MindOverMatter/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/MindOverMatter/species.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/My_Sweet_Cataclysm/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/My_Sweet_Cataclysm/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Mythos/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Mythos/eocs.json +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Xedra_Evolved/ +share/cataclysm-dda/mods/Defense_Mode/mod_interactions/Xedra_Evolved/eocs.json +share/cataclysm-dda/mods/Defense_Mode/modinfo.json +share/cataclysm-dda/mods/Defense_Mode/monster_factions.json +share/cataclysm-dda/mods/Defense_Mode/monster_spells.json +share/cataclysm-dda/mods/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/Defense_Mode/monsters.json +share/cataclysm-dda/mods/Defense_Mode/npcs.json +share/cataclysm-dda/mods/Defense_Mode/overmap.json +share/cataclysm-dda/mods/Defense_Mode/region_overlay.json +share/cataclysm-dda/mods/Defense_Mode/scenarios.json +share/cataclysm-dda/mods/Defense_Mode/specials.json +share/cataclysm-dda/mods/Defense_Mode/species.json +share/cataclysm-dda/mods/Defense_Mode/spells.json share/cataclysm-dda/mods/DinoMod/ share/cataclysm-dda/mods/DinoMod/DESIGN.md share/cataclysm-dda/mods/DinoMod/NPC/ @@ -3647,6 +3885,7 @@ share/cataclysm-dda/mods/DinoMod/NPC/NC_ share/cataclysm-dda/mods/DinoMod/NPC/NC_Yoshimi.json share/cataclysm-dda/mods/DinoMod/NPC/NPC_Alonso_Lautrec.json share/cataclysm-dda/mods/DinoMod/NPC/NPC_Brigitte_LaCroix.json +share/cataclysm-dda/mods/DinoMod/NPC/NPC_Old_Guard_RED_Soldier_1.json share/cataclysm-dda/mods/DinoMod/NPC/NPC_old_guard_representative.json share/cataclysm-dda/mods/DinoMod/NPC/TALK_NC_FARMER.json share/cataclysm-dda/mods/DinoMod/NPC/TALK_SURVIVOR_CHEF.json @@ -3673,6 +3912,7 @@ share/cataclysm-dda/mods/DinoMod/items/i share/cataclysm-dda/mods/DinoMod/items/laser_items.json share/cataclysm-dda/mods/DinoMod/items/mutagen.json share/cataclysm-dda/mods/DinoMod/items/mutagen_ingredients.json +share/cataclysm-dda/mods/DinoMod/items/mutation_armor.json share/cataclysm-dda/mods/DinoMod/items/petfoods.json share/cataclysm-dda/mods/DinoMod/items/pets.json share/cataclysm-dda/mods/DinoMod/items/pets_bear_armor.json @@ -3747,6 +3987,7 @@ share/cataclysm-dda/mods/DinoMod/mapgen/ share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_stenonychosaurus.json share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_struthiomimus.json share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_styracosaurus.json +share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_tawa.json share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_tenontosaurus.json share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_thescelosaurus.json share/cataclysm-dda/mods/DinoMod/mapgen/map_extras/nest_torosaurus.json @@ -3763,7 +4004,6 @@ share/cataclysm-dda/mods/DinoMod/mapgen/ share/cataclysm-dda/mods/DinoMod/mapgen/nested/ share/cataclysm-dda/mods/DinoMod/mapgen/nested/shack_nested.json share/cataclysm-dda/mods/DinoMod/mapgen/palettes_DinoLab.json -share/cataclysm-dda/mods/DinoMod/mapgen/railroad_station.json share/cataclysm-dda/mods/DinoMod/mapgen/swamp_shack.json share/cataclysm-dda/mods/DinoMod/mapgen/zoo.json share/cataclysm-dda/mods/DinoMod/modinfo.json @@ -3841,6 +4081,7 @@ share/cataclysm-dda/mods/Generic_Guns/am share/cataclysm-dda/mods/Generic_Guns/ammo/pistol_tiny.json share/cataclysm-dda/mods/Generic_Guns/ammo/rifle.json share/cataclysm-dda/mods/Generic_Guns/ammo/rifle_huge.json +share/cataclysm-dda/mods/Generic_Guns/ammo/rifle_pellet.json share/cataclysm-dda/mods/Generic_Guns/ammo/rocket.json share/cataclysm-dda/mods/Generic_Guns/ammo/shot.json share/cataclysm-dda/mods/Generic_Guns/bandoliers/ @@ -3853,6 +4094,7 @@ share/cataclysm-dda/mods/Generic_Guns/fi share/cataclysm-dda/mods/Generic_Guns/firearms/pistol.json share/cataclysm-dda/mods/Generic_Guns/firearms/pistol_magnum.json share/cataclysm-dda/mods/Generic_Guns/firearms/pistol_tiny.json +share/cataclysm-dda/mods/Generic_Guns/firearms/pneumatic.json share/cataclysm-dda/mods/Generic_Guns/firearms/rifle.json share/cataclysm-dda/mods/Generic_Guns/firearms/rifle_huge.json share/cataclysm-dda/mods/Generic_Guns/firearms/rocket.json @@ -3862,6 +4104,7 @@ share/cataclysm-dda/mods/Generic_Guns/gu share/cataclysm-dda/mods/Generic_Guns/gunmods/gg_gunmods_blacklist.json share/cataclysm-dda/mods/Generic_Guns/gunmods/gg_gunmods_migration.json share/cataclysm-dda/mods/Generic_Guns/gunmods/gunmods.json +share/cataclysm-dda/mods/Generic_Guns/itemgroups.json share/cataclysm-dda/mods/Generic_Guns/magazines/ share/cataclysm-dda/mods/Generic_Guns/magazines/gg_magazines_blacklist.json share/cataclysm-dda/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -3872,8 +4115,8 @@ share/cataclysm-dda/mods/Generic_Guns/ma share/cataclysm-dda/mods/Generic_Guns/magazines/rifle.json share/cataclysm-dda/mods/Generic_Guns/magazines/rifle_huge.json share/cataclysm-dda/mods/Generic_Guns/magazines/shot.json +share/cataclysm-dda/mods/Generic_Guns/misc_blacklist.json share/cataclysm-dda/mods/Generic_Guns/modinfo.json -share/cataclysm-dda/mods/Generic_Guns/obsolete.json share/cataclysm-dda/mods/Generic_Guns/recipes/ share/cataclysm-dda/mods/Generic_Guns/recipes/recipe_obsolete.json share/cataclysm-dda/mods/Generic_Guns/recipes/recipes_deconstruction.json @@ -3897,8 +4140,6 @@ share/cataclysm-dda/mods/Generic_Guns/un share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/rifle.json share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/rifle_huge.json share/cataclysm-dda/mods/Generic_Guns/uncraft/ammo/shot.json -share/cataclysm-dda/mods/Generic_Guns/vehicles/ -share/cataclysm-dda/mods/Generic_Guns/vehicles/migrations.json share/cataclysm-dda/mods/Graphical_Overmap/ share/cataclysm-dda/mods/Graphical_Overmap/base_colors.json share/cataclysm-dda/mods/Graphical_Overmap/fonts.json.txt @@ -3919,7 +4160,6 @@ share/cataclysm-dda/mods/Graphical_Overm share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_mi-go.json share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_microlab.json share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_military.json -share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_necropolis.json share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_private_resort.json share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_public_institutional.json share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_ranch_camp.json @@ -3933,9 +4173,58 @@ share/cataclysm-dda/mods/Graphical_Overm share/cataclysm-dda/mods/Graphical_Overmap/go_overmap_terrain_waterbody.json share/cataclysm-dda/mods/Graphical_Overmap/modinfo.json share/cataclysm-dda/mods/Graphical_Overmap/readme.txt -share/cataclysm-dda/mods/Graphical_Overmap_Magiclysm/ -share/cataclysm-dda/mods/Graphical_Overmap_Magiclysm/go_overmap_terrain_magical.json -share/cataclysm-dda/mods/Graphical_Overmap_Magiclysm/modinfo.json +share/cataclysm-dda/mods/Isolation-Protocol/ +share/cataclysm-dda/mods/Isolation-Protocol/EOC/ +share/cataclysm-dda/mods/Isolation-Protocol/EOC/danger_clock_eoc.json +share/cataclysm-dda/mods/Isolation-Protocol/EOC/elevator_eoc.json +share/cataclysm-dda/mods/Isolation-Protocol/EOC/scenario_init.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/ +share/cataclysm-dda/mods/Isolation-Protocol/Map/levels/ +share/cataclysm-dda/mods/Isolation-Protocol/Map/levels/entrance_level.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/levels/microlab_small_level.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/levels/safe_level.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/mapgen/ +share/cataclysm-dda/mods/Isolation-Protocol/Map/mapgen/elevator.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/mapgen/hallway.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/overmap.json +share/cataclysm-dda/mods/Isolation-Protocol/Map/overmap_location.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/ +share/cataclysm-dda/mods/Isolation-Protocol/Player/Perks/ +share/cataclysm-dda/mods/Isolation-Protocol/Player/Perks/enchantments.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/Perks/perk_effect.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/Perks/perk_eoc.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/Perks/perk_spells.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/Perks/perks.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/profession.json +share/cataclysm-dda/mods/Isolation-Protocol/Player/traits.json +share/cataclysm-dda/mods/Isolation-Protocol/damage.json +share/cataclysm-dda/mods/Isolation-Protocol/furniture.json +share/cataclysm-dda/mods/Isolation-Protocol/game_balance.json +share/cataclysm-dda/mods/Isolation-Protocol/modinfo.json +share/cataclysm-dda/mods/Isolation-Protocol/region_settings.json +share/cataclysm-dda/mods/Isolation-Protocol/scenarios.json +share/cataclysm-dda/mods/Isolation-Protocol/setting_blacklists/ +share/cataclysm-dda/mods/Isolation-Protocol/setting_blacklists/scenario_blacklist.json +share/cataclysm-dda/mods/Isolation-Protocol/ui.json +share/cataclysm-dda/mods/Limb_WIP/ +share/cataclysm-dda/mods/Limb_WIP/armor/ +share/cataclysm-dda/mods/Limb_WIP/armor/arm_prosthetics.json +share/cataclysm-dda/mods/Limb_WIP/armor/legs_prosthetics.json +share/cataclysm-dda/mods/Limb_WIP/armor/test_armor.json +share/cataclysm-dda/mods/Limb_WIP/effects.json +share/cataclysm-dda/mods/Limb_WIP/enchantments.json +share/cataclysm-dda/mods/Limb_WIP/item_groups.json +share/cataclysm-dda/mods/Limb_WIP/mod_integration/ +share/cataclysm-dda/mods/Limb_WIP/mod_integration/vitakinesis_eoc.json +share/cataclysm-dda/mods/Limb_WIP/modinfo.json +share/cataclysm-dda/mods/Limb_WIP/mutation_eocs/ +share/cataclysm-dda/mods/Limb_WIP/mutation_eocs/prosthetics_eocs.json +share/cataclysm-dda/mods/Limb_WIP/mutations/ +share/cataclysm-dda/mods/Limb_WIP/mutations/mutation_limbs.json +share/cataclysm-dda/mods/Limb_WIP/mutations/mutations.json +share/cataclysm-dda/mods/Limb_WIP/professions.json +share/cataclysm-dda/mods/Limb_WIP/recipes.json +share/cataclysm-dda/mods/Limb_WIP/scenarios.json share/cataclysm-dda/mods/MA/ share/cataclysm-dda/mods/MA/MA_overmap/ share/cataclysm-dda/mods/MA/MA_overmap.ps1 @@ -5302,6 +5591,7 @@ share/cataclysm-dda/mods/MMA/techniques. share/cataclysm-dda/mods/MMA/weapon_categories.json share/cataclysm-dda/mods/Magiclysm/ share/cataclysm-dda/mods/Magiclysm/Spells/ +share/cataclysm-dda/mods/Magiclysm/Spells/alien_mages.json share/cataclysm-dda/mods/Magiclysm/Spells/animist.json share/cataclysm-dda/mods/Magiclysm/Spells/attunements/ share/cataclysm-dda/mods/Magiclysm/Spells/attunements/Alchemist.json @@ -5342,6 +5632,7 @@ share/cataclysm-dda/mods/Magiclysm/Spell share/cataclysm-dda/mods/Magiclysm/Spells/dragonbreath.json share/cataclysm-dda/mods/Magiclysm/Spells/druid.json share/cataclysm-dda/mods/Magiclysm/Spells/earthshaper.json +share/cataclysm-dda/mods/Magiclysm/Spells/feral_wizards.json share/cataclysm-dda/mods/Magiclysm/Spells/item_only.json share/cataclysm-dda/mods/Magiclysm/Spells/kelvinist.json share/cataclysm-dda/mods/Magiclysm/Spells/lizardfolk_shaman.json @@ -5359,12 +5650,16 @@ share/cataclysm-dda/mods/Magiclysm/charg share/cataclysm-dda/mods/Magiclysm/construction_group.json share/cataclysm-dda/mods/Magiclysm/cooking_components.json share/cataclysm-dda/mods/Magiclysm/effects/ +share/cataclysm-dda/mods/Magiclysm/effects/effect_potion_fruit.json share/cataclysm-dda/mods/Magiclysm/effects/effects.json +share/cataclysm-dda/mods/Magiclysm/effects/effects_fantasy_species.json share/cataclysm-dda/mods/Magiclysm/emitter.json share/cataclysm-dda/mods/Magiclysm/enchantments/ +share/cataclysm-dda/mods/Magiclysm/enchantments/Basic_Classes.json share/cataclysm-dda/mods/Magiclysm/enchantments/Blood_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Boreal_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Cleansing_Flame.json +share/cataclysm-dda/mods/Magiclysm/enchantments/Earth_Elemental.json share/cataclysm-dda/mods/Magiclysm/enchantments/Fire_Elemental.json share/cataclysm-dda/mods/Magiclysm/enchantments/Force_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Gaias_Chosen.json @@ -5377,15 +5672,18 @@ share/cataclysm-dda/mods/Magiclysm/encha share/cataclysm-dda/mods/Magiclysm/enchantments/Radiaton_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Shaman.json share/cataclysm-dda/mods/Magiclysm/enchantments/Soulfire.json +share/cataclysm-dda/mods/Magiclysm/enchantments/Spells.json share/cataclysm-dda/mods/Magiclysm/enchantments/Storm_Elemental.json share/cataclysm-dda/mods/Magiclysm/enchantments/Sun_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Tundra_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Void_Mage.json share/cataclysm-dda/mods/Magiclysm/enchantments/Vulcanist.json share/cataclysm-dda/mods/Magiclysm/enchantments/Wither_Mage.json +share/cataclysm-dda/mods/Magiclysm/eoc_caster_level_boosts.json share/cataclysm-dda/mods/Magiclysm/field.json share/cataclysm-dda/mods/Magiclysm/furniture.json share/cataclysm-dda/mods/Magiclysm/furniture_and_terrain/ +share/cataclysm-dda/mods/Magiclysm/furniture_and_terrain/furniture.json share/cataclysm-dda/mods/Magiclysm/furniture_and_terrain/furniture_plants.json share/cataclysm-dda/mods/Magiclysm/harvest.json share/cataclysm-dda/mods/Magiclysm/itemgroups/ @@ -5403,6 +5701,7 @@ share/cataclysm-dda/mods/Magiclysm/items share/cataclysm-dda/mods/Magiclysm/items/books.json share/cataclysm-dda/mods/Magiclysm/items/books_lore.json share/cataclysm-dda/mods/Magiclysm/items/cast_spell_items.json +share/cataclysm-dda/mods/Magiclysm/items/caster_level_boosters.json share/cataclysm-dda/mods/Magiclysm/items/class_runes.json share/cataclysm-dda/mods/Magiclysm/items/comestibles.json share/cataclysm-dda/mods/Magiclysm/items/constructs.json @@ -5428,13 +5727,17 @@ share/cataclysm-dda/mods/Magiclysm/items share/cataclysm-dda/mods/Magiclysm/items/ethereal_items.json share/cataclysm-dda/mods/Magiclysm/items/forage.json share/cataclysm-dda/mods/Magiclysm/items/fuel.json +share/cataclysm-dda/mods/Magiclysm/items/furniture.json share/cataclysm-dda/mods/Magiclysm/items/generic.json share/cataclysm-dda/mods/Magiclysm/items/herbs_and_flowers.json +share/cataclysm-dda/mods/Magiclysm/items/item_enchants.json share/cataclysm-dda/mods/Magiclysm/items/mana_crystals.json share/cataclysm-dda/mods/Magiclysm/items/melee.json share/cataclysm-dda/mods/Magiclysm/items/metals.json share/cataclysm-dda/mods/Magiclysm/items/mutagen.json +share/cataclysm-dda/mods/Magiclysm/items/nature_spirit_items.json share/cataclysm-dda/mods/Magiclysm/items/obsolete.json +share/cataclysm-dda/mods/Magiclysm/items/potion_fruits.json share/cataclysm-dda/mods/Magiclysm/items/recipe_books.json share/cataclysm-dda/mods/Magiclysm/items/spell_scrolls.json share/cataclysm-dda/mods/Magiclysm/items/spellbooks.json @@ -5447,6 +5750,27 @@ share/cataclysm-dda/mods/Magiclysm/items share/cataclysm-dda/mods/Magiclysm/lore.md share/cataclysm-dda/mods/Magiclysm/magic_balance.md share/cataclysm-dda/mods/Magiclysm/materials.json +share/cataclysm-dda/mods/Magiclysm/migration_and_obsoletion.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/ +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/ +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/ +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_animist.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_biomancer.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_druid.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_earthshaper.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_kelvinist.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_magus.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_stormshaper.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkdata/caster_level_up_technomancer.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perkmenu.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/BombasticPerks/perks.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/ +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/monster_corpse.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/monsters.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/overmap_specials.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/scenarios.json +share/cataclysm-dda/mods/Magiclysm/mod_interactions/Defense_Mode/species.json share/cataclysm-dda/mods/Magiclysm/modinfo.json share/cataclysm-dda/mods/Magiclysm/monster_attacks.json share/cataclysm-dda/mods/Magiclysm/monster_factions.json @@ -5455,28 +5779,38 @@ share/cataclysm-dda/mods/Magiclysm/monst share/cataclysm-dda/mods/Magiclysm/monsters/ share/cataclysm-dda/mods/Magiclysm/monsters/demon_spider.json share/cataclysm-dda/mods/Magiclysm/monsters/dragon.json +share/cataclysm-dda/mods/Magiclysm/monsters/feral_fantasy_species.json +share/cataclysm-dda/mods/Magiclysm/monsters/feral_wizards.json share/cataclysm-dda/mods/Magiclysm/monsters/forgedwellers.json share/cataclysm-dda/mods/Magiclysm/monsters/goblin.json share/cataclysm-dda/mods/Magiclysm/monsters/golems.json share/cataclysm-dda/mods/Magiclysm/monsters/holiday_magiclysm.json share/cataclysm-dda/mods/Magiclysm/monsters/lizardfolk.json +share/cataclysm-dda/mods/Magiclysm/monsters/mi-go.json share/cataclysm-dda/mods/Magiclysm/monsters/mics.json share/cataclysm-dda/mods/Magiclysm/monsters/monsters.json +share/cataclysm-dda/mods/Magiclysm/monsters/nature_spirits.json +share/cataclysm-dda/mods/Magiclysm/monsters/nether.json share/cataclysm-dda/mods/Magiclysm/monsters/ogre.json share/cataclysm-dda/mods/Magiclysm/monsters/orcs.json +share/cataclysm-dda/mods/Magiclysm/monsters/plants.json share/cataclysm-dda/mods/Magiclysm/monsters/shadows.json +share/cataclysm-dda/mods/Magiclysm/monsters/triffids.json share/cataclysm-dda/mods/Magiclysm/monsters/zombified_monsters.json share/cataclysm-dda/mods/Magiclysm/morale_types.json share/cataclysm-dda/mods/Magiclysm/mutations/ share/cataclysm-dda/mods/Magiclysm/mutations/debug_mutations.json share/cataclysm-dda/mods/Magiclysm/mutations/dragon_mutation_category.json share/cataclysm-dda/mods/Magiclysm/mutations/dreams.json +share/cataclysm-dda/mods/Magiclysm/mutations/fantasy_species.json share/cataclysm-dda/mods/Magiclysm/mutations/mutation_effects.json share/cataclysm-dda/mods/Magiclysm/mutations/mutation_enchantments.json share/cataclysm-dda/mods/Magiclysm/mutations/mutations.json share/cataclysm-dda/mods/Magiclysm/mutations/overlay_ordering.json +share/cataclysm-dda/mods/Magiclysm/mutations/temporary.json share/cataclysm-dda/mods/Magiclysm/npc/ share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_ARDELIA.json +share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_DIVINER.json share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_HELEN_TAVREL.json share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_MERCHANT.json share/cataclysm-dda/mods/Magiclysm/npc/TALK_FORGE_PIRATE.json @@ -5485,6 +5819,7 @@ share/cataclysm-dda/mods/Magiclysm/npc/T share/cataclysm-dda/mods/Magiclysm/npc/TALK_TECHNO_KID.json share/cataclysm-dda/mods/Magiclysm/npc/classes.json share/cataclysm-dda/mods/Magiclysm/npc/factions.json +share/cataclysm-dda/mods/Magiclysm/npc/forge_diviner_missions.json share/cataclysm-dda/mods/Magiclysm/npc/items_worn.json share/cataclysm-dda/mods/Magiclysm/npc/missiondef.json share/cataclysm-dda/mods/Magiclysm/npc/npc.json @@ -5497,14 +5832,18 @@ share/cataclysm-dda/mods/Magiclysm/recip share/cataclysm-dda/mods/Magiclysm/recipes/alchemy.json share/cataclysm-dda/mods/Magiclysm/recipes/armor.json share/cataclysm-dda/mods/Magiclysm/recipes/blacksmithing.json +share/cataclysm-dda/mods/Magiclysm/recipes/caster_level_boosters.json share/cataclysm-dda/mods/Magiclysm/recipes/construction.json share/cataclysm-dda/mods/Magiclysm/recipes/cooking.json share/cataclysm-dda/mods/Magiclysm/recipes/deconstruction.json share/cataclysm-dda/mods/Magiclysm/recipes/dragon_black.json +share/cataclysm-dda/mods/Magiclysm/recipes/enchanting.json +share/cataclysm-dda/mods/Magiclysm/recipes/furniture.json share/cataclysm-dda/mods/Magiclysm/recipes/magic_tools.json share/cataclysm-dda/mods/Magiclysm/recipes/mods.json share/cataclysm-dda/mods/Magiclysm/recipes/mutagens.json share/cataclysm-dda/mods/Magiclysm/recipes/nested.json +share/cataclysm-dda/mods/Magiclysm/recipes/potion_fruits.json share/cataclysm-dda/mods/Magiclysm/recipes/recipe_potions.json share/cataclysm-dda/mods/Magiclysm/recipes/recipe_vehicle.json share/cataclysm-dda/mods/Magiclysm/recipes/tailoring.json @@ -5512,10 +5851,13 @@ share/cataclysm-dda/mods/Magiclysm/recip share/cataclysm-dda/mods/Magiclysm/requirements/ share/cataclysm-dda/mods/Magiclysm/requirements/alchemy.json share/cataclysm-dda/mods/Magiclysm/requirements/cooking_components.json +share/cataclysm-dda/mods/Magiclysm/requirements/crafting.json share/cataclysm-dda/mods/Magiclysm/requirements/spell_components.json share/cataclysm-dda/mods/Magiclysm/scenarios.json share/cataclysm-dda/mods/Magiclysm/snippets/ +share/cataclysm-dda/mods/Magiclysm/snippets/e_logs.json share/cataclysm-dda/mods/Magiclysm/snippets/lab.json +share/cataclysm-dda/mods/Magiclysm/snippets/monster_parrots.json share/cataclysm-dda/mods/Magiclysm/snippets/newspapers.json share/cataclysm-dda/mods/Magiclysm/snippets/survivor_notes.json share/cataclysm-dda/mods/Magiclysm/species.json @@ -5528,6 +5870,7 @@ share/cataclysm-dda/mods/Magiclysm/tool_ share/cataclysm-dda/mods/Magiclysm/traits/ share/cataclysm-dda/mods/Magiclysm/traits/attunements.json share/cataclysm-dda/mods/Magiclysm/traits/classes.json +share/cataclysm-dda/mods/Magiclysm/traits/fantasy_species.json share/cataclysm-dda/mods/Magiclysm/traits/manatouched.json share/cataclysm-dda/mods/Magiclysm/traits/mutation.json share/cataclysm-dda/mods/Magiclysm/traits/temporary_demon_traits.json @@ -5547,10 +5890,14 @@ share/cataclysm-dda/mods/Magiclysm/world share/cataclysm-dda/mods/Magiclysm/worldgen/attunement_altar.json share/cataclysm-dda/mods/Magiclysm/worldgen/black_dragon_lair.json share/cataclysm-dda/mods/Magiclysm/worldgen/demon_spider_lair.json +share/cataclysm-dda/mods/Magiclysm/worldgen/elf_workshop.json +share/cataclysm-dda/mods/Magiclysm/worldgen/elf_workshop_roof.json share/cataclysm-dda/mods/Magiclysm/worldgen/forest_tomb.json share/cataclysm-dda/mods/Magiclysm/worldgen/forge_of_wonders.json share/cataclysm-dda/mods/Magiclysm/worldgen/goblin_encampment.json share/cataclysm-dda/mods/Magiclysm/worldgen/house_technomancer.json +share/cataclysm-dda/mods/Magiclysm/worldgen/labs/ +share/cataclysm-dda/mods/Magiclysm/worldgen/labs/microlab.json share/cataclysm-dda/mods/Magiclysm/worldgen/lake_retreat.json share/cataclysm-dda/mods/Magiclysm/worldgen/magic_academy.json share/cataclysm-dda/mods/Magiclysm/worldgen/magic_basement.json @@ -5565,6 +5912,7 @@ share/cataclysm-dda/mods/Magiclysm/world share/cataclysm-dda/mods/Magiclysm/worldgen/overmap_terrain.json share/cataclysm-dda/mods/Magiclysm/worldgen/regional_overlay.json share/cataclysm-dda/mods/Magiclysm/worldgen/small_magic_field.json +share/cataclysm-dda/mods/Magiclysm/worldgen/teleport_standing_stones.json share/cataclysm-dda/mods/Magiclysm/worldgen/used_bookstore.json share/cataclysm-dda/mods/Magiclysm/worldgen/wizard-towers.json share/cataclysm-dda/mods/Megafauna/ @@ -5577,15 +5925,23 @@ share/cataclysm-dda/mods/Megafauna/items share/cataclysm-dda/mods/Megafauna/items/tool/ share/cataclysm-dda/mods/Megafauna/items/tool/shelters.json share/cataclysm-dda/mods/Megafauna/megafauna_factions.json +share/cataclysm-dda/mods/Megafauna/mf_weakpoint_sets.json +share/cataclysm-dda/mods/Megafauna/mod_interactions/ +share/cataclysm-dda/mods/Megafauna/mod_interactions/Defense_Mode/ +share/cataclysm-dda/mods/Megafauna/mod_interactions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/Megafauna/mod_interactions/Defense_Mode/monsters.json share/cataclysm-dda/mods/Megafauna/modinfo.json share/cataclysm-dda/mods/Megafauna/monstergroups/ share/cataclysm-dda/mods/Megafauna/monstergroups/misc.json +share/cataclysm-dda/mods/Megafauna/monstergroups/monstergroups_egg.json share/cataclysm-dda/mods/Megafauna/monstergroups/wilderness.json share/cataclysm-dda/mods/Megafauna/monsters/ share/cataclysm-dda/mods/Megafauna/monsters/fauna_blacklist.json share/cataclysm-dda/mods/Megafauna/monsters/mf_domestic.json share/cataclysm-dda/mods/Megafauna/monsters/mf_predators.json share/cataclysm-dda/mods/Megafauna/monsters/mf_wild.json +share/cataclysm-dda/mods/Megafauna/proficiencies/ +share/cataclysm-dda/mods/Megafauna/proficiencies/mf_weakpoints.json share/cataclysm-dda/mods/Megafauna/readme.md share/cataclysm-dda/mods/Megafauna/recipes/ share/cataclysm-dda/mods/Megafauna/recipes/recipe_others.json @@ -5600,8 +5956,285 @@ share/cataclysm-dda/mods/Military_Profes share/cataclysm-dda/mods/Military_Professions/prof/itemgroups_prof.json share/cataclysm-dda/mods/Military_Professions/prof/spc.json share/cataclysm-dda/mods/Military_Professions/scenarios.json +share/cataclysm-dda/mods/MindOverMatter/ +share/cataclysm-dda/mods/MindOverMatter/NewPowerGuide.md +share/cataclysm-dda/mods/MindOverMatter/PowerDescriptionSpoilers.md +share/cataclysm-dda/mods/MindOverMatter/README.md +share/cataclysm-dda/mods/MindOverMatter/achievements.json +share/cataclysm-dda/mods/MindOverMatter/activity_types.json +share/cataclysm-dda/mods/MindOverMatter/damage_types.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/ +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_awakening.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_crafting.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_crystal_draining.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_game_initialization.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_items.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_misc.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_mutations.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_nether_attunement_events.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_potions.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +share/cataclysm-dda/mods/MindOverMatter/effectoncondition/eoc_premonition_instances.json +share/cataclysm-dda/mods/MindOverMatter/effects/ +share/cataclysm-dda/mods/MindOverMatter/effects/effects_edited.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_items.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_monster.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_nether_attunement.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_npc.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_other.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_penalty.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_potions.json +share/cataclysm-dda/mods/MindOverMatter/effects/effects_psionic.json +share/cataclysm-dda/mods/MindOverMatter/emits.json +share/cataclysm-dda/mods/MindOverMatter/enchantments/ +share/cataclysm-dda/mods/MindOverMatter/enchantments/enchantment_item.json +share/cataclysm-dda/mods/MindOverMatter/enchantments/enchantments_baneful.json +share/cataclysm-dda/mods/MindOverMatter/enchantments/enchantments_player.json +share/cataclysm-dda/mods/MindOverMatter/fields.json +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/ +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/appliance_lighting.json +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/furniture.json +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/furniture_psionic.json +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/terrain_alien.json +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/terrain_flora.json +share/cataclysm-dda/mods/MindOverMatter/furniture_and_terrain/terrain_tanks.json +share/cataclysm-dda/mods/MindOverMatter/harvests.json +share/cataclysm-dda/mods/MindOverMatter/hobbies.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/ +share/cataclysm-dda/mods/MindOverMatter/itemgroups/books.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/clothing.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/feral_deathdrops.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/lore.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/matrix_materials.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/matrix_technology_labs.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/recipes.json +share/cataclysm-dda/mods/MindOverMatter/itemgroups/zombie_deathdrops.json +share/cataclysm-dda/mods/MindOverMatter/items/ +share/cataclysm-dda/mods/MindOverMatter/items/ammo.json +share/cataclysm-dda/mods/MindOverMatter/items/armor/ +share/cataclysm-dda/mods/MindOverMatter/items/armor/belt.json +share/cataclysm-dda/mods/MindOverMatter/items/armor/head.json +share/cataclysm-dda/mods/MindOverMatter/items/books.json +share/cataclysm-dda/mods/MindOverMatter/items/chemicals.json +share/cataclysm-dda/mods/MindOverMatter/items/clothing/ +share/cataclysm-dda/mods/MindOverMatter/items/clothing/wallets.json +share/cataclysm-dda/mods/MindOverMatter/items/comestibles.json +share/cataclysm-dda/mods/MindOverMatter/items/files_and_post_it.json +share/cataclysm-dda/mods/MindOverMatter/items/laser_overrides.json +share/cataclysm-dda/mods/MindOverMatter/items/matrix_crystals.json +share/cataclysm-dda/mods/MindOverMatter/items/medical.json +share/cataclysm-dda/mods/MindOverMatter/items/misc.json +share/cataclysm-dda/mods/MindOverMatter/items/psions_summon_items.json +share/cataclysm-dda/mods/MindOverMatter/items/schematics.json +share/cataclysm-dda/mods/MindOverMatter/items/teleporter_start_items.json +share/cataclysm-dda/mods/MindOverMatter/items/tools/ +share/cataclysm-dda/mods/MindOverMatter/items/tools/crafting_tools.json +share/cataclysm-dda/mods/MindOverMatter/items/tools/lighting.json +share/cataclysm-dda/mods/MindOverMatter/items/tools/nether_items.json +share/cataclysm-dda/mods/MindOverMatter/items/tools/travel.json +share/cataclysm-dda/mods/MindOverMatter/items/weapons.json +share/cataclysm-dda/mods/MindOverMatter/jmath.json +share/cataclysm-dda/mods/MindOverMatter/json_flags.json +share/cataclysm-dda/mods/MindOverMatter/lore_spoilers.md +share/cataclysm-dda/mods/MindOverMatter/mapgen/ +share/cataclysm-dda/mods/MindOverMatter/mapgen/map_extras/ +share/cataclysm-dda/mods/MindOverMatter/mapgen/map_extras/alien_flora_varieties.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/map_extras/glass_and_crystal.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/map_extras/nether_pond.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/map_extras/phavian_scientists.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/map_extras/wilderness_extras.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/microlab_rooms.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/nested/ +share/cataclysm-dda/mods/MindOverMatter/mapgen/nested/office_phavian_modular.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/nested/skyscraper_lab_modular.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/phavian_office.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/ +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_basement.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_nested.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_roof.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z1.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z2.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z3.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/psi_surface_lab/psi_lab_surface_z4.json +share/cataclysm-dda/mods/MindOverMatter/mapgen/skyscraper_lab/ +share/cataclysm-dda/mods/MindOverMatter/mapgen/skyscraper_lab/skyscraper_lab.json +share/cataclysm-dda/mods/MindOverMatter/mapgen_palettes/ +share/cataclysm-dda/mods/MindOverMatter/mapgen_palettes/microlab_matrix.json +share/cataclysm-dda/mods/MindOverMatter/mapgen_palettes/phavian_office_palette.json +share/cataclysm-dda/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json +share/cataclysm-dda/mods/MindOverMatter/mapgen_palettes/survivor_palette.json +share/cataclysm-dda/mods/MindOverMatter/mapgen_palettes/wilderness.json +share/cataclysm-dda/mods/MindOverMatter/materials.json +share/cataclysm-dda/mods/MindOverMatter/modinfo.json +share/cataclysm-dda/mods/MindOverMatter/modinteractions/ +share/cataclysm-dda/mods/MindOverMatter/modinteractions/Defense_Mode/ +share/cataclysm-dda/mods/MindOverMatter/modinteractions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/MindOverMatter/modinteractions/Defense_Mode/monsters.json +share/cataclysm-dda/mods/MindOverMatter/modinteractions/Defense_Mode/overmap_specials.json +share/cataclysm-dda/mods/MindOverMatter/modinteractions/Defense_Mode/premonition_instances.json +share/cataclysm-dda/mods/MindOverMatter/modinteractions/Defense_Mode/scenarios.json +share/cataclysm-dda/mods/MindOverMatter/monstergroups/ +share/cataclysm-dda/mods/MindOverMatter/monstergroups/monster_faction.json +share/cataclysm-dda/mods/MindOverMatter/monstergroups/monstergroups_edited.json +share/cataclysm-dda/mods/MindOverMatter/monstergroups/monstergroups_new.json +share/cataclysm-dda/mods/MindOverMatter/monstergroups/zombie_upgrades.json +share/cataclysm-dda/mods/MindOverMatter/monsters/ +share/cataclysm-dda/mods/MindOverMatter/monsters/animal_psychics.json +share/cataclysm-dda/mods/MindOverMatter/monsters/civilian_psychics.json +share/cataclysm-dda/mods/MindOverMatter/monsters/death_effects.json +share/cataclysm-dda/mods/MindOverMatter/monsters/feral_lab_psychics.json +share/cataclysm-dda/mods/MindOverMatter/monsters/feral_psychics.json +share/cataclysm-dda/mods/MindOverMatter/monsters/harvests.json +share/cataclysm-dda/mods/MindOverMatter/monsters/mi_go.json +share/cataclysm-dda/mods/MindOverMatter/monsters/monster_eoc_spells.json +share/cataclysm-dda/mods/MindOverMatter/monsters/monster_overrides.json +share/cataclysm-dda/mods/MindOverMatter/monsters/monster_overrides_tameable.json +share/cataclysm-dda/mods/MindOverMatter/monsters/monster_special_attacks.json +share/cataclysm-dda/mods/MindOverMatter/monsters/monsters_spells.json +share/cataclysm-dda/mods/MindOverMatter/monsters/nether.json +share/cataclysm-dda/mods/MindOverMatter/monsters/psi_summons.json +share/cataclysm-dda/mods/MindOverMatter/monsters/species_new.json +share/cataclysm-dda/mods/MindOverMatter/monsters/species_overrides.json +share/cataclysm-dda/mods/MindOverMatter/monsters/zombies.json +share/cataclysm-dda/mods/MindOverMatter/morale_types.json +share/cataclysm-dda/mods/MindOverMatter/mutations/ +share/cataclysm-dda/mods/MindOverMatter/mutations/npc_mutations.json +share/cataclysm-dda/mods/MindOverMatter/mutations/psi_passives.json +share/cataclysm-dda/mods/MindOverMatter/mutations/temporary.json +share/cataclysm-dda/mods/MindOverMatter/mutations/traits.json +share/cataclysm-dda/mods/MindOverMatter/npcs/ +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/ +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/Rubik.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/computer_dialogue.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/generic_dialogue.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/portal_future_you.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/portal_interdimensional_traveler.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/refugee_guards_generic.json +share/cataclysm-dda/mods/MindOverMatter/npcs/dialogue/refugee_guards_traitor.json +share/cataclysm-dda/mods/MindOverMatter/npcs/overrides/ +share/cataclysm-dda/mods/MindOverMatter/npcs/overrides/brigitte_lacroix.json +share/cataclysm-dda/mods/MindOverMatter/npcs/psi_civilians.json +share/cataclysm-dda/mods/MindOverMatter/npcs/starting_traits.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/ +share/cataclysm-dda/mods/MindOverMatter/obsolete/biokinesis.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/clairsentience.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/contemplation_notes.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/enchantment.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/eoc.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/obsolete.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/photokinesis.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/pyrokinesis.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/telekinesis.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/telekinesis_ritual.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/telepathy.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/terrain.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/trait_migration.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/upgrade_eocs/ +share/cataclysm-dda/mods/MindOverMatter/obsolete/upgrade_eocs/biokinetic_upgrades.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/upgrade_eocs/electrokinetic_upgrades.json +share/cataclysm-dda/mods/MindOverMatter/obsolete/vitakinesis_ritual.json +share/cataclysm-dda/mods/MindOverMatter/overmap/ +share/cataclysm-dda/mods/MindOverMatter/overmap/map_extras.json +share/cataclysm-dda/mods/MindOverMatter/overmap/multitile_city_buildings.json +share/cataclysm-dda/mods/MindOverMatter/overmap/nether_crystal_field.json +share/cataclysm-dda/mods/MindOverMatter/overmap/overmap_overrides.json +share/cataclysm-dda/mods/MindOverMatter/overmap/overmap_specials.json +share/cataclysm-dda/mods/MindOverMatter/overmap/overmap_terrain.json +share/cataclysm-dda/mods/MindOverMatter/overmap/regional_overlay.json +share/cataclysm-dda/mods/MindOverMatter/powers/ +share/cataclysm-dda/mods/MindOverMatter/powers/biokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json +share/cataclysm-dda/mods/MindOverMatter/powers/biokinesis_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/clairsentience.json +share/cataclysm-dda/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json +share/cataclysm-dda/mods/MindOverMatter/powers/clairsentience_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/classless.json +share/cataclysm-dda/mods/MindOverMatter/powers/electrokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json +share/cataclysm-dda/mods/MindOverMatter/powers/electrokinesis_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/item_spells.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/ +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/biokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/clairsentience.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/electrokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/overall.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/photokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/pyrokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/telekinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/telepathy.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/teleportation.json +share/cataclysm-dda/mods/MindOverMatter/powers/learning_eocs/vitakinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/nether_attunement_spells.json +share/cataclysm-dda/mods/MindOverMatter/powers/photokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/photokinesis_eocs.json +share/cataclysm-dda/mods/MindOverMatter/powers/pyrokinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/pyrokinesis_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/telekinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/telekinesis_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/telepathy.json +share/cataclysm-dda/mods/MindOverMatter/powers/telepathy_concentration_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/telepathy_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/teleportation.json +share/cataclysm-dda/mods/MindOverMatter/powers/teleportation_concentration_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/teleportation_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/vitakinesis.json +share/cataclysm-dda/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json +share/cataclysm-dda/mods/MindOverMatter/powers/vitakinesis_eoc.json +share/cataclysm-dda/mods/MindOverMatter/professions.json +share/cataclysm-dda/mods/MindOverMatter/recipes/ +share/cataclysm-dda/mods/MindOverMatter/recipes/armor.json +share/cataclysm-dda/mods/MindOverMatter/recipes/categories.json +share/cataclysm-dda/mods/MindOverMatter/recipes/chemistry.json +share/cataclysm-dda/mods/MindOverMatter/recipes/comestibles.json +share/cataclysm-dda/mods/MindOverMatter/recipes/construction.json +share/cataclysm-dda/mods/MindOverMatter/recipes/deconstruction.json +share/cataclysm-dda/mods/MindOverMatter/recipes/medical.json +share/cataclysm-dda/mods/MindOverMatter/recipes/nested.json +share/cataclysm-dda/mods/MindOverMatter/recipes/nether_attunement.json +share/cataclysm-dda/mods/MindOverMatter/recipes/power_improvements.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/ +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/biokinetic_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/clairsentient_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/electrokinesis_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/photokinesis_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/pyrokinesis_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/telekinesis_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/telepathy_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/teleportation_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/practice/vitakinesis_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/proficiencies.json +share/cataclysm-dda/mods/MindOverMatter/recipes/psionics_practice.json +share/cataclysm-dda/mods/MindOverMatter/recipes/recipe_requirements.json +share/cataclysm-dda/mods/MindOverMatter/recipes/research.json +share/cataclysm-dda/mods/MindOverMatter/recipes/rituals.json +share/cataclysm-dda/mods/MindOverMatter/recipes/tools.json +share/cataclysm-dda/mods/MindOverMatter/recipes/travel.json +share/cataclysm-dda/mods/MindOverMatter/recipes/weapons.json +share/cataclysm-dda/mods/MindOverMatter/scenarios.json +share/cataclysm-dda/mods/MindOverMatter/skills.json +share/cataclysm-dda/mods/MindOverMatter/snippets/ +share/cataclysm-dda/mods/MindOverMatter/snippets/snippets.json +share/cataclysm-dda/mods/MindOverMatter/snippets/snippets_new.json +share/cataclysm-dda/mods/MindOverMatter/snippets/snippets_nightmares.json +share/cataclysm-dda/mods/MindOverMatter/snippets/speech.json +share/cataclysm-dda/mods/MindOverMatter/snippets/telepathy_snippets.json +share/cataclysm-dda/mods/MindOverMatter/ter_transform/ +share/cataclysm-dda/mods/MindOverMatter/ter_transform/ter_transform.json +share/cataclysm-dda/mods/MindOverMatter/vitamins.json share/cataclysm-dda/mods/My_Sweet_Cataclysm/ share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinfo.json +share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinteractions/ +share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/ +share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/monsters.json +share/cataclysm-dda/mods/My_Sweet_Cataclysm/modinteractions/Defense_Mode/species.json share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_comestibles.json share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_effect.json share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_field_type.json @@ -5629,41 +6262,27 @@ share/cataclysm-dda/mods/My_Sweet_Catacl share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_snippets.json share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_species.json share/cataclysm-dda/mods/My_Sweet_Cataclysm/sweet_start_locations.json -share/cataclysm-dda/mods/Mythos/ -share/cataclysm-dda/mods/Mythos/README.md -share/cataclysm-dda/mods/Mythos/blacklists/ -share/cataclysm-dda/mods/Mythos/blacklists/item_blacklist.json -share/cataclysm-dda/mods/Mythos/blacklists/location_blacklist.json -share/cataclysm-dda/mods/Mythos/blacklists/recipes_blacklist.json -share/cataclysm-dda/mods/Mythos/blacklists/trait_blacklist.json -share/cataclysm-dda/mods/Mythos/furniture_and_terrain/ -share/cataclysm-dda/mods/Mythos/furniture_and_terrain/1920s_furniture-appliances.json -share/cataclysm-dda/mods/Mythos/game_balance.json -share/cataclysm-dda/mods/Mythos/harvest.json -share/cataclysm-dda/mods/Mythos/items/ -share/cataclysm-dda/mods/Mythos/items/appliances.json -share/cataclysm-dda/mods/Mythos/items/corpses/ -share/cataclysm-dda/mods/Mythos/items/corpses/mythos.json -share/cataclysm-dda/mods/Mythos/mapgen_palettes/ -share/cataclysm-dda/mods/Mythos/mapgen_palettes/1920s_house_general_abandoned.json -share/cataclysm-dda/mods/Mythos/mapgen_palettes/1920s_house_general_palette.json -share/cataclysm-dda/mods/Mythos/mapgen_palettes/1920s_house_w_palette.json -share/cataclysm-dda/mods/Mythos/modinfo.json -share/cataclysm-dda/mods/Mythos/monster_factions.json -share/cataclysm-dda/mods/Mythos/monstergroups/ -share/cataclysm-dda/mods/Mythos/monstergroups/blob.json -share/cataclysm-dda/mods/Mythos/monstergroups/misc.json -share/cataclysm-dda/mods/Mythos/monstergroups/mythos.json -share/cataclysm-dda/mods/Mythos/monstergroups/nether.json -share/cataclysm-dda/mods/Mythos/monstergroups/wilderness.json -share/cataclysm-dda/mods/Mythos/monsters/ -share/cataclysm-dda/mods/Mythos/monsters/mythos.json -share/cataclysm-dda/mods/Mythos/species.json -share/cataclysm-dda/mods/No_Fungi/ -share/cataclysm-dda/mods/No_Fungi/comestibles.json -share/cataclysm-dda/mods/No_Fungi/furniture.json -share/cataclysm-dda/mods/No_Fungi/modinfo.json -share/cataclysm-dda/mods/No_Fungi/terrain.json +share/cataclysm-dda/mods/Mythos-Creatures/ +share/cataclysm-dda/mods/Mythos-Creatures/harvest.json +share/cataclysm-dda/mods/Mythos-Creatures/items/ +share/cataclysm-dda/mods/Mythos-Creatures/items/corpses/ +share/cataclysm-dda/mods/Mythos-Creatures/items/corpses/mythos.json +share/cataclysm-dda/mods/Mythos-Creatures/modinfo.json +share/cataclysm-dda/mods/Mythos-Creatures/modinteractions/ +share/cataclysm-dda/mods/Mythos-Creatures/modinteractions/Defense_Mode/ +share/cataclysm-dda/mods/Mythos-Creatures/modinteractions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/Mythos-Creatures/modinteractions/Defense_Mode/monsters.json +share/cataclysm-dda/mods/Mythos-Creatures/modinteractions/Defense_Mode/species.json +share/cataclysm-dda/mods/Mythos-Creatures/monster_factions.json +share/cataclysm-dda/mods/Mythos-Creatures/monstergroups/ +share/cataclysm-dda/mods/Mythos-Creatures/monstergroups/blob.json +share/cataclysm-dda/mods/Mythos-Creatures/monstergroups/misc.json +share/cataclysm-dda/mods/Mythos-Creatures/monstergroups/mythos.json +share/cataclysm-dda/mods/Mythos-Creatures/monstergroups/nether.json +share/cataclysm-dda/mods/Mythos-Creatures/monstergroups/wilderness.json +share/cataclysm-dda/mods/Mythos-Creatures/monsters/ +share/cataclysm-dda/mods/Mythos-Creatures/monsters/mythos.json +share/cataclysm-dda/mods/Mythos-Creatures/species.json share/cataclysm-dda/mods/No_Hope/ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/2storymodern01.json @@ -5678,23 +6297,16 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/basement_chem.json share/cataclysm-dda/mods/No_Hope/Mapgen/basement_guns.json share/cataclysm-dda/mods/No_Hope/Mapgen/basement_survival.json -share/cataclysm-dda/mods/No_Hope/Mapgen/bike_shop.json share/cataclysm-dda/mods/No_Hope/Mapgen/bunker.json -share/cataclysm-dda/mods/No_Hope/Mapgen/bus_station.json share/cataclysm-dda/mods/No_Hope/Mapgen/butcher.json share/cataclysm-dda/mods/No_Hope/Mapgen/cabin_isherwood.json share/cataclysm-dda/mods/No_Hope/Mapgen/cabin_lake.json -share/cataclysm-dda/mods/No_Hope/Mapgen/campground.json share/cataclysm-dda/mods/No_Hope/Mapgen/city_npc_nested_spawns.json share/cataclysm-dda/mods/No_Hope/Mapgen/collapsed_tower.json -share/cataclysm-dda/mods/No_Hope/Mapgen/construction_site.json -share/cataclysm-dda/mods/No_Hope/Mapgen/cs_car_dealership.json -share/cataclysm-dda/mods/No_Hope/Mapgen/cs_car_showroom.json share/cataclysm-dda/mods/No_Hope/Mapgen/cs_internet_cafe.json share/cataclysm-dda/mods/No_Hope/Mapgen/dairy_farm_isherwood.json share/cataclysm-dda/mods/No_Hope/Mapgen/daycare.json share/cataclysm-dda/mods/No_Hope/Mapgen/dojo.json -share/cataclysm-dda/mods/No_Hope/Mapgen/farm_2side.json share/cataclysm-dda/mods/No_Hope/Mapgen/farm_horse.json share/cataclysm-dda/mods/No_Hope/Mapgen/farm_horse_isherwood.json share/cataclysm-dda/mods/No_Hope/Mapgen/farm_isherwood.json @@ -5706,7 +6318,6 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/gunsmith.json share/cataclysm-dda/mods/No_Hope/Mapgen/helipad.json share/cataclysm-dda/mods/No_Hope/Mapgen/homeimprovement_superstore_new.json -share/cataclysm-dda/mods/No_Hope/Mapgen/hotel_tower.json share/cataclysm-dda/mods/No_Hope/Mapgen/house03.json share/cataclysm-dda/mods/No_Hope/Mapgen/house11.json share/cataclysm-dda/mods/No_Hope/Mapgen/house13.json @@ -5730,20 +6341,14 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/house_inner_garden.json share/cataclysm-dda/mods/No_Hope/Mapgen/house_nested.json share/cataclysm-dda/mods/No_Hope/Mapgen/house_prepper.json -share/cataclysm-dda/mods/No_Hope/Mapgen/house_quiverfull.json share/cataclysm-dda/mods/No_Hope/Mapgen/house_rv.json share/cataclysm-dda/mods/No_Hope/Mapgen/house_tool_shed.json share/cataclysm-dda/mods/No_Hope/Mapgen/house_w_5.json share/cataclysm-dda/mods/No_Hope/Mapgen/irradiator_1.json share/cataclysm-dda/mods/No_Hope/Mapgen/islands.json -share/cataclysm-dda/mods/No_Hope/Mapgen/jewel_store.json share/cataclysm-dda/mods/No_Hope/Mapgen/junkyard.json -share/cataclysm-dda/mods/No_Hope/Mapgen/lab_parking_lot.json -share/cataclysm-dda/mods/No_Hope/Mapgen/lab_surface_big_z1.json -share/cataclysm-dda/mods/No_Hope/Mapgen/landscaping_supply.json share/cataclysm-dda/mods/No_Hope/Mapgen/lighthouse.json share/cataclysm-dda/mods/No_Hope/Mapgen/lmoe.json -share/cataclysm-dda/mods/No_Hope/Mapgen/lot_empty_commercial.json share/cataclysm-dda/mods/No_Hope/Mapgen/lumbermill.json share/cataclysm-dda/mods/No_Hope/Mapgen/mall_basement.json share/cataclysm-dda/mods/No_Hope/Mapgen/mall_ground.json @@ -5753,7 +6358,6 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/map_extras/ share/cataclysm-dda/mods/No_Hope/Mapgen/map_extras/map_extras.json share/cataclysm-dda/mods/No_Hope/Mapgen/map_extras/mapgen_updates.json -share/cataclysm-dda/mods/No_Hope/Mapgen/megastore.json share/cataclysm-dda/mods/No_Hope/Mapgen/microlab_special_tiles.json share/cataclysm-dda/mods/No_Hope/Mapgen/mil_base_z-1.json share/cataclysm-dda/mods/No_Hope/Mapgen/mil_base_z0.json @@ -5762,6 +6366,7 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/missile_silo.json share/cataclysm-dda/mods/No_Hope/Mapgen/mortuary.json share/cataclysm-dda/mods/No_Hope/Mapgen/motel.json +share/cataclysm-dda/mods/No_Hope/Mapgen/multitile_city_buildings.json share/cataclysm-dda/mods/No_Hope/Mapgen/museum.json share/cataclysm-dda/mods/No_Hope/Mapgen/necropolis.json share/cataclysm-dda/mods/No_Hope/Mapgen/necropolisB1.json @@ -5773,12 +6378,8 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/nested/rural_outdoors_nested.json share/cataclysm-dda/mods/No_Hope/Mapgen/office_cubical.json share/cataclysm-dda/mods/No_Hope/Mapgen/office_doctor.json -share/cataclysm-dda/mods/No_Hope/Mapgen/office_tower_2.json share/cataclysm-dda/mods/No_Hope/Mapgen/outpost.json share/cataclysm-dda/mods/No_Hope/Mapgen/park.json -share/cataclysm-dda/mods/No_Hope/Mapgen/park_skate.json -share/cataclysm-dda/mods/No_Hope/Mapgen/parking_garage.json -share/cataclysm-dda/mods/No_Hope/Mapgen/parking_lot.json share/cataclysm-dda/mods/No_Hope/Mapgen/pawn_shop.json share/cataclysm-dda/mods/No_Hope/Mapgen/petstore.json share/cataclysm-dda/mods/No_Hope/Mapgen/pharmacy.json @@ -5834,7 +6435,6 @@ share/cataclysm-dda/mods/No_Hope/Mapgen/ share/cataclysm-dda/mods/No_Hope/Mapgen/urban_7_house_garden.json share/cataclysm-dda/mods/No_Hope/Mapgen/urban_8_house_brick_garden.json share/cataclysm-dda/mods/No_Hope/Mapgen/urban_9_house_garage_loft.json -share/cataclysm-dda/mods/No_Hope/Mapgen/whaleys_house_river.json share/cataclysm-dda/mods/No_Hope/Mapgen/ws_biker_dump.json share/cataclysm-dda/mods/No_Hope/Mapgen/ws_fire_lookout_tower.json share/cataclysm-dda/mods/No_Hope/Mapgen/ws_regional_dump.json @@ -5855,10 +6455,31 @@ share/cataclysm-dda/mods/No_Hope/monster share/cataclysm-dda/mods/No_Hope/monster_drops.json share/cataclysm-dda/mods/No_Hope/monster_groups.json share/cataclysm-dda/mods/No_Hope/monsters.json +share/cataclysm-dda/mods/No_Hope/necropolis/ +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen/ +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen/necropolis.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen/necropolisB1.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen/necropolisB2.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen/necropolisB3.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen_palettes/ +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen_palettes/necropolis_a.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen_palettes/necropolis_b1.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen_palettes/necropolis_b2.json +share/cataclysm-dda/mods/No_Hope/necropolis/mapgen_palettes/necropolis_b3.json +share/cataclysm-dda/mods/No_Hope/necropolis/misc.json +share/cataclysm-dda/mods/No_Hope/necropolis/npcs/ +share/cataclysm-dda/mods/No_Hope/necropolis/npcs/NPC_Old_Guard_Captain.json +share/cataclysm-dda/mods/No_Hope/necropolis/npcs/NPC_Old_Guard_Commo.json +share/cataclysm-dda/mods/No_Hope/necropolis/npcs/NPC_Old_Guard_Soldier.json +share/cataclysm-dda/mods/No_Hope/necropolis/overmap_special.json +share/cataclysm-dda/mods/No_Hope/necropolis/overmap_terrain_necropolis.json share/cataclysm-dda/mods/No_Hope/overmap_specials.json share/cataclysm-dda/mods/No_Hope/overmap_terrain.json share/cataclysm-dda/mods/No_Hope/palettes.json +share/cataclysm-dda/mods/No_Hope/recipes.json share/cataclysm-dda/mods/No_Hope/regional_map_settings.json +share/cataclysm-dda/mods/No_Hope/road_vehicles_nested.json +share/cataclysm-dda/mods/No_Hope/scenario_blacklist.json share/cataclysm-dda/mods/No_Hope/terrain.json share/cataclysm-dda/mods/No_Hope/vehicle_groups.json share/cataclysm-dda/mods/No_Hope/vehicle_placement.json @@ -5866,10 +6487,6 @@ share/cataclysm-dda/mods/No_Hope/vehicle share/cataclysm-dda/mods/No_Hope/vehicles.json share/cataclysm-dda/mods/No_NPC_Food/ share/cataclysm-dda/mods/No_NPC_Food/modinfo.json -share/cataclysm-dda/mods/No_Rail_Stations/ -share/cataclysm-dda/mods/No_Rail_Stations/modinfo.json -share/cataclysm-dda/mods/No_Rail_Stations/overmap_specials.json -share/cataclysm-dda/mods/No_Rail_Stations/region_overlay.json share/cataclysm-dda/mods/Only_Wildlife/ share/cataclysm-dda/mods/Only_Wildlife/modinfo.json share/cataclysm-dda/mods/Personal_Portal_Storms/ @@ -5877,6 +6494,24 @@ share/cataclysm-dda/mods/Personal_Portal share/cataclysm-dda/mods/Personal_Portal_Storms/monster_factions.json share/cataclysm-dda/mods/Rummaging/ share/cataclysm-dda/mods/Rummaging/modinfo.json +share/cataclysm-dda/mods/Sky_Island/ +share/cataclysm-dda/mods/Sky_Island/EOCs.json +share/cataclysm-dda/mods/Sky_Island/LICENSE +share/cataclysm-dda/mods/Sky_Island/README.md +share/cataclysm-dda/mods/Sky_Island/activity_types.json +share/cataclysm-dda/mods/Sky_Island/constructions.json +share/cataclysm-dda/mods/Sky_Island/effects.json +share/cataclysm-dda/mods/Sky_Island/furniture_and_terrain.json +share/cataclysm-dda/mods/Sky_Island/island.json +share/cataclysm-dda/mods/Sky_Island/items.json +share/cataclysm-dda/mods/Sky_Island/missions_and_mapgen.json +share/cataclysm-dda/mods/Sky_Island/modinfo.json +share/cataclysm-dda/mods/Sky_Island/monstergroups.json +share/cataclysm-dda/mods/Sky_Island/recipes.json +share/cataclysm-dda/mods/Sky_Island/scenario.json +share/cataclysm-dda/mods/Sky_Island/sickness_checks.json +share/cataclysm-dda/mods/Sky_Island/ui.json +share/cataclysm-dda/mods/Sky_Island/warpitems.json share/cataclysm-dda/mods/Standard_Combat_Tests/ share/cataclysm-dda/mods/Standard_Combat_Tests/modinfo.json share/cataclysm-dda/mods/StatsThroughSkills/ @@ -5884,6 +6519,7 @@ share/cataclysm-dda/mods/StatsThroughSki share/cataclysm-dda/mods/TEST_DATA/ share/cataclysm-dda/mods/TEST_DATA/EOC.json share/cataclysm-dda/mods/TEST_DATA/README.md +share/cataclysm-dda/mods/TEST_DATA/activity.json share/cataclysm-dda/mods/TEST_DATA/addictions.json share/cataclysm-dda/mods/TEST_DATA/ammo.json share/cataclysm-dda/mods/TEST_DATA/appliance.json @@ -5894,6 +6530,8 @@ share/cataclysm-dda/mods/TEST_DATA/books share/cataclysm-dda/mods/TEST_DATA/character_modifiers.json share/cataclysm-dda/mods/TEST_DATA/construction.json share/cataclysm-dda/mods/TEST_DATA/construction_group.json +share/cataclysm-dda/mods/TEST_DATA/container_spawn_test.json +share/cataclysm-dda/mods/TEST_DATA/damage_types.json share/cataclysm-dda/mods/TEST_DATA/effect_on_condition.json share/cataclysm-dda/mods/TEST_DATA/effects.json share/cataclysm-dda/mods/TEST_DATA/enchantments.json @@ -5912,6 +6550,7 @@ share/cataclysm-dda/mods/TEST_DATA/expec share/cataclysm-dda/mods/TEST_DATA/expected_dps_data/two_handed_flails_dps.json share/cataclysm-dda/mods/TEST_DATA/expected_dps_data/two_handed_swords_dps.json share/cataclysm-dda/mods/TEST_DATA/factions.json +share/cataclysm-dda/mods/TEST_DATA/fields.json share/cataclysm-dda/mods/TEST_DATA/furniture.json share/cataclysm-dda/mods/TEST_DATA/itemgroups.json share/cataclysm-dda/mods/TEST_DATA/items.json @@ -5926,21 +6565,27 @@ share/cataclysm-dda/mods/TEST_DATA/lang/ share/cataclysm-dda/mods/TEST_DATA/lang/po/ share/cataclysm-dda/mods/TEST_DATA/lang/po/ru.po share/cataclysm-dda/mods/TEST_DATA/magic.json +share/cataclysm-dda/mods/TEST_DATA/map_bash.json share/cataclysm-dda/mods/TEST_DATA/mapgen-test.json share/cataclysm-dda/mods/TEST_DATA/martialarts.json +share/cataclysm-dda/mods/TEST_DATA/materials.json share/cataclysm-dda/mods/TEST_DATA/metal.json share/cataclysm-dda/mods/TEST_DATA/missions.json share/cataclysm-dda/mods/TEST_DATA/modinfo.json +share/cataclysm-dda/mods/TEST_DATA/monster_attacks.json share/cataclysm-dda/mods/TEST_DATA/monster_factions.json share/cataclysm-dda/mods/TEST_DATA/monstergroups.json share/cataclysm-dda/mods/TEST_DATA/monsters.json share/cataclysm-dda/mods/TEST_DATA/mutations.json +share/cataclysm-dda/mods/TEST_DATA/npc_boarding_test.json share/cataclysm-dda/mods/TEST_DATA/npc_shop_cons_rates.json share/cataclysm-dda/mods/TEST_DATA/option_sliders.json share/cataclysm-dda/mods/TEST_DATA/overmap_specials.json +share/cataclysm-dda/mods/TEST_DATA/pocket_mods_test.json share/cataclysm-dda/mods/TEST_DATA/proficiencies.json share/cataclysm-dda/mods/TEST_DATA/proficiency_categories.json share/cataclysm-dda/mods/TEST_DATA/recipes.json +share/cataclysm-dda/mods/TEST_DATA/regions.json share/cataclysm-dda/mods/TEST_DATA/scenarios.json share/cataclysm-dda/mods/TEST_DATA/speed_descriptions.json share/cataclysm-dda/mods/TEST_DATA/terrain.json @@ -5949,6 +6594,7 @@ share/cataclysm-dda/mods/TEST_DATA/uncra share/cataclysm-dda/mods/TEST_DATA/vehicle.json share/cataclysm-dda/mods/TEST_DATA/vehicle_drag_test.json share/cataclysm-dda/mods/TEST_DATA/vehicle_efficiency_test.json +share/cataclysm-dda/mods/TEST_DATA/vehicle_export_test.json share/cataclysm-dda/mods/TEST_DATA/vitamins.json share/cataclysm-dda/mods/TEST_DATA/weakpoint_sets.json share/cataclysm-dda/mods/TEST_DATA/weapons.json @@ -5963,6 +6609,7 @@ share/cataclysm-dda/mods/Tamable_Wildlif share/cataclysm-dda/mods/Tamable_Wildlife/items/comestibles/other.json share/cataclysm-dda/mods/Tamable_Wildlife/mammal.json share/cataclysm-dda/mods/Tamable_Wildlife/modinfo.json +share/cataclysm-dda/mods/Tamable_Wildlife/mollusk.json share/cataclysm-dda/mods/Tamable_Wildlife/monstergroups/ share/cataclysm-dda/mods/Tamable_Wildlife/monstergroups/eggs.json share/cataclysm-dda/mods/Tamable_Wildlife/recipes/ @@ -6049,19 +6696,49 @@ share/cataclysm-dda/mods/Xedra_Evolved/a share/cataclysm-dda/mods/Xedra_Evolved/achievements/statistics.json share/cataclysm-dda/mods/Xedra_Evolved/addiction_eocs.json share/cataclysm-dda/mods/Xedra_Evolved/addictions.json +share/cataclysm-dda/mods/Xedra_Evolved/ammo_effects.json +share/cataclysm-dda/mods/Xedra_Evolved/body_parts.json +share/cataclysm-dda/mods/Xedra_Evolved/damage_types.json share/cataclysm-dda/mods/Xedra_Evolved/disease.json share/cataclysm-dda/mods/Xedra_Evolved/dissect.json share/cataclysm-dda/mods/Xedra_Evolved/effects/ share/cataclysm-dda/mods/Xedra_Evolved/effects/effect_on_condition.json share/cataclysm-dda/mods/Xedra_Evolved/effects/effects.json share/cataclysm-dda/mods/Xedra_Evolved/effects/emit.json -share/cataclysm-dda/mods/Xedra_Evolved/effects/field_type.json +share/cataclysm-dda/mods/Xedra_Evolved/effects/goblin_fruit_effects.json +share/cataclysm-dda/mods/Xedra_Evolved/effects/ter_transform.json share/cataclysm-dda/mods/Xedra_Evolved/effects/vampvirus.json +share/cataclysm-dda/mods/Xedra_Evolved/emitters.json +share/cataclysm-dda/mods/Xedra_Evolved/enchantments/ +share/cataclysm-dda/mods/Xedra_Evolved/enchantments/armor.json +share/cataclysm-dda/mods/Xedra_Evolved/enchantments/mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/enchantments/weapon.json +share/cataclysm-dda/mods/Xedra_Evolved/encounters/ +share/cataclysm-dda/mods/Xedra_Evolved/encounters/jotunn_encounters.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/ +share/cataclysm-dda/mods/Xedra_Evolved/eocs/dreamsmith.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/eoc_riddles.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/give_a_class_eoc.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/initialization.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/inventor.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/item_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/magic_potential_eoc.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/misc_eoc.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/scenario_specific.json +share/cataclysm-dda/mods/Xedra_Evolved/eocs/spell_learning_eoc.json +share/cataclysm-dda/mods/Xedra_Evolved/field_type.json +share/cataclysm-dda/mods/Xedra_Evolved/flags.json share/cataclysm-dda/mods/Xedra_Evolved/furniture_and_terrain/ +share/cataclysm-dda/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json share/cataclysm-dda/mods/Xedra_Evolved/furniture_and_terrain/furniture.json share/cataclysm-dda/mods/Xedra_Evolved/furniture_and_terrain/terrain-doors.json +share/cataclysm-dda/mods/Xedra_Evolved/furniture_and_terrain/terrain-flora.json share/cataclysm-dda/mods/Xedra_Evolved/harvest.json share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/ +share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/dreamer_artifacts.json +share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/dreamsmith_procgen.json +share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/goblin_fruit.json +share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/harvest_dissection.json share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/itemgroups.json share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/map_extra_itemgroups.json share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/monster_drops.json @@ -6072,31 +6749,50 @@ share/cataclysm-dda/mods/Xedra_Evolved/i share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/spell_artifacts/eater.json share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/spell_artifacts/inventor.json share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/spell_artifacts/main.json +share/cataclysm-dda/mods/Xedra_Evolved/itemgroups/xe_musuem_itemgroups.json share/cataclysm-dda/mods/Xedra_Evolved/items/ +share/cataclysm-dda/mods/Xedra_Evolved/items/alchemy.json share/cataclysm-dda/mods/Xedra_Evolved/items/ammo.json share/cataclysm-dda/mods/Xedra_Evolved/items/ammo_type.json share/cataclysm-dda/mods/Xedra_Evolved/items/armor/ share/cataclysm-dda/mods/Xedra_Evolved/items/armor/armor.json share/cataclysm-dda/mods/Xedra_Evolved/items/armor/headgear.json share/cataclysm-dda/mods/Xedra_Evolved/items/armor/integrated.json +share/cataclysm-dda/mods/Xedra_Evolved/items/bionics_mainline_override.json share/cataclysm-dda/mods/Xedra_Evolved/items/biosignatures.json share/cataclysm-dda/mods/Xedra_Evolved/items/book_lore.json +share/cataclysm-dda/mods/Xedra_Evolved/items/books_deduction.json share/cataclysm-dda/mods/Xedra_Evolved/items/carnivore.json share/cataclysm-dda/mods/Xedra_Evolved/items/casing.json share/cataclysm-dda/mods/Xedra_Evolved/items/cbms.json share/cataclysm-dda/mods/Xedra_Evolved/items/clothes.json +share/cataclysm-dda/mods/Xedra_Evolved/items/cold_iron.json +share/cataclysm-dda/mods/Xedra_Evolved/items/comestibles/ +share/cataclysm-dda/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json +share/cataclysm-dda/mods/Xedra_Evolved/items/comestibles/med.json +share/cataclysm-dda/mods/Xedra_Evolved/items/comestibles/raw_fruit.json share/cataclysm-dda/mods/Xedra_Evolved/items/containers.json +share/cataclysm-dda/mods/Xedra_Evolved/items/corpses.json share/cataclysm-dda/mods/Xedra_Evolved/items/drugs.json +share/cataclysm-dda/mods/Xedra_Evolved/items/electronics.json share/cataclysm-dda/mods/Xedra_Evolved/items/ethereal_items.json share/cataclysm-dda/mods/Xedra_Evolved/items/gun_magazine.json share/cataclysm-dda/mods/Xedra_Evolved/items/gunmod.json share/cataclysm-dda/mods/Xedra_Evolved/items/guns.json share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/ -share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/artifacts.json +share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/armor.json +share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/bots.json +share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/gun.json +share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/gunmods.json +share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/melee.json +share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/mics.json share/cataclysm-dda/mods/Xedra_Evolved/items/inventor/spark_artifact_items.json share/cataclysm-dda/mods/Xedra_Evolved/items/melee.json +share/cataclysm-dda/mods/Xedra_Evolved/items/mutagen.json +share/cataclysm-dda/mods/Xedra_Evolved/items/mutagen_ingredients.json share/cataclysm-dda/mods/Xedra_Evolved/items/notes_and_news.json share/cataclysm-dda/mods/Xedra_Evolved/items/pets.json +share/cataclysm-dda/mods/Xedra_Evolved/items/range.json share/cataclysm-dda/mods/Xedra_Evolved/items/resources.json share/cataclysm-dda/mods/Xedra_Evolved/items/spell_learning_items/ share/cataclysm-dda/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_classless.json @@ -6104,18 +6800,26 @@ share/cataclysm-dda/mods/Xedra_Evolved/i share/cataclysm-dda/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_dreamsmith.json share/cataclysm-dda/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json share/cataclysm-dda/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_inventor.json +share/cataclysm-dda/mods/Xedra_Evolved/items/tools.json +share/cataclysm-dda/mods/Xedra_Evolved/items/vehicle_parts.json share/cataclysm-dda/mods/Xedra_Evolved/items/xedra_gear.json +share/cataclysm-dda/mods/Xedra_Evolved/jmath.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/ +share/cataclysm-dda/mods/Xedra_Evolved/mapgen/bonum_collis.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/cave.json +share/cataclysm-dda/mods/Xedra_Evolved/mapgen/genius_locum.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/map_extras.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/multitile_city_buildings.json +share/cataclysm-dda/mods/Xedra_Evolved/mapgen/musuems.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/nested/ share/cataclysm-dda/mods/Xedra_Evolved/mapgen/nested/field_office_nests.json +share/cataclysm-dda/mods/Xedra_Evolved/mapgen/nested/museum_display_nests.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/nested/spiders.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/nested/vampires.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/overmap_special.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/overmap_terrain.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/safehouse.json +share/cataclysm-dda/mods/Xedra_Evolved/mapgen/start_locations.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/vampire_cathedral.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/vampire_locations.json share/cataclysm-dda/mods/Xedra_Evolved/mapgen/xedra_field_office.json @@ -6123,12 +6827,33 @@ share/cataclysm-dda/mods/Xedra_Evolved/m share/cataclysm-dda/mods/Xedra_Evolved/mapgen_palettes/field_office_palette.json share/cataclysm-dda/mods/Xedra_Evolved/material.json share/cataclysm-dda/mods/Xedra_Evolved/missions.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/ +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/BombasticPerks/ +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/ +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/ +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_data/Alchemy1.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perk_menu.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/BombasticPerks/perks/perks.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/ +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/main_menu.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/monster_corpses.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/monstergroups.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/monsters.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/npcs.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/overmap_specials.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/scenarios.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/species.json +share/cataclysm-dda/mods/Xedra_Evolved/mod_interactions/Defense_Mode/updates.json share/cataclysm-dda/mods/Xedra_Evolved/modinfo.json share/cataclysm-dda/mods/Xedra_Evolved/monster_special_attacks/ share/cataclysm-dda/mods/Xedra_Evolved/monster_special_attacks/monster_special_attacks.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/ share/cataclysm-dda/mods/Xedra_Evolved/monsters/bloodsuckers.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/changeling.json +share/cataclysm-dda/mods/Xedra_Evolved/monsters/elementals.json +share/cataclysm-dda/mods/Xedra_Evolved/monsters/exodii.json +share/cataclysm-dda/mods/Xedra_Evolved/monsters/ferals.json +share/cataclysm-dda/mods/Xedra_Evolved/monsters/inventor.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/monfaction.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/monster.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/monster_evolutions.json @@ -6137,66 +6862,152 @@ share/cataclysm-dda/mods/Xedra_Evolved/m share/cataclysm-dda/mods/Xedra_Evolved/monsters/monstergroup.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/nightmares_and_chimeras.json share/cataclysm-dda/mods/Xedra_Evolved/monsters/species.json +share/cataclysm-dda/mods/Xedra_Evolved/morale_types.json share/cataclysm-dda/mods/Xedra_Evolved/mutations/ share/cataclysm-dda/mods/Xedra_Evolved/mutations/classes.json share/cataclysm-dda/mods/Xedra_Evolved/mutations/cybernetic_traits.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/mutation_category.json share/cataclysm-dda/mods/Xedra_Evolved/mutations/mutation_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/mutation_ordering.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/mutation_thresh.json share/cataclysm-dda/mods/Xedra_Evolved/mutations/mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/ +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/arvore_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutation_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/salamander_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutation_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/sylph_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/sylph_mutation_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/sylph_mutations.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/undine_eocs.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/undine_mutation_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/paraclesians/undine_mutations.json share/cataclysm-dda/mods/Xedra_Evolved/mutations/spells.json +share/cataclysm-dda/mods/Xedra_Evolved/mutations/temporary.json share/cataclysm-dda/mods/Xedra_Evolved/mutations/vampire_trait_eocs.json share/cataclysm-dda/mods/Xedra_Evolved/npc/ +share/cataclysm-dda/mods/Xedra_Evolved/npc/boann.json +share/cataclysm-dda/mods/Xedra_Evolved/npc/draco_dune.json share/cataclysm-dda/mods/Xedra_Evolved/npc/mr_lapin.json share/cataclysm-dda/mods/Xedra_Evolved/npc/npc_classes.json +share/cataclysm-dda/mods/Xedra_Evolved/npc/rubik.json share/cataclysm-dda/mods/Xedra_Evolved/npc/talk_rescue.json share/cataclysm-dda/mods/Xedra_Evolved/npc/trait_groups.json +share/cataclysm-dda/mods/Xedra_Evolved/obsoletion_and_migration/ +share/cataclysm-dda/mods/Xedra_Evolved/obsoletion_and_migration/effects.json +share/cataclysm-dda/mods/Xedra_Evolved/obsoletion_and_migration/migration.json +share/cataclysm-dda/mods/Xedra_Evolved/obsoletion_and_migration/spells.json +share/cataclysm-dda/mods/Xedra_Evolved/obsoletion_and_migration/tool_to_obsolete_spells.json share/cataclysm-dda/mods/Xedra_Evolved/player/ share/cataclysm-dda/mods/Xedra_Evolved/player/cbm_eoc.json share/cataclysm-dda/mods/Xedra_Evolved/player/cbm_spells.json share/cataclysm-dda/mods/Xedra_Evolved/player/professions.json +share/cataclysm-dda/mods/Xedra_Evolved/player/proficiencies.json share/cataclysm-dda/mods/Xedra_Evolved/player/renfield_cbms.json +share/cataclysm-dda/mods/Xedra_Evolved/procgen/ +share/cataclysm-dda/mods/Xedra_Evolved/procgen/dreamer_procgen.json +share/cataclysm-dda/mods/Xedra_Evolved/procgen/dreamsmith_procgen.json +share/cataclysm-dda/mods/Xedra_Evolved/proficiencies.json share/cataclysm-dda/mods/Xedra_Evolved/recipes/ +share/cataclysm-dda/mods/Xedra_Evolved/recipes/alchemy.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/blacksmithing.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/category.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/chemistry.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/cold_iron.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/disassemble.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/dreamforged_armor.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/dreamforged_tool.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/dreamforged_weapon.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/elemental_mutagens.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/gossamer_clothing.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/ +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/armor.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/bots.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/gun.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/gunmods.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/melee.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/misc.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/inventor/researches.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/meds.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/misc.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/paraclesians/ +share/cataclysm-dda/mods/Xedra_Evolved/recipes/paraclesians/salamander_recipes.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/paraclesians/undine_recipes.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/recipes_deconstruction.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/requirements.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/survival.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/tailoring.json +share/cataclysm-dda/mods/Xedra_Evolved/recipes/uncraft.json share/cataclysm-dda/mods/Xedra_Evolved/recipes/vampire.json share/cataclysm-dda/mods/Xedra_Evolved/regional_overlay.json share/cataclysm-dda/mods/Xedra_Evolved/requirements/ +share/cataclysm-dda/mods/Xedra_Evolved/requirements/cooking_components.json share/cataclysm-dda/mods/Xedra_Evolved/requirements/spell_components.json share/cataclysm-dda/mods/Xedra_Evolved/requirements/toolsets.json share/cataclysm-dda/mods/Xedra_Evolved/scenario.json +share/cataclysm-dda/mods/Xedra_Evolved/scent_type.json share/cataclysm-dda/mods/Xedra_Evolved/skills.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/ +share/cataclysm-dda/mods/Xedra_Evolved/snippets/addiction_snippets.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/changeling_speech.json +share/cataclysm-dda/mods/Xedra_Evolved/snippets/dreams.json +share/cataclysm-dda/mods/Xedra_Evolved/snippets/e_logs.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/effect_on_condition.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/migo_speech.json +share/cataclysm-dda/mods/Xedra_Evolved/snippets/museum.json +share/cataclysm-dda/mods/Xedra_Evolved/snippets/newspapers.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/snippet.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/vampire_speech.json share/cataclysm-dda/mods/Xedra_Evolved/snippets/xedra.json share/cataclysm-dda/mods/Xedra_Evolved/spells/ +share/cataclysm-dda/mods/Xedra_Evolved/spells/XAEA.json share/cataclysm-dda/mods/Xedra_Evolved/spells/classless_spells.json share/cataclysm-dda/mods/Xedra_Evolved/spells/dreamer_spells.json share/cataclysm-dda/mods/Xedra_Evolved/spells/dreamsmithing.json share/cataclysm-dda/mods/Xedra_Evolved/spells/eater_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/spells/integrated_armor_spells.json share/cataclysm-dda/mods/Xedra_Evolved/spells/inventor_spells.json share/cataclysm-dda/mods/Xedra_Evolved/spells/item_spells.json share/cataclysm-dda/mods/Xedra_Evolved/spells/spell_eocs.json share/cataclysm-dda/mods/Xedra_Evolved/spells/vampire_spells.json +share/cataclysm-dda/mods/Xedra_Evolved/techniques.json +share/cataclysm-dda/mods/Xedra_Evolved/ter_transforms/ +share/cataclysm-dda/mods/Xedra_Evolved/ter_transforms/arvore_ter_transforms.json +share/cataclysm-dda/mods/Xedra_Evolved/ter_transforms/salamander_ter_transform.json share/cataclysm-dda/mods/Xedra_Evolved/tool_qualities.json share/cataclysm-dda/mods/Xedra_Evolved/ui/ share/cataclysm-dda/mods/Xedra_Evolved/ui/sidebar.json +share/cataclysm-dda/mods/Xedra_Evolved/ui/vamp_blood_levels.json share/cataclysm-dda/mods/Xedra_Evolved/vehicles/ -share/cataclysm-dda/mods/Xedra_Evolved/vehicles/migrations.json +share/cataclysm-dda/mods/Xedra_Evolved/vehicles/magickal_vehicles.json share/cataclysm-dda/mods/Xedra_Evolved/vehicles/vehicle_groups.json +share/cataclysm-dda/mods/Xedra_Evolved/vehicles/vehicle_parts.json share/cataclysm-dda/mods/Xedra_Evolved/vehicles/xedra.json share/cataclysm-dda/mods/Xedra_Evolved/vitamin.json +share/cataclysm-dda/mods/Xedra_Evolved/weakpoints/ +share/cataclysm-dda/mods/Xedra_Evolved/weakpoints/wp_alien_being.json +share/cataclysm-dda/mods/Xedra_Evolved/weakpoints/wp_combat_cyborg.json share/cataclysm-dda/mods/aftershock_exoplanet/ share/cataclysm-dda/mods/aftershock_exoplanet/Map/ share/cataclysm-dda/mods/aftershock_exoplanet/Map/mapgen/ share/cataclysm-dda/mods/aftershock_exoplanet/Map/mapgen/bridge.json share/cataclysm-dda/mods/aftershock_exoplanet/Map/mapgen/glacer.json share/cataclysm-dda/mods/aftershock_exoplanet/Map/mapgen/road.json +share/cataclysm-dda/mods/aftershock_exoplanet/Map/mapgen/trail.json share/cataclysm-dda/mods/aftershock_exoplanet/Map/overmap_connections.json share/cataclysm-dda/mods/aftershock_exoplanet/Map/overmap_location.json share/cataclysm-dda/mods/aftershock_exoplanet/Map/overmap_terrain/ share/cataclysm-dda/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json share/cataclysm-dda/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json +share/cataclysm-dda/mods/aftershock_exoplanet/Map/vanilla_map_weight_eocs.json share/cataclysm-dda/mods/aftershock_exoplanet/game_balance.json share/cataclysm-dda/mods/aftershock_exoplanet/modinfo.json share/cataclysm-dda/mods/aftershock_exoplanet/region_settings.json @@ -6219,8 +7030,10 @@ share/cataclysm-dda/mods/classic_zombies share/cataclysm-dda/mods/classic_zombies/contagion/effect.json share/cataclysm-dda/mods/classic_zombies/design-doc.md share/cataclysm-dda/mods/classic_zombies/exclusions.json +share/cataclysm-dda/mods/classic_zombies/itemgroups.json share/cataclysm-dda/mods/classic_zombies/items/ share/cataclysm-dda/mods/classic_zombies/items/blacklists.json +share/cataclysm-dda/mods/classic_zombies/items/gunmods.json share/cataclysm-dda/mods/classic_zombies/items/guns.json share/cataclysm-dda/mods/classic_zombies/items/migration.json share/cataclysm-dda/mods/classic_zombies/missiondef.json @@ -6228,6 +7041,8 @@ share/cataclysm-dda/mods/classic_zombies share/cataclysm-dda/mods/classic_zombies/monsters/ share/cataclysm-dda/mods/classic_zombies/monsters/species.json share/cataclysm-dda/mods/classic_zombies/monsters/weakpoints.json +share/cataclysm-dda/mods/classic_zombies/npcs/ +share/cataclysm-dda/mods/classic_zombies/npcs/liam_follower.json share/cataclysm-dda/mods/classic_zombies/place_names.md share/cataclysm-dda/mods/dda/ share/cataclysm-dda/mods/dda/modinfo.json @@ -6254,6 +7069,7 @@ share/cataclysm-dda/mods/desert_region/i share/cataclysm-dda/mods/desert_region/itemgroups/nature.json share/cataclysm-dda/mods/desert_region/mapgen/ share/cataclysm-dda/mods/desert_region/mapgen/earth.json +share/cataclysm-dda/mods/desert_region/mapgen/waterbody.json share/cataclysm-dda/mods/desert_region/modinfo.json share/cataclysm-dda/mods/desert_region/monsters/ share/cataclysm-dda/mods/desert_region/monsters/desert_monster_factions.json @@ -6281,8 +7097,10 @@ share/cataclysm-dda/mods/innawood/furnit share/cataclysm-dda/mods/innawood/furniture_and_terrain/appliances.json share/cataclysm-dda/mods/innawood/furniture_and_terrain/furniture-flora.json share/cataclysm-dda/mods/innawood/furniture_and_terrain/furniture-tools.json +share/cataclysm-dda/mods/innawood/furniture_and_terrain/misc.json share/cataclysm-dda/mods/innawood/furniture_and_terrain/terrain-floors-outdoors.json share/cataclysm-dda/mods/innawood/furniture_and_terrain/terrain-flora.json +share/cataclysm-dda/mods/innawood/game_balance.json share/cataclysm-dda/mods/innawood/harvest.json share/cataclysm-dda/mods/innawood/hobbies.json share/cataclysm-dda/mods/innawood/itemgroups/ @@ -6305,10 +7123,12 @@ share/cataclysm-dda/mods/innawood/items/ share/cataclysm-dda/mods/innawood/items/vehicle_battery.json share/cataclysm-dda/mods/innawood/mapgen/ share/cataclysm-dda/mods/innawood/mapgen/cave.json -share/cataclysm-dda/mods/innawood/mapgen/crater.json -share/cataclysm-dda/mods/innawood/mapgen/map_extras/ -share/cataclysm-dda/mods/innawood/mapgen/map_extras/trapdoor_spider_den.json -share/cataclysm-dda/mods/innawood/mapgen/ponds.json +share/cataclysm-dda/mods/innawood/mapgen/meadow.json +share/cataclysm-dda/mods/innawood/mapgen/meadow_nested.json +share/cataclysm-dda/mods/innawood/mapgen/stream.json +share/cataclysm-dda/mods/innawood/mapgen/stream_nested.json +share/cataclysm-dda/mods/innawood/mapgen_palettes/ +share/cataclysm-dda/mods/innawood/mapgen_palettes/misc_palettes.json share/cataclysm-dda/mods/innawood/materials.json share/cataclysm-dda/mods/innawood/mining/ share/cataclysm-dda/mods/innawood/mining/construction.json @@ -6329,6 +7149,8 @@ share/cataclysm-dda/mods/innawood/monste share/cataclysm-dda/mods/innawood/monsterdrops/zombie.json share/cataclysm-dda/mods/innawood/monsterdrops/zombie_child.json share/cataclysm-dda/mods/innawood/monsterdrops/zombie_default.json +share/cataclysm-dda/mods/innawood/monstergroups/ +share/cataclysm-dda/mods/innawood/monstergroups/stream.json share/cataclysm-dda/mods/innawood/monsters/ share/cataclysm-dda/mods/innawood/monsters/insect_spider.json share/cataclysm-dda/mods/innawood/monsters/mon_blacklist.json @@ -6389,10 +7211,16 @@ share/cataclysm-dda/mods/innawood/npcs/B share/cataclysm-dda/mods/innawood/npcs/NC_ARMY.json share/cataclysm-dda/mods/innawood/npcs/NC_OPS.json share/cataclysm-dda/mods/innawood/npcs/class_item_groups.json +share/cataclysm-dda/mods/innawood/npcs/classes.json share/cataclysm-dda/mods/innawood/npcs/items_generic.json share/cataclysm-dda/mods/innawood/npcs/missiondef.json share/cataclysm-dda/mods/innawood/overmap/ -share/cataclysm-dda/mods/innawood/overmap/connections.json +share/cataclysm-dda/mods/innawood/overmap/overmap_mutable/ +share/cataclysm-dda/mods/innawood/overmap/overmap_mutable/meadow_mutable.json +share/cataclysm-dda/mods/innawood/overmap/overmap_mutable/stream_mutable.json +share/cataclysm-dda/mods/innawood/overmap/overmap_terrarin/ +share/cataclysm-dda/mods/innawood/overmap/overmap_terrarin/overmap_terrain_meadow.json +share/cataclysm-dda/mods/innawood/overmap/overmap_terrarin/overmap_terrain_stream.json share/cataclysm-dda/mods/innawood/overmap/specials_kept.json share/cataclysm-dda/mods/innawood/overmap/terrain_hardcoded.json share/cataclysm-dda/mods/innawood/portal_storm_effect_on_condition.json @@ -6415,7 +7243,6 @@ share/cataclysm-dda/mods/innawood/recipe share/cataclysm-dda/mods/innawood/recipes/other/materials.json share/cataclysm-dda/mods/innawood/recipes/other/medical.json share/cataclysm-dda/mods/innawood/recipes/other/parts.json -share/cataclysm-dda/mods/innawood/recipes/other/parts_rigs.json share/cataclysm-dda/mods/innawood/recipes/other/power_supplies.json share/cataclysm-dda/mods/innawood/recipes/other/vehicle.json share/cataclysm-dda/mods/innawood/recipes/practice/ @@ -6444,16 +7271,40 @@ share/cataclysm-dda/mods/innawood/requir share/cataclysm-dda/mods/innawood/scenario_whitelist.json share/cataclysm-dda/mods/innawood/scenarios.json share/cataclysm-dda/mods/innawood/start_locations.json -share/cataclysm-dda/mods/innawood/traps.json share/cataclysm-dda/mods/innawood/vehicleparts/ share/cataclysm-dda/mods/innawood/vehicleparts/battery.json share/cataclysm-dda/mods/no_fungal_growth/ share/cataclysm-dda/mods/no_fungal_growth/modinfo.json share/cataclysm-dda/mods/package_bionic_professions/ +share/cataclysm-dda/mods/package_bionic_professions/basement_bionic.json share/cataclysm-dda/mods/package_bionic_professions/bionic_missions.json share/cataclysm-dda/mods/package_bionic_professions/bionic_professions.json share/cataclysm-dda/mods/package_bionic_professions/modinfo.json +share/cataclysm-dda/mods/package_bionic_professions/multitile_city_buildings.json +share/cataclysm-dda/mods/package_bionic_professions/overmap_terrain_residential.json share/cataclysm-dda/mods/package_bionic_professions/scenarios.json +share/cataclysm-dda/mods/package_bionic_professions/start_locations.json +share/cataclysm-dda/mods/railroads/ +share/cataclysm-dda/mods/railroads/external_options.json +share/cataclysm-dda/mods/railroads/mapgen/ +share/cataclysm-dda/mods/railroads/mapgen/railroad/ +share/cataclysm-dda/mods/railroads/mapgen/railroad.json +share/cataclysm-dda/mods/railroads/mapgen/railroad/railroad_level_crossing.json +share/cataclysm-dda/mods/railroads/mapgen/railroad/railroad_station.json +share/cataclysm-dda/mods/railroads/mapgen/railroad_bridges.json +share/cataclysm-dda/mods/railroads/mapgen_palettes/ +share/cataclysm-dda/mods/railroads/mapgen_palettes/railroad.json +share/cataclysm-dda/mods/railroads/migrataion.json +share/cataclysm-dda/mods/railroads/modinfo.json +share/cataclysm-dda/mods/railroads/overmap/ +share/cataclysm-dda/mods/railroads/overmap/multitile_city_buildings.json +share/cataclysm-dda/mods/railroads/overmap/overmap_connections.json +share/cataclysm-dda/mods/railroads/overmap/overmap_special/ +share/cataclysm-dda/mods/railroads/overmap/overmap_special/specials.json +share/cataclysm-dda/mods/railroads/overmap/overmap_terrain/ +share/cataclysm-dda/mods/railroads/overmap/overmap_terrain/overmap_terrain_transportation.json +share/cataclysm-dda/mods/railroads/overmap/special_locations.json +share/cataclysm-dda/mods/railroads/region_overlay.json share/cataclysm-dda/mods/replacements.json share/cataclysm-dda/mods/rural_biome/ share/cataclysm-dda/mods/rural_biome/modinfo.json @@ -6512,20 +7363,31 @@ share/cataclysm-dda/raw/color_templates/ share/cataclysm-dda/raw/color_templates/default.json share/cataclysm-dda/raw/color_templates/no_bright_background.json share/cataclysm-dda/raw/color_themes/ +share/cataclysm-dda/raw/color_themes/base_colors-abyss.json share/cataclysm-dda/raw/color_themes/base_colors-articblush.json +share/cataclysm-dda/raw/color_themes/base_colors-blood_moon.json +share/cataclysm-dda/raw/color_themes/base_colors-catppuccin.json share/cataclysm-dda/raw/color_themes/base_colors-dark.json share/cataclysm-dda/raw/color_themes/base_colors-default-sleek.json share/cataclysm-dda/raw/color_themes/base_colors-default.json +share/cataclysm-dda/raw/color_themes/base_colors-empyrium.json share/cataclysm-dda/raw/color_themes/base_colors-green.json +share/cataclysm-dda/raw/color_themes/base_colors-high-contrast.json share/cataclysm-dda/raw/color_themes/base_colors-iceberg.json share/cataclysm-dda/raw/color_themes/base_colors-iceberg_light.json share/cataclysm-dda/raw/color_themes/base_colors-kanagawa.json +share/cataclysm-dda/raw/color_themes/base_colors-oxygen.json +share/cataclysm-dda/raw/color_themes/base_colors-shogun.json +share/cataclysm-dda/raw/color_themes/base_colors-spark.json +share/cataclysm-dda/raw/color_themes/base_colors-sun.json +share/cataclysm-dda/raw/color_themes/base_colors-vector.json share/cataclysm-dda/raw/color_themes/base_colors-vintage.json share/cataclysm-dda/raw/color_themes/base_colors-white.json share/cataclysm-dda/raw/color_themes/base_colors_amber.json share/cataclysm-dda/raw/color_themes/base_colors_gruvbox-light.json share/cataclysm-dda/raw/color_themes/base_colors_gruvbox.json share/cataclysm-dda/raw/color_themes/base_colors_one-dark.json +share/cataclysm-dda/raw/color_themes/base_colors_solarized.json share/cataclysm-dda/raw/colors.json share/cataclysm-dda/raw/keybindings/ share/cataclysm-dda/raw/keybindings.json @@ -6545,44 +7407,5 @@ share/cataclysm-dda/title/en.title share/cataclysm-dda/title/ru.alt1 share/cataclysm-dda/title/ru.title share/cataclysm-dda/title/zh_CN.title -share/locale/ar/LC_MESSAGES/cataclysm-dda.mo -share/locale/cs/LC_MESSAGES/cataclysm-dda.mo -share/locale/da/LC_MESSAGES/cataclysm-dda.mo -share/locale/de/LC_MESSAGES/cataclysm-dda.mo -share/locale/el/LC_MESSAGES/cataclysm-dda.mo -share/locale/es_AR/ -share/locale/es_AR/LC_MESSAGES/ -share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo -share/locale/es_ES/ -share/locale/es_ES/LC_MESSAGES/ -share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo -share/locale/fil_PH/ -share/locale/fil_PH/LC_MESSAGES/ -share/locale/fil_PH/LC_MESSAGES/cataclysm-dda.mo -share/locale/fr/LC_MESSAGES/cataclysm-dda.mo -share/locale/ga_IE/ -share/locale/ga_IE/LC_MESSAGES/ -share/locale/ga_IE/LC_MESSAGES/cataclysm-dda.mo -share/locale/hu/LC_MESSAGES/cataclysm-dda.mo -share/locale/id/LC_MESSAGES/cataclysm-dda.mo -share/locale/is/LC_MESSAGES/cataclysm-dda.mo -share/locale/it_IT/ -share/locale/it_IT/LC_MESSAGES/ -share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo -share/locale/ja/LC_MESSAGES/cataclysm-dda.mo -share/locale/ko/LC_MESSAGES/cataclysm-dda.mo -share/locale/nb/LC_MESSAGES/cataclysm-dda.mo -share/locale/nl/LC_MESSAGES/cataclysm-dda.mo -share/locale/pl/LC_MESSAGES/cataclysm-dda.mo -share/locale/pt_BR/LC_MESSAGES/cataclysm-dda.mo -share/locale/ro/LC_MESSAGES/cataclysm-dda.mo -share/locale/ru/LC_MESSAGES/cataclysm-dda.mo -share/locale/sr/LC_MESSAGES/cataclysm-dda.mo -share/locale/tr/LC_MESSAGES/cataclysm-dda.mo -share/locale/uk_UA/ -share/locale/uk_UA/LC_MESSAGES/ -share/locale/uk_UA/LC_MESSAGES/cataclysm-dda.mo -share/locale/zh_CN/LC_MESSAGES/cataclysm-dda.mo -share/locale/zh_TW/LC_MESSAGES/cataclysm-dda.mo @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor

2024-11-24 00:35 Stefan Moran:
[Update] games/cataclysm-dda 0.G -> 0.H
- 2024-12-10 21:02 Kirill Bychkov:
  [Update] games/cataclysm-dda 0.G -> 0.H