Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168) ...

* fixes #15649
fixes #16575

* oops forgot those lines

2016-06-03 14:46:42 -05:00

..

automatic.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

launchers.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

pistol.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

rechargable_magazine.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

revolver.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

saw.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

shotgun.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

sniper.dm

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

toy.dm

Refactored the item's action system. Items can now hold multiple actions.

2016-02-23 19:37:42 +01:00