merge master #31

I-am-Erk · 2023-11-28T00:08:22Z

Merge master in

[GG] don't check blacklisted items for migration

* remove silly 20x66 stuff * Update data/json/items/ammo/20x66mm.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * lint gg mig * Update migration_items.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Initial commit * Candle's Glow canceled by combat * Add min to math to constrain powers * Increase length of top-level field of light fields

[Aftershock: Exoplanet] Revamp the Emergency Evacuation scenario to EOC-based workings.

ignore drafts, when they are ready for review give the suggestion also remove some plurals from the auto labeler, makes it match more things, that's good btw

* monster eoc * update * test * passable_only

Adding multiple addictions to some alcohol drinks

supress an uninitialized variable warning

Remove redundant FMS entry.

@andrei8l

* fix unobtainable alchemy 5 * fix limb spells, take two * Apply code by @andrei8l * and by using code wizardry, we make spells free and instant if you have no trait * also you can turn them off by mutations now * no free mana for you now * don't know why this enchantments was not able to inline itself properly but okay * fixing checking the wrong trait for spell effect * fix odd math turning 100 into `1 move`

I do not like using F1-F7 as hotkeys to change panel in the @ menu, when I ported the feature I didn't think of better keys, since I guess the ones that came to mind were alredy used; well just make the best out of what is available, use w, e, r, t, x, c and v for quick panel change; they make sense in the contex of the qwerty keyboard, as in they are located on the left end of the keyboard and are very close to the home row to hit any of them easily with one hand

ci: linter ignores drafts

#69486) * Add the compatibility * Spellchecker and a minor fix

* Add the main mathification * Premonition update

…69477) * Add the code * Update message

Fix Rubik's warehouse clairification

* Add teh stuff * Apply suggestions from code review Co-authored-by: Termineitor244 <[email protected]> * Update melee.json Co-authored-by: Termineitor244 <[email protected]> * Update melee.json Co-authored-by: Termineitor244 <[email protected]> * Update melee.json Co-authored-by: Termineitor244 <[email protected]> * Update melee.json Co-authored-by: Termineitor244 <[email protected]> * Apply suggestions from code review * Update melee.json --------- Co-authored-by: Termineitor244 <[email protected]>

* Wabenaki fix * spelling fixes

* Infrastructure "continuation of chainmail refactoring, arms and legs" * Update arms_armor.json made a mistake and forgot to put the coverage as it was. fixed * Fix arms JSON

* Update exodii.json * Update exodii.json

* Initial commit * Add other monsters * Fixes * Increase juggernaut armor piercing * Fixes * Add stun-immune to juggernaut * Fixes

[Xedra Evolved] Who will fix the bugfixes

* Initial commit * Add EMP immunity * Update src/explosion.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/explosion.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Distribute electrokinetic matrix crystals into itemgroups * Fixes * Fix Galvanic Aura and Revivification * Fix effects, add power learn ladder * Kick tests * Fix spelling * Spelling --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Update soundpack doc

* Added triffid weakpoints and weakpoint proficiencies * spelling

* Update epilogue_npc.json * Update data/json/snippets/epilogue_npc.json Co-authored-by: MNG-cataclysm <[email protected]> * Update epilogue_npc.json Male first. * Update epilogue_npc.json Female done. * Update epilogue_npc.json --------- Co-authored-by: MNG-cataclysm <[email protected]>

Fix pink-white varsity jacket variant id

…naries (#69760) * Initial commit * Update src/activity_handlers.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Oh you like guns? list barrel lengths for every gun * oops * Update data/json/items/gun/shot.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/gun/762.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * redo volume audit on 12ga double * Update shot.json * Update data/json/items/gun/38.json Co-authored-by: TheShadowFerret <[email protected]> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheShadowFerret <[email protected]>

* Adds more mycus monsters * Removed accidental ] * Adds proper "fungalize_into": for classic zombies. * Update zed_misc.json * Added proper "fungalize_into": for zombified animals. * Grammar & Punctuation fixes Thank you again! Co-authored-by: Antti Riikonen <[email protected]> Co-authored-by: TheShadowFerret <[email protected]> * changed scarred fungal zombie definition to be more understandable. * Apply suggestions from code review Minor text changes Thank you! Co-authored-by: NetSysFire <[email protected]> --------- Co-authored-by: Antti Riikonen <[email protected]> Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: NetSysFire <[email protected]>

* Add nuckalavee enemy to nether * add visions * Add the space the build is complaining about, takin the parsers jerb * Update data/json/monsters/nether.json Co-authored-by: ehughsbaird <[email protected]> * Add words to dictionary --------- Co-authored-by: ehughsbaird <[email protected]>

[Xedra] Remove Obsolete Dimension Research Reference

fix a typo in NPC doc

Move the `pocket_type` enum to it's own header

Edit rabbi description + specify holy symbol variant

* 10mm stuff * Update gg_ammo_migration.json * Update 10mm.json * Update pistol.json

#69714) * Update workshop.json * Add the recpie for the fanning mill * Update workshop.json * more 2x4 needed * Update workshop.json * Update tool_qualities.json * Update dining_kitchen.json * Update cooking.json * Update workshop.json Format update * Update raw_grain.json * Update dining_kitchen.json * Update workshop.json * Update workshop.json * Update raw_grain.json * Update misc.json * Update recipe_others.json * Update raw_grain.json * Update tool_qualities.json * Update generic.json * Update bathroom_house.json * Update raw_grain.json * Update misc.json * Update modular_farm_recipe_groups.json

* add old school slings, sprinkle em in * SPS sling is a thing * recipe n stuff * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update professions.json --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

add spawns to some items that need it

[Magiclysm] Fix missing standard for Voltaic Touch

github-actions · 2023-11-28T00:08:43Z

It appears you modified a .po or .pot file. These translation files are automatically generated, pushed to, and pulled from Transifex, and should not be modified otherwise. If these changes are intended, please add Translation file changes are intended to the PR body.

If melee_actori.is_grab is false grab.exclusive_grab and grab.respect_seatbelts were not initialized. This was causing errors under -fsanitize=undefined The solution initialize the booleans to value that match their defaults ```C++ src/mattack_actors.h:75:8: runtime error: load of value 190, which is not a valid value for type 'bool' #0 0x5a9b6fe in grab::grab(grab const&) src/mattack_actors.h:75 #1 0x5ab7635 in melee_actor::melee_actor(melee_actor const&) src/mattack_actors.h:106 #2 0x5ab8412 in std::__detail::_MakeUniq<melee_actor>::__single_object std::make_unique<melee_actor, melee_actor const&>(melee_actor const&) /usr/include/c++/13/bits/unique_ptr.h:1070 #3 0x5a87e4c in melee_actor::clone() const src/mattack_actors.cpp:962 #4 0x207632c in cata::clone_ptr<mattack_actor>::clone_ptr(cata::clone_ptr<mattack_actor> const&) src/clone_ptr.h:18 #5 0x6085941 in mtype_special_attack::mtype_special_attack(mtype_special_attack const&) src/mattack_common.h:47 #6 0x6085941 in std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack, true>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_pair.h:559 #7 0x6085a2b in void std::__new_allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::construct<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/new_allocator.h:187 #8 0x6085a2b in void std::allocator_traits<std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > > >::construct<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::allocator<std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >&, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/alloc_traits.h:537 #9 0x6085a2b in void std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_construct_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:597 #10 0x6085b06 in std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >* std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_create_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:614 #11 0x6085b71 in std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_Auto_node::_Auto_node<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:1637 #12 0x6085c9d in std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::_M_emplace_hint_unique<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_tree.h:2462 #13 0x608618f in std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, mtype_special_attack, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::emplace_hint<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_map.h:640 #14 0x608618f in std::pair<std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> >, bool> std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, mtype_special_attack, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, mtype_special_attack> > >::emplace<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&>(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, mtype_special_attack const&) /usr/include/c++/13/bits/stl_map.h:601 #15 0x5ff3881 in MonsterGenerator::add_attack(mtype_special_attack const&) src/monstergenerator.cpp:1312 #16 0x5ffafa5 in MonsterGenerator::load_monster_attack(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) src/monstergenerator.cpp:1376 #17 0x4262e91 in operator() src/init.cpp:466 #18 0x4262e91 in __invoke_impl<void, DynamicDataLoader::initialize()::<lambda(const JsonObject&, const std::string&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> /usr/include/c++/13/bits/invoke.h:61 #19 0x4262e91 in __invoke_r<void, DynamicDataLoader::initialize()::<lambda(const JsonObject&, const std::string&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&> /usr/include/c++/13/bits/invoke.h:111 #20 0x4262e91 in _M_invoke /usr/include/c++/13/bits/std_function.h:290 #21 0x4290ce9 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const /usr/include/c++/13/bits/std_function.h:591 #22 0x42693bf in operator() src/init.cpp:227 #23 0x42693bf in __invoke_impl<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:61 #24 0x42693bf in __invoke_r<void, DynamicDataLoader::add(const std::string&, const std::function<void(const JsonObject&, const std::__cxx11::basic_string<char>&)>&)::<lambda(const JsonObject&, const std::string&, const cata_path&, const cata_path&)>&, const JsonObject&, const std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, const cata_path&, const cata_path&> /usr/include/c++/13/bits/invoke.h:111 #25 0x42693bf in _M_invoke /usr/include/c++/13/bits/std_function.h:290 #26 0x4290563 in std::function<void (JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&)>::operator()(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) const /usr/include/c++/13/bits/std_function.h:591 #27 0x42849b9 in DynamicDataLoader::load_object(JsonObject const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, cata_path const&, cata_path const&) src/init.cpp:137 #28 0x4285ca2 in DynamicDataLoader::load_all_from_json(JsonValue const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&, cata_path const&, cata_path const&) src/init.cpp:540 #29 0x42867b4 in DynamicDataLoader::load_data_from_path(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/init.cpp:521 #30 0x3ca266a in game::load_data_from_dir(cata_path const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, loading_ui&) src/game.cpp:571 #31 0x3d211a0 in game::load_packs(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<string_id<MOD_INFORMATION>, std::allocator<string_id<MOD_INFORMATION> > > const&, loading_ui&) src/game.cpp:3265 #32 0x3d51925 in game::load_world_modfiles(loading_ui&) src/game.cpp:3235 #33 0x3e05640 in game::setup() src/game.cpp:756 #34 0x5111d33 in main_menu::new_character_tab() src/main_menu.cpp:972 #35 0x5127b5a in main_menu::opening_screen() src/main_menu.cpp:863 CleverRaven#36 0x50f1ece in main src/main.cpp:792 CleverRaven#37 0x7fdc43fa9b89 in __libc_start_call_main (/lib64/libc.so.6+0x27b89) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) CleverRaven#38 0x7fdc43fa9c4a in __libc_start_main_alias_2 (/lib64/libc.so.6+0x27c4a) (BuildId: f888be5f5e7d58e04cabb8c675c7ab94e77dd68c) CleverRaven#39 0x1bec874 in _start (/home/cdda/git/Cataclysm-DDA/cataclysm-tiles+0x1bec874) (BuildId: be24990d1723c8da00f3e8701793ab983cf64dcc) ```

tjlaxs and others added 30 commits November 16, 2023 21:10

Adding multiple addictions to some alcohol drinks

9114c42

[Innawood]Adding batchsavings for the production of glasshards

6ecc316

Merge pull request #69445 from mqrause/gg_ignore_blacklisted

cbd46f3

[GG] don't check blacklisted items for migration

[MoM] Add two light-creating powers (#69355)

fe28a0b

* Initial commit * Candle's Glow canceled by combat * Add min to math to constrain powers * Increase length of top-level field of light fields

Initial commit

68c859d

Add the new code, delete the old

de3b49f

Merge pull request #69462 from MNG-cataclysm/afs_crashing_ship_fix

e62850b

[Aftershock: Exoplanet] Revamp the Emergency Evacuation scenario to EOC-based workings.

ci: linter ignores drafts

b748a1f

ignore drafts, when they are ready for review give the suggestion also remove some plurals from the auto labeler, makes it match more things, that's good btw

Added Artichoke fruit dessert fun value in fruit_dishes.json (#69471)

9f55f05

Fix spell used to calculate Enhance Strength upkeep

e05ace0

[EoC] Some monster and map related update (#69405)

725161a

* monster eoc * update * test * passable_only

Remove redundant FMS entry.

06a8c42

Merge pull request #69454 from tjlaxs/multiple_addicting_substances

07205b4

Adding multiple addictions to some alcohol drinks

supress an uninitialized variable warning

391325d

Merge pull request #69485 from CleverRaven/kevingranade-patch-3

a4463af

supress an uninitialized variable warning

Merge pull request #69475 from Maddremor/remove-FMS-pockets

56f4059

Remove redundant FMS entry.

Add the fix

ed3fa92

Merge pull request #69469 from casswedson/ignore-drafts

8ab1549

ci: linter ignores drafts

Make Aftershock and Aftershock: Exoplanet compatible with Defense Mode (

23e1afb

#69486) * Add the compatibility * Spellchecker and a minor fix

Fully math-ify Defense Mode (#69480)

346b29b

* Add the main mathification * Premonition update

[Aftershock: Exoplanet] Allow escape pods to carry loot planetside (#…

6051a28

…69477) * Add the code * Update message

Merge pull request #69446 from MNG-cataclysm/clairification_fix

2a0e918

Fix Rubik's warehouse clairification

Glooscap is Wabanaki (#69484)

73a3f18

* Wabenaki fix * spelling fixes

Chainmail update arms and legs, in reference to #69251 (#69461)

12e0b86

* Infrastructure "continuation of chainmail refactoring, arms and legs" * Update arms_armor.json made a mistake and forgot to put the coverage as it was. fixed * Fix arms JSON

Exodii Rifle and Magazine Description Change (#69470)

9f3852a

* Update exodii.json * Update exodii.json

[MoM] Add mi-go psions (#69463)

23b2acf

* Initial commit * Add other monsters * Fixes * Increase juggernaut armor piercing * Fixes * Add stun-immune to juggernaut * Fixes

Maleclypse and others added 27 commits November 25, 2023 15:47

Merge pull request #69744 from GuardianDll/xedra_postfix

bdaa430

[Xedra Evolved] Who will fix the bugfixes

Update coats.json

e0050f1

Update SOUNDPACKS.md

a6eb9d5

Merge pull request #69759 from gettingusedto/soundpack-doc-update

2622f3e

Update soundpack doc

Added triffid weakpoints and weakpoint proficiencies (#69764)

f382961

* Added triffid weakpoints and weakpoint proficiencies * spelling

Merge pull request #69755 from gettingusedto/varsity-jacket-variant-fix

e504afd

Fix pink-white varsity jacket variant id

Changes

db052b4

Initial commit

611b0ad

[Xedra] Remove obsolete Dimension Research Reference

840ca26

Merge pull request #69786 from b3brodie/xedra_dimesnion

db3054e

[Xedra] Remove Obsolete Dimension Research Reference

follows -> following

7e569d4

move item_pocket::pocket_type to it's own header

bd21196

add em

deb3f26

Merge pull request #69793 from gettingusedto/npc-doc-fix

76d5238

fix a typo in NPC doc

Merge pull request #69794 from mqrause/extract_pocket_type

74b35d9

Move the `pocket_type` enum to it's own header

Merge pull request #69775 from Standing-Storm/rabbi-change

326d760

Edit rabbi description + specify holy symbol variant

10mm BBTI data, JHP, +P loads (#69791)

018b007

* 10mm stuff * Update gg_ammo_migration.json * Update 10mm.json * Update pistol.json

Merge pull request #69798 from KeremBabaG/spawns

338a0dd

add spawns to some items that need it

Merge pull request #69777 from Standing-Storm/voltaic-touch-weld

f0e64db

[Magiclysm] Fix missing standard for Voltaic Touch

I-am-Erk merged commit 2671f84 into I-am-Erk:master Nov 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge master #31

merge master #31

I-am-Erk commented Nov 28, 2023

github-actions bot commented Nov 28, 2023

merge master #31

merge master #31

Conversation

I-am-Erk commented Nov 28, 2023

github-actions bot commented Nov 28, 2023