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

2014-04-02 17:11:52 +01:00

..

area

Added electrical maint area

2014-03-31 23:07:53 -06:00

gamemodes

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

2014-03-29 16:59:14 +00:00

jobs

Merge pull request #3184 from Donkie/bibleupdate

2014-03-29 06:15:20 -07:00

machinery

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

2014-04-02 17:11:52 +01:00

mecha

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

objects

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

2014-04-02 17:11:52 +01:00

turfs

Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.

2014-03-28 06:32:47 -03:00

verbs

…

asteroid.dm

Merge conflicts fix

2014-03-03 05:42:31 +04:00

atoms_movable.dm

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

atoms.dm

Merge branch 'qdel-with-datums'

2014-03-27 21:46:53 -04:00

communications.dm

Reflects the color change for AI Private

2014-04-01 20:50:11 -05:00

dna.dm

Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.

2014-03-28 06:32:47 -03:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00