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

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm

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

..

admin

Update diagnostics.dm

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

assembly

Makes assembly parts work with wires

2015-01-17 18:08:55 +01:00

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

some updates

2015-01-23 21:00:09 -08:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

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

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Merge pull request #7668 from dannno/suicidefix

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

library

Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.

2015-01-14 14:04:21 +01:00

mining

Drone Access get

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

mob

Merge pull request #7710 from phil235/JitterFix

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

nano

SubSystem rewrite

2014-12-31 13:25:41 +00:00

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

* Cleaned the disposals code a bit (making it uses the defines !)

2015-01-19 01:53:19 +01:00

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

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

security levels

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

shuttle

Improves shuttle corner fix to use actual appearance data of the turf, so it takes transform into consideration.

2015-01-19 18:48:52 +00:00

surgery

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

telesci

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00