paprka 045b564cdf Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart ...

Conflicts:
	code/game/objects/structures/janicart.dm

2015-01-20 20:50:01 -08:00

..

admin

Merge pull request #7105 from Carn/#6993

2015-01-19 20:17:14 -03:00

assembly

Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.

2015-01-14 18:00:17 +01:00

awaymissions

…

client

Adds chemical heater nanoUI & construction/upgrade

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

clothing

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

2015-01-20 20:50:01 -08:00

crafting

…

detectivework

…

emoji

…

events

Merge pull request #7049 from RemieRichards/PipesAndBuckles

2015-01-20 20:07:18 -06:00

flufftext

splits gun.dmi up into multiple files

2015-01-17 15:34:30 -08:00

food&drinks

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08: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 #7049 from RemieRichards/PipesAndBuckles

2015-01-20 20:07:18 -06:00

nano

…

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

Merge pull request #7145 from paprka/gunsicons

2015-01-20 17:56:41 +01:00

reagents

Merge pull request #7145 from paprka/gunsicons

2015-01-20 17:56:41 +01:00

recycling

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

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

research

Merge pull request #7137 from tkdrg/heatertweak

2015-01-18 11:23:07 +01: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

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

…

telesci

…