Razharas 8f86ebbd41 Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker

2014-01-23 01:20:46 +04:00

..

admin

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

2014-01-20 19:29:47 +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

Added anonus' rainbow ghost icons.

2013-12-05 18:34:24 +00:00

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

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

2014-01-22 10:11:00 +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 dalawisfluid

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

mob

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

2014-01-22 20:01:11 +00: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 SayYiffYiffIfYouAreMachineFucker

2014-01-22 10:11:00 +04:00

projectiles

Merge pull request #2391 from ManeaterMildred/MechUpdate

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

reagents

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

2014-01-22 10:11:00 +04:00

recycling

Fixes a bug.

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

research

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

2014-01-20 05:15:05 +04:00

scripting

NTSL, parrots, and ID consoles hate apostrophes less.

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

security levels

…

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

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

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

telesci

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

2014-01-22 10:11:00 +04:00