Rolan7 7decfe8621 Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm

2014-06-21 09:00:21 -04:00

..

admin

Merge pull request #3934 from Ikarrus/jobequip

2014-06-21 00:47:30 -05:00

assembly

Merge pull request #3906 from Malkevin/sparklesparkle

2014-06-13 09:16:30 +01:00

awaymissions

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

client

Encapsulates if() statement

2014-06-20 06:52:58 -04:00

clothing

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

detectivework

Merge pull request #3572 from Aranclanos/evidencebags

2014-05-02 17:46:04 +01:00

events

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

flufftext

…

food

Merge pull request #3718 from hornygranny/cheeseallthewaydown

2014-05-31 13:56:03 +02:00

hydroponics

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

2014-06-21 09:00:21 -04:00

library

carved books now turn into storage items

2014-05-16 14:30:04 -07:00

mining

One big update for stacks.

2014-06-10 20:36:08 +04:00

mob

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

2014-06-21 09:00:21 -04:00

nano

…

paperwork

Fixed indentations.

2014-05-14 09:02:53 -06:00

power

Merge pull request #3790 from Miauw62/bestiality

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

projectiles

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

reagents

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

recycling

The Loggening: Admin Edition

2014-06-02 23:13:33 -06:00

research

One big update for stacks.

2014-06-10 20:36:08 +04:00

scripting

…

security levels

…

shuttle

…

surgery

Moved item_heal_robotic out of obj/item and into mob_helpers.dm

2014-06-05 19:25:08 -05:00

telesci

…