Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

effects

Improves Geis binding resist (#21846)

2016-12-02 12:56:31 +01:00

items

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

structures

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

buckling.dm

Improves Geis binding resist (#21846)

2016-12-02 12:56:31 +01:00

empulse.dm

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

explosion.dm

Merge pull request #21847 from ChangelingRain/debrisbutton

2016-11-30 16:59:10 -06:00

items.dm

oh, and this

2016-12-01 21:39:02 -08:00

obj_defense.dm

Fixes airlock security levels messing with their health (#21674)

2016-11-23 12:16:38 +13:00

objs.dm

VV refactor

2016-11-30 12:49:21 -08:00

radiation.dm

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00

structures.dm

Fixes #21240

2016-10-28 20:52:03 -04:00

weapons.dm

Remove slash from end of type refs/defs

2016-11-30 19:23:15 -08:00