MrSnapwalk 00fd755b8c Automerge Fix 2: Electric Boogaloo ...

This is why we can't have nice things.

2014-03-03 20:12:30 -06:00

..

area

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

2014-02-25 17:38:24 -08:00

gamemodes

Merge pull request #2936 from MrPerson/jitterbug_dizzydummies

2014-03-03 11:35:27 -06:00

jobs

Automerge Fix 2: Electric Boogaloo

2014-03-03 20:12:30 -06:00

machinery

Removed autodrobe fix

2014-03-02 17:15:25 -08:00

mecha

Merge pull request #2936 from MrPerson/jitterbug_dizzydummies

2014-03-03 11:35:27 -06:00

objects

Automerge Fix 2: Electric Boogaloo

2014-03-03 20:12:30 -06:00

turfs

Quick fix for tables, lockers and general drop_item

2014-02-21 05:15:40 +04:00

verbs

…

asteroid.dm

Asteroid/Mining tweaks:

2014-02-25 06:03:17 -08:00

atoms_movable.dm

second pass

2014-02-15 20:11:12 -08:00

atoms.dm

Removes slipping in space

2014-02-08 16:38:21 +13:00

communications.dm

…

dna.dm

DNA and R&D console runtimes fix

2014-02-21 17:37:14 +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