Cheridan 287a0147a4 Merge pull request #7744 from Cheridan/master ...

Manual Merge of #7005

2015-02-14 22:48:40 -06:00

..

admin

Update diagnostics.dm

2015-02-13 17:30:52 +00:00

assembly

…

awaymissions

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

client

adds a skeleton ghost for byond supporters

2015-02-01 22:58:55 -08:00

clothing

Revert "Adds a new toy to the arcade machine"

2015-02-13 17:13:56 +00:00

crafting

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

2015-02-11 16:13:04 +01:00

detectivework

…

emoji

…

events

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

flufftext

Adds a slurring filter, replaces stutter filter where appropriate

2015-02-10 16:39:17 -05:00

food&drinks

Merge pull request #7718 from TheVekter/shotglasseshowdotheywork

2015-02-14 18:33:00 -06:00

holiday

…

hydroponics

Merge pull request #7668 from dannno/suicidefix

2015-02-14 12:12:38 +01:00

library

…

mining

Drone Access get

2015-02-06 22:17:36 -06:00

mob

Merge pull request #7680 from Deantwo/ReadySpam

2015-02-14 22:21:06 -06:00

nano

…

paperwork

fixes a bunch of bugs

2015-02-08 13:27:55 +01:00

power

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

projectiles

Merge pull request #7710 from phil235/JitterFix

2015-02-14 16:23:18 -06:00

reagents

Merge branch 'chem_synth' of git://github.com/lolnon/-tg-station into lolnon-chem_synth

2015-02-14 22:42:42 -06:00

recycling

…

research

* Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search)

2015-02-13 22:33:58 +01:00

scripting

…

security levels

…

shuttle

…

surgery

…

telesci

…