Incoming 458e955366 Merge branch 'master' of https://github.com/tgstation/-tg-station into blobjob ...

Conflicts:
	code/modules/mob/transform_procs.dm

2014-02-12 21:37:59 -05:00

..

admin

Nano UI for SMES

2014-02-05 16:32:07 -08:00

assembly

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

awaymissions

Merge pull request #2569 from Tenebrosity/box2550Away-update

2014-02-03 23:34:45 -08:00

client

Nano UI for SMES

2014-02-05 16:32:07 -08:00

clothing

Merge pull request #2649 from YotaXP/lighting-squared

2014-02-08 04:13:57 -08:00

detectivework

You can now properly clean your hands of blood. Fixes #2258.

2014-01-22 17:42:36 +00:00

events

Merge pull request #2656 from Razharas/AnomalyRuntime

2014-02-11 16:51:41 +00:00

flufftext

Merge pull request #2283 from YotaXP/list2text-refactor

2014-01-11 10:11:13 -08:00

food

Added spider meat recipes

2014-01-10 21:04:34 +00:00

hydroponics

Merge pull request #2682 from Razharas/BiogenFix

2014-02-09 22:13:36 -06:00

library

Added book bags. The librarian now spawns holding one.

2014-02-02 04:46:34 -03:00

mining

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

2014-01-31 05:20:59 +04:00

mob

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

2014-02-12 21:37:59 -05:00

nano

NanoUI Update

2014-01-09 01:02:13 +00:00

paperwork

Many changes

2014-02-04 22:49:38 -08:00

power

Turbine fix

2014-02-10 20:21:03 +04:00

projectiles

Merge pull request #2653 from Incoming5643/syndiborgchance

2014-02-08 04:15:46 -08:00

reagents

Merge pull request #2713 from Tenebrosity/the-lit-the-lit-the-lit-the-lit-the-lit

2014-02-12 15:17:17 -08:00

recycling

Many changes

2014-02-04 22:49:38 -08:00

research

SMES board fix

2014-02-07 16:39:06 +04:00

scripting

NTSL, parrots, and ID consoles hate apostrophes less.

2013-11-30 14:33:02 -05:00

security levels

Communications Console Update

2013-10-15 22:42:20 -06:00

shuttle

* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.

2013-12-20 22:09:06 +00:00

surgery

Many changes

2014-02-04 22:49:38 -08:00

telesci

And more fixes

2014-02-06 22:32:28 +04:00