Pete Goodfellow 9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm

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

..

admin

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

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

assembly

…

awaymissions

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

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

client

…

clothing

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

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

detectivework

Merge pull request #2283 from YotaXP/list2text-refactor

2014-01-11 10:11:13 -08: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

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05:00

library

…

mining

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

2014-01-17 17:51:37 +01:00

mob

Merge pull request #2449 from Razharas/SlimesAndWindows

2014-01-20 17:25:31 -08:00

nano

NanoUI Update

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

paperwork

…

power

Merge pull request #2440 from Petethegoat/suicideformat

2014-01-20 11:11:23 -08:00

projectiles

Merge pull request #2391 from ManeaterMildred/MechUpdate

2014-01-17 10:02:39 -08:00

reagents

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05:00

recycling

Fixes a bug.

2014-01-16 14:52:20 +00:00

research

Merge pull request #2375 from Giacom/remove_icon_operations_from_premises

2014-01-19 16:06:25 -08:00

scripting

…

security levels

…

shuttle

…

surgery

Updated all suicide_act()s to use a new span class, 'suicide'.

2014-01-19 16:46:37 +00:00

telesci

Logs everywhere

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