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

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

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

..

ammunition

Remove slash from end of type refs/defs

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

boxes_magazines

Merge pull request #21818 from Thunder12345/tankplsgo

2016-11-30 18:13:47 +04:00

guns

Merge branch 'master' into w_class

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

projectile

Remove slash from end of type refs/defs

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

ammunition.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

box_magazine.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

firing.dm

Make energy guns able to use burst fire. (#21005)

2016-11-02 16:16:21 +13:00

gun.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

pins.dm

w_class now uses defines

2016-12-01 21:33:14 -08:00

projectile.dm

Adds more golem types, adds golem shell creation with adamantine slimes (#21708)

2016-11-28 18:34:08 +13:00