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

Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts

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

..

admin

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

2014-01-30 19:14:43 +00:00

assembly

Obsoletes flags = FPRINT | TABLEPASS*

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

awaymissions

Merge fix. Updated to MetaStation.v39B.II.dmm

2014-01-21 21:57:10 +00:00

client

Ported the MiniStation branch.

2014-01-29 22:36:10 +00:00

clothing

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

2014-01-20 19:29:47 +00:00

detectivework

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

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

events

Removed the icon color blend operations from human's update_icons().

2014-01-16 14:33:50 +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

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

library

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06: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 CraftingTable

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

nano

NanoUI Update

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

paperwork

Obsoletes flags = FPRINT | TABLEPASS*

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

power

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

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

projectiles

Merge pull request #2504 from RobRichards1997/25/01/2014-Magicks-bad

2014-01-30 10:43:13 -08:00

reagents

Removes unused vars from /obj/item

2014-01-29 17:19:20 +00:00

recycling

Hostile mobs with environment smash enabled will break out of containers/disposals/sleepers

2014-01-23 23:57:36 -08:00

research

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

scripting

…

security levels

…

shuttle

…

surgery

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

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

telesci

Logs everywhere

2014-01-19 21:16:30 +04:00