Cheridan d042e2d183 Merge pull request #2754 from hornygranny/jetpack ...

Fixes #2720 jetpack storage assemblies

2014-02-13 12:01:05 -06: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 #2695 from Incoming5643/avastyeblobies

2014-02-13 11:33:34 +00:00

jobs

Revert "Merge pull request #2479 from KazeEspada/nukeops"

2014-02-11 14:44:38 -06:00

machinery

Merge pull request #2697 from Alek2ander/master

2014-02-13 03:45:22 -08:00

mecha

one word commit

2014-02-10 20:05:37 +13:00

objects

Merge pull request #2754 from hornygranny/jetpack

2014-02-13 12:01:05 -06:00

turfs

Removes slipping in space

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

verbs

OOC Color Default In Input

2014-01-07 01:04:45 -05:00

asteroid.dm

…

atoms_movable.dm

Fixes the disposal outlet runtiming. The removed code, which was causing the runtime, wasn't even doing anything and was just setting "throwing" to 2 for no reason.

2014-01-06 18:20:59 +00:00

atoms.dm

Removes slipping in space

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

communications.dm

Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum.

2013-12-31 16:50:17 +13:00

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