Incoming 698debad08 Cleans up the trash.dm

2014-02-13 10:35:02 -05:00

..

area

Merge branch 'master' of https://github.com/Giacom/-tg-station into 501

2014-01-15 18:32:55 +00:00

gamemodes

Merge pull request #2655 from MrPerson/NanoSMES

2014-02-08 10:59:27 -08:00

jobs

Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix

2014-02-09 16:39:50 +13:00

machinery

Merge pull request #2672 from QualityVan/master

2014-02-09 02:34:31 -08:00

mecha

Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix

2014-02-09 16:39:50 +13:00

objects

Cleans up the trash.dm

2014-02-13 10:35:02 -05:00

turfs

Merge pull request #2617 from Tenebrosity/thudfix

2014-02-07 12:35:44 -08:00

verbs

…

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Fixes #2603: Bodyfall thuds in cryo and cloning

2014-02-06 18:32:31 +13:00

communications.dm

…

dna.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Adds crlf default to .gitattributes for most text file types we use.

2014-02-04 15:14:39 +00:00