LetterJay e8f581bb56 Merge branch 'master' into upstream-merge-31077

2017-09-29 12:46:25 -04:00

..

jetpack.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

tank_types.dm

Update tank_types.dm

2017-09-29 00:48:53 -05:00

tanks.dm

Air tanks get their own sprite, plus reset fix.

2017-09-27 15:45:41 -05:00

watertank.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00