Skip to content
Permalink
Branch: master
Commits on Jul 15, 2019
  1. Set category of vehicle freezer / fridge

    BevapDin authored and kevingranade committed Jul 15, 2019
    No category was set, so it was classified as weapon, which makes little sense as their usage is primarily that of a vehicle part.
  2. Merge pull request #32407 from BevapDin/usc

    ZhilkinSerg committed Jul 15, 2019
    Replace usage of std::string::compare with operator==
  3. Updated martial arts valid_weapon check (#32363)

    ZhilkinSerg committed Jul 15, 2019
    * Updated martial arts valid_weapon check
    
    * Astyle fix
  4. Remove legacy loading functions for ancient overmap file format. (#32395

    kevingranade authored and ZhilkinSerg committed Jul 15, 2019
    )
  5. Fix coordinate handling re submaps_with_active_items (#32376)

    kevingranade authored and ZhilkinSerg committed Jul 15, 2019
    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.
  6. Merge pull request #32394 from kevingranade/fix-enc-on-load

    ZhilkinSerg committed Jul 15, 2019
    Recalculate player and NPC encumbrance at load time
  7. Replace usage of std::string::compare with operator==

    BevapDin committed Jul 15, 2019
    To make the clang-tidy happy.
  8. Close file handle (#32404)

    AMurkin authored and BevapDin committed Jul 15, 2019
  9. Merge pull request #32297 from rtizzy/comcheckplayer

    Rivet-the-Zombie committed Jul 15, 2019
    Fix oversights for checking vision on various computerized equipment
  10. Update and simplify scenarios, attempt 2 (#31661)

    Rail-Runner authored and kevingranade committed Jul 15, 2019
    Update and simplify scenarios, attempt 2
  11. Merge pull request #32392 from AMurkin/fix-crash-trade-neg-string

    kevingranade committed Jul 15, 2019
    Fix crash while trading items with health bars
  12. Merge pull request #32390 from AMurkin/init-units-with-wrapper

    kevingranade committed Jul 15, 2019
    Define some mass and volume units using literals
  13. Fix black gunpowder bomb crafting recipe.

    NeviNovat authored and kevingranade committed Jul 14, 2019
  14. Translate wind directions.

    BevapDin authored and kevingranade committed Jul 14, 2019
  15. Merge pull request #32358 from BevapDin/afp

    kevingranade committed Jul 15, 2019
    Fix corrupting saves upon crash during saving
  16. Merge pull request #32141 from ymber/battery

    kevingranade committed Jul 15, 2019
    Implement battery item type
  17. Update hardcoded effects (#31867)

    deadcutlass2 authored and kevingranade committed Jul 15, 2019
  18. Make surgery a player_activity (#31763)

    Fris0uman authored and kevingranade committed Jul 15, 2019
    * 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
Commits on Jul 14, 2019
  1. don't rate limit checking whether there's an enemy nearby

    l29ah authored and kevingranade committed Jul 9, 2019
    fixes #32098
  2. Use thousands-sep

    AMurkin committed Jul 14, 2019
  3. Recalculate player and NPC encumbrance at load time

    kevingranade committed Jul 14, 2019
  4. Fix title and window width calculation

    AMurkin committed Jul 14, 2019
    Prevent the creation of a string with a negative number of characters.
    Get the length of the title without color tags.
  5. mass and volume using literals

    AMurkin committed Jul 14, 2019
  6. Magiclysm - added a druid spell to purify water (#32305)

    b0urgeoisie authored and KorGgenT committed Jul 14, 2019
    * 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
  7. Magiclysm Wands (#32158)

    foulman authored and KorGgenT committed Jul 14, 2019
    * 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
  8. Astyle fix

    Hymore246 committed Jul 14, 2019
  9. bullet pouch (#32256)

    bandti45 authored and ZhilkinSerg committed Jul 14, 2019
  10. Dragon skin vest update (#32317)

    glenmack authored and ZhilkinSerg committed Jul 14, 2019
  11. Merge pull request #32292 from aoae23/patch-11

    Rivet-the-Zombie committed Jul 14, 2019
    Changes basins to metal and allows them to heat up food
  12. Fior Di Battaglia requires weapon to activate (#32357)

    LaVeyanFiend authored and kevingranade committed Jul 14, 2019
    * Fior Di Battaglia requires weapon
    * Techniques now display armed req.
  13. fix typos in effects.json (#32377)

    b0urgeoisie authored and KorGgenT committed Jul 14, 2019
  14. Adds more mi-go to spawn in their camp (#32073)

    I-am-Erk authored and kevingranade committed Jul 14, 2019
    * 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.
  15. Update data/mods/Aftershock/items/afs__items.json

    aoae23 and ZhilkinSerg committed Jul 14, 2019
    Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
  16. Add Discord link to MOTD (#32372)

    kevingranade committed Jul 14, 2019
Commits on Jul 13, 2019
  1. Overhauls and adds missing CBM descriptions (#32335)

    81Denton authored and ZhilkinSerg committed Jul 13, 2019
    * CBM description overhaul
    
    * Applies Fris0uman's suggestions
    
    * Nanobot desc
Older
You can’t perform that action at this time.