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

Conflicts:
	code/modules/mob/mob.dm

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

..

area

Gives a gravity generator to MiniStation.

2014-03-21 21:57:57 +00: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 pull request #3188 from Rockdtben/NewscasterCommandReports

2014-03-29 06:20:10 -07: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/tgstation/-tg-station into saccult

2014-03-29 16:59:14 +00: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

…

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