skull132 ec91c89887 Merge branch 'master' into development

2017-01-24 16:37:24 -05:00

..

ammunition

Baymerge master fixes and additions (#1455)

2017-01-08 12:03:08 +02:00

guns

Merge branch 'master' into development

2017-01-21 14:56:17 -05:00

projectile

Plenty'o'fixes (#1478)

2017-01-09 01:04:36 +02:00

targeting

Tray, paper bin and bottle fixes (#1631)

2017-01-23 23:41:33 +02:00

ammunition.dm

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

effects.dm

Shells and Periphery (#1327)

2016-12-28 02:23:26 +02:00

gun.dm

Fix heist not ending again with the transfer shuttle (#1633)

2017-01-24 20:28:17 +02:00

projectile.dm

Event tweaks, misc changes and fixes pack (#1588)

2017-01-20 19:23:04 +02:00