timothyteakettle 61c338ca8c Merge branch 'embed-changes' of https://github.com/timothyteakettle/Citadel-Station-13 into embed-changes

2020-06-15 23:50:35 +01:00

..

ammunition

Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

boxes_magazines

fixes the merge conflicts

2020-06-15 23:29:49 +01:00

guns

Merge pull request #11627 from kevinz000/combat_rework

2020-06-12 16:39:11 -05:00

projectile

Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

gun.dm

More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)

2020-06-02 15:22:06 -07:00

pins.dm

Porting the BEPIS research machinery. (#12277)

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

projectile.dm

please work

2020-06-15 23:49:38 +01:00