Jordie0608 6140a61de7 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/food&drinks/food/snacks_pastry.dm

2015-01-21 20:25:45 +11:00

..

admin

Merge pull request #7173 from Carn/#6971

2015-01-21 05:06:25 -03:00

assembly

Makes assembly parts work with wires

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

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

Adds chemical heater nanoUI & construction/upgrade

2015-01-14 22:41:53 -03:00

clothing

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

crafting

…

detectivework

…

emoji

…

events

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

flufftext

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

food&drinks

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

2015-01-21 20:25:45 +11:00

holiday

…

hydroponics

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08: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

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

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

mob

Merge pull request #7202 from Iamgoofball/goonetics

2015-01-20 23:18:11 -06:00

nano

SubSystem rewrite

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

paperwork

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

power

And other readibility improvement

2015-01-16 04:31:02 +03:00

projectiles

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

reagents

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

2015-01-21 16:54:40 +11:00

recycling

* Prevent stacking of dense disposal constructs (bin, outlet, chute)

2015-01-15 20:05:15 +01:00

research

Merge pull request #7199 from sawu-tg/expruntime

2015-01-20 23:06:11 -06: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

Resolves #6953 - Shuttle transparent corners now inherit a snapshot of the turf they replace. Note: don't use them for interiors! Only external corners!.

2015-01-11 18:42:58 +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