Branch: master
-
Set category of vehicle freezer / fridge
No category was set, so it was classified as weapon, which makes little sense as their usage is primarily that of a vehicle part.
-
Merge pull request #32407 from BevapDin/usc
Replace usage of std::string::compare with operator==
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Updated martial arts valid_weapon check (#32363)
* Updated martial arts valid_weapon check * Astyle fix
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Fix coordinate handling re submaps_with_active_items (#32376)
This was using abs_sub inapropriately to convert between absolute and local coordinates. Only x and y coordinates need conversion, z does not. Also map::get_active_items_in_radius() was failing to convert entirely.
-
Merge pull request #32394 from kevingranade/fix-enc-on-load
Recalculate player and NPC encumbrance at load time
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Replace usage of std::string::compare with operator==
To make the clang-tidy happy.
-
-
Merge pull request #32297 from rtizzy/comcheckplayer
Fix oversights for checking vision on various computerized equipment
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Update and simplify scenarios, attempt 2 (#31661)
Update and simplify scenarios, attempt 2
-
Merge pull request #32392 from AMurkin/fix-crash-trade-neg-string
Fix crash while trading items with health bars
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #32390 from AMurkin/init-units-with-wrapper
Define some mass and volume units using literals
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
-
Merge pull request #32358 from BevapDin/afp
Fix corrupting saves upon crash during saving
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Merge pull request #32141 from ymber/battery
Implement battery item type
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
Make surgery a player_activity (#31763)
* under_operation effect * under_operation_do_turn * under operation effect * ACT_OPERATION_REMOVE * moves uninstal_bionic to activity * player under narcosis effect don't feel pain * Make the activity work for NPC * move power modification to activity * no message if u can't see * no narcosis for characters that feel no pain * uses pl_skill and recalculate adjusted_skill within the activity, remove float from player_activity * damage is body part specific * bodypart specific messages * Aborted eye operation makes blind for 1 hour * bleedinbg propotional to surgery difficulty * Damage only happens if the activity is canceled instead of happening live during the surgery * removal failure/success happens mid surgery * not being on autodoc couch cancel operation * destroying autodoc cancel activity * NPc under operation don't fight monsters * can't be dragged from autodoc * If autodoc disappear during operation patient takes difficulty*20 damage * no pain under narcosis
-
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
-
Fix title and window width calculation
Prevent the creation of a string with a negative number of characters. Get the length of the title without color tags.
Verified
This commit was signed with a verified signature.AMurkin Alexey Mostovoy
GPG key ID: 4D0D1178B8C0635E Learn about signing commits -
Verified
This commit was signed with a verified signature.AMurkin Alexey Mostovoy
GPG key ID: 4D0D1178B8C0635E Learn about signing commits -
Magiclysm - added a druid spell to purify water (#32305)
* added purification seed * Update druid.json * lint itemgroups/spellbooks.json * lint comestibles.json * Update druid.json * change workings of seed item, adjust costs/duration/casting time
-
* Enchanted - Wands and stuff Wands, tools, unarmed weapons. * Update enchanted_tools.json * Moved obsolete wands Obsoleted fireball and magic missile wands moved to obsolete.json file. * Fixes Filled in proper descriptive text and corrected assorted grammar issues. * Delete enchanted_tools.json * Create itemgroups.json * magic wands abstracted * prices updated * wand bugfix check the no_mana bool before checking spell::can_cast() which calls a debugmsg if you use a wand for it; and so it doesn't display a "you don't have enough %s to cast" message in the log
-
-
-
-
Merge pull request #32292 from aoae23/patch-11
Changes basins to metal and allows them to heat up food
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Fior Di Battaglia requires weapon to activate (#32357)
* Fior Di Battaglia requires weapon * Techniques now display armed req.
-
-
Adds more mi-go to spawn in their camp (#32073)
* remove mi-go from monsters.json * Create basic files for mi-go * add mi go slaver beam as a "spell" Remove mi-go from normal nether spawns. Still spaws with captured nether creatures. Adds mi-go spawn groups for base.
-
Update data/mods/Aftershock/items/afs__items.json
Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits -
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
-
Overhauls and adds missing CBM descriptions (#32335)
* CBM description overhaul * Applies Fris0uman's suggestions * Nanobot desc