kevinz000 65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework

2020-05-29 19:13:22 -07:00

..

ammunition

adds a snowflakey-ish(??? maybe???) way to modify gun damage so we don't need more shot types for improvised shotguns (#12274)

2020-05-18 02:59:50 +02:00

boxes_magazines

For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)

2020-05-30 03:17:56 +02:00

guns

Merge remote-tracking branch 'citadel/master' into combat_rework

2020-05-29 19:13:22 -07:00

projectile

Merge pull request #12173 from kevinz000/projectiles_2

2020-05-24 21:21:41 +00:00

gun.dm

For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)

2020-05-30 03:17:56 +02:00

pins.dm

Porting the BEPIS research machinery. (#12277)

2020-05-24 13:05:15 -07:00

projectile.dm

fixes

2020-05-12 11:52:45 -07:00