kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

jetpack.dm

Conveyor movement refactor/fix

2017-04-21 17:28:09 -05:00

tank_types.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

tanks.dm

Tank suicide no longer gibs w/o enough pressure

2017-04-28 20:59:39 -05:00

watertank.dm

Removes a unused chem (#576)

2017-04-26 11:09:00 -05:00