Skip to content
Permalink
Branch: master
Commits on Feb 1, 2016
  1. Mansion start

    wito committed Feb 1, 2016
  2. Eternal season weather tweak

    wito committed Feb 1, 2016
Commits on Jan 31, 2016
  1. Merge remote-tracking branch 'origin/pr/15007'

    kevingranade committed Jan 31, 2016
    * origin/pr/15007:
      Tweak.
      Tweak to noise value.
      Fun with default mods.
      Typo fix.
      Mag flagz.
      Derp.
      Removing default_mods.
      Professions and such.
      Assorted Rivtech guns.
      8x40mm magazine spawns.
      8x40mm updates.
  2. Tweak.

    Rivet-the-Zombie committed Jan 31, 2016
  3. Merge remote-tracking branches 'origin/pr/15074', 'origin/pr/15077', …

    kevingranade committed Jan 30, 2016
    …'origin/pr/15081' and 'origin/pr/15091'
    
    * origin/pr/15074:
      guns_with_ammo spawn with a magazine
      Derive default magazine from first specified magazine
    
    * origin/pr/15077:
      Display more information for magazines
    
    * origin/pr/15081:
      Convert also items on map
      Refactor conversion function as item::magazine_convert()
      Improve conversion of items with detachable magazines
      Convert legacy saves to use magazines
      Derive default magazine from first specified magazine
    
    * origin/pr/15091:
      Make horde zeds inherit horde's target on spawn
  4. Merge pull request CleverRaven#15111 from chaosvolt/medieval-mod-seri…

    Rivet-the-Zombie committed Jan 31, 2016
    …es-4-ish
    
    Medieval Stuff Mod Series 4-ish
  5. Medieval Stuff Mod Series 4-ish

    chaosvolt
    chaosvolt committed Jan 31, 2016
    * Proffessions added from the Dropbox'd version. Point costs assigned,
    but they might not be balanaced ideally.
    * Galea given reduced encumbrance, due to nasal helm being otherwise
    identical save for covering the eyes.
    * Coverage of nasal helm reduced, for the same reason above.
  6. Merge pull request CleverRaven#15110 from chaosvolt/mshock-modded-til…

    Rivet-the-Zombie committed Jan 31, 2016
    …eset-series-28
    
    MShock Modded Tileset Series 28
  7. Merge pull request CleverRaven#15109 from chaosvolt/cellar-spider-aggro

    Rivet-the-Zombie committed Jan 31, 2016
    Adds "PLAYER_CLOSE" to giant cellar spider triggers
  8. MShock Modded Tileset Series 28

    chaosvolt
    chaosvolt committed Jan 31, 2016
    Fixes:
    * Removed a leftover corner reference dot in one of the tiles in the
    32x32 version.
    
    Changes:
    * Gave raw hides/pelts a clearer border.
    * Made the borders for water cannons less overt.
    
    Sprite assignments:
    * Cellar spider egg sacks
    * simple metal walls
    * Simple metal floor
    * Metal door with peephole (open)
    
    Sprite additions:
    * Giant rattlesnakes
    * Metal door with peephole (closed)
    * Giant cellar spiders
  9. Adds "PLAYER_CLOSE" to giant cellar spider triggers

    chaosvolt
    chaosvolt committed Jan 31, 2016
    * Makes giant cellar spiders react to a player lingering near them for
    too long.
  10. Merge pull request CleverRaven#14484 from RadaRadaRada/desc

    Rivet-the-Zombie committed Jan 31, 2016
    More decriptive descriptions for PRED1-4 mutations
  11. Merge pull request CleverRaven#15050 from DeadLeaves/neoprene

    Rivet-the-Zombie committed Jan 31, 2016
    [RDY]Neoprene expansion
  12. Merge pull request CleverRaven#15076 from macrosblackd/bite-moderniza…

    Rivet-the-Zombie committed Jan 31, 2016
    …tion
    
    [RDY] Bring bite inline with melee attack logic
  13. Merge pull request CleverRaven#15041 from Darkyhard/metal_construction

    Rivet-the-Zombie committed Jan 31, 2016
    Add more metal constructions
  14. Merge pull request CleverRaven#15071 from BevapDin/lsb

    Rivet-the-Zombie committed Jan 31, 2016
    Fix messages in player::perform_special_attacks:
Commits on Jan 30, 2016
  1. Merge remote-tracking branch 'origin/pr/15072'

    kevingranade committed Jan 30, 2016
    * origin/pr/15072: (45 commits)
      Set M60 and M240 to use ammo belts
      Add magazines to thompson
      Add alternative to belt223 for 308 conversion
      Add MAG_DESTROY flag to ammo belts
      Rename JSON flags
      Add consistency check that insures all defined magazines are used and vice versa.
      Add disassembly recipes for ammo belts
      Add alternate mags for 9mm to thompson_drum
      Add missing ammo conversions
      Update tileset id's
      Rename STEN magazine
      Fix JSON errors
      Update 32 guns to use magazines
      Update 545x39 guns to use magazines
      Update 9x18mm guns to use magazines
      Update 3006 guns to use magazines
      Update 45 guns to use magazines
      Update 9mm guns to use magazines
      Update 223 guns to use magazines
      Update 32 ammo stack size to 60
      ...
  2. Merge pull request CleverRaven#15085 from chaosvolt/moar-mutants

    Rivet-the-Zombie committed Jan 30, 2016
    Mutant wildlife expansions: Spiders and snakes
  3. Merge pull request CleverRaven#14959 from chaosvolt/shields-take-2

    Rivet-the-Zombie committed Jan 30, 2016
    Shield foundation part 1: RESTRICT_HANDS
  4. Merge pull request CleverRaven#15055 from chaosvolt/shields-part-3

    Rivet-the-Zombie committed Jan 30, 2016
    Shield Foundation Part 3: Bringing it all together
  5. Merge pull request CleverRaven#15075 from chaosvolt/mod-bitening

    Rivet-the-Zombie committed Jan 30, 2016
    Arcana mod bite format fix
  6. Fixes copy-paste error

    chaosvolt committed Jan 30, 2016
  7. Merge pull request CleverRaven#15083 from mugling/scale_holster

    Rivet-the-Zombie committed Jan 30, 2016
    Reduce skill bonuses for holsters [RDY]
  8. Merge pull request CleverRaven#15106 from mugling/obsolete

    Rivet-the-Zombie committed Jan 30, 2016
    Move obsolete sawn-down weapons to obsolete.json
Older
You can’t perform that action at this time.