Lo6a4evskiy 2eeaec6168 Merge remote-tracking branch 'upstream/master' into Food_cart ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-01-22 12:55:01 +04: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

…

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

-capitalizes Ephedrine in sleepers

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

detectivework

…

emoji

…

events

Merge pull request #7006 from Incoming5643/hot_wiz_on_wiz

2015-01-21 15:34:25 -03: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 remote-tracking branch 'upstream/master' into Food_cart

2015-01-22 12:55:01 +04: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 #7230 from paprka/painigga

2015-01-21 19:51:19 -06:00

nano

…

paperwork

Paper Name Limit

2015-01-21 13:13:13 +01: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 remote-tracking branch 'upstream/master' into Food_cart

2015-01-22 12:55:01 +04: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

…

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

…

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