wito/Cataclysm-RSR forked from CleverRaven/Cataclysm-DDA
Branch: master
-
Merge branch 'master' of github.com:wito/Cataclysm-RSR
wito committedFeb 1, 2016 -
wito committed
Feb 1, 2016 -
wito committed
Feb 1, 2016 -
P90/Five-seven magazine conversion
wito committedFeb 1, 2016
-
Merge remote-tracking branch 'upstream/master'
wito committedJan 31, 2016 -
Fix some dumb json merge errors.
kevingranade committedJan 31, 2016 -
Extend magazine consistency check to gunmods with magazines.
kevingranade committedJan 31, 2016 -
Move magazines and magazine_well entries to root of item entry.
kevingranade committedJan 31, 2016 -
Merge remote-tracking branch 'origin/pr/15007'
kevingranade committedJan 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.
-
Rivet-the-Zombie committed
Jan 31, 2016 -
Rivet-the-Zombie committed
Jan 31, 2016 -
Merge remote-tracking branches 'origin/pr/15074', 'origin/pr/15077', …
kevingranade committedJan 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
-
Merge CleverRaven#15051: JSON defaults regression test
narc0tiq committedJan 31, 2016 -
Merge pull request CleverRaven#15111 from chaosvolt/medieval-mod-seri…
Rivet-the-Zombie committedJan 31, 2016 …es-4-ish Medieval Stuff Mod Series 4-ish
-
Medieval Stuff Mod Series 4-ish
chaosvolt committedJan 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.
-
Merge pull request CleverRaven#15110 from chaosvolt/mshock-modded-til…
Rivet-the-Zombie committedJan 31, 2016 …eset-series-28 MShock Modded Tileset Series 28
-
Merge pull request CleverRaven#15109 from chaosvolt/cellar-spider-aggro
Rivet-the-Zombie committedJan 31, 2016 Adds "PLAYER_CLOSE" to giant cellar spider triggers
-
MShock Modded Tileset Series 28
chaosvolt committedJan 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
-
Adds "PLAYER_CLOSE" to giant cellar spider triggers
chaosvolt committedJan 31, 2016 * Makes giant cellar spiders react to a player lingering near them for too long.
-
Merge pull request CleverRaven#14484 from RadaRadaRada/desc
Rivet-the-Zombie committedJan 31, 2016 More decriptive descriptions for PRED1-4 mutations
-
Merge pull request CleverRaven#15050 from DeadLeaves/neoprene
Rivet-the-Zombie committedJan 31, 2016 [RDY]Neoprene expansion
-
Merge pull request CleverRaven#15076 from macrosblackd/bite-moderniza…
Rivet-the-Zombie committedJan 31, 2016 …tion [RDY] Bring bite inline with melee attack logic
-
Merge pull request CleverRaven#15041 from Darkyhard/metal_construction
Rivet-the-Zombie committedJan 31, 2016 Add more metal constructions
-
Merge pull request CleverRaven#15071 from BevapDin/lsb
Rivet-the-Zombie committedJan 31, 2016 Fix messages in player::perform_special_attacks:
-
Merge remote-tracking branch 'origin/pr/15072'
kevingranade committedJan 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 ...
-
fixed typo, changed material and remvoed useless line.
DeadLeaves committedJan 30, 2016 -
Merge pull request CleverRaven#15085 from chaosvolt/moar-mutants
Rivet-the-Zombie committedJan 30, 2016 Mutant wildlife expansions: Spiders and snakes
-
Merge pull request CleverRaven#14959 from chaosvolt/shields-take-2
Rivet-the-Zombie committedJan 30, 2016 Shield foundation part 1: RESTRICT_HANDS
-
Merge pull request CleverRaven#15055 from chaosvolt/shields-part-3
Rivet-the-Zombie committedJan 30, 2016 Shield Foundation Part 3: Bringing it all together
-
Merge pull request CleverRaven#15075 from chaosvolt/mod-bitening
Rivet-the-Zombie committedJan 30, 2016 Arcana mod bite format fix
-
chaosvolt committed
Jan 30, 2016 -
Merge pull request CleverRaven#15083 from mugling/scale_holster
Rivet-the-Zombie committedJan 30, 2016 Reduce skill bonuses for holsters [RDY]
-
Set M60 and M240 to use ammo belts
mugling committedJan 30, 2016 -
Merge pull request CleverRaven#15106 from mugling/obsolete
Rivet-the-Zombie committedJan 30, 2016 Move obsolete sawn-down weapons to obsolete.json
-
Move obsolete sawn-down weapons to obsolete.json
mugling committedJan 30, 2016