fluffe9911 b693bd6323 Merge branch 'master' into upstream-merge-43966

2019-06-11 17:50:47 -04:00

..

ammunition

HoS gun ion mode replaces taser mode

2019-06-11 15:35:20 +01:00

boxes_magazines

[MIRROR] Makes the .45 magazine actually update per round. (#5021)

2019-04-02 14:46:17 -05:00

guns

HoS gun ion mode replaces taser mode

2019-06-11 15:35:20 +01:00

projectile

Merge branch 'master' into upstream-merge-43966

2019-06-11 17:50:47 -04:00

gun.dm

ok

2019-06-08 13:49:02 -04:00

pins.dm

REGEX REPLACE! /([\w\.]+)\.has_trait\(/ -> /HAS_TRAIT(\1, /

2019-06-01 20:55:36 -05:00

projectile.dm

[MIRROR] Remove reagent ids and use typepaths where applicable (#5612)

2019-06-10 07:26:31 -05:00