Tigercat2000 625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit ...

Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm

2015-05-10 13:56:28 -07:00

..

admin

Lighting overhaul.

2015-05-10 12:03:27 -07:00

assembly

Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent

2015-04-29 15:31:21 -07:00

awaymissions

Removing all mutantrace crap except for slimepeople

2015-04-13 06:20:17 -04:00

client

Revert "Manual update"

2015-05-06 20:57:37 -04:00

clothing

Lighting overhaul.

2015-05-10 12:03:27 -07:00

computer3

Lighting overhaul.

2015-05-10 12:03:27 -07:00

crafting

…

customitems

Fluff item convenience

2015-05-07 17:18:12 -04:00

destilery

…

DetectiveWork

…

economy

…

events

Lighting overhaul.

2015-05-10 12:03:27 -07:00

ext_scripts

…

flufftext

…

food

Botany / Xenobotany Update

2015-05-09 06:00:24 -04:00

games

…

genetics

…

genetics2

…

hydroponics

Merge remote-tracking branch 'upstream/master' into LightShit

2015-05-10 13:56:28 -07:00

icon generation

…

jungle

Lighting overhaul.

2015-05-10 12:03:27 -07:00

karma

…

library

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

lighting

Colored Fire

2015-05-10 13:12:22 -07:00

liquid

…

media

Lighting overhaul.

2015-05-10 12:03:27 -07:00

mining

Lighting overhaul.

2015-05-10 12:03:27 -07:00

mob

Merge remote-tracking branch 'upstream/master' into LightShit

2015-05-10 13:56:28 -07:00

nano

…

ninja

…

organs

Fixes exploded limbs not launching their contents

2015-05-06 22:56:52 -04:00

paperwork

Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent

2015-04-30 13:18:48 -04:00

power

Lighting overhaul.

2015-05-10 12:03:27 -07:00

procedural mapping

Revert "Manual update"

2015-05-06 20:57:37 -04:00

projectiles

Lighting overhaul.

2015-05-10 12:03:27 -07:00

reagents

Merge remote-tracking branch 'upstream/master' into LightShit

2015-05-10 13:56:28 -07:00

recycling

Improves dumping of "quick" containers

2015-05-08 07:20:44 -04:00

research

Health Analyzer Name Fix

2015-05-10 05:59:03 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

store

…

supermatter

Lighting overhaul.

2015-05-10 12:03:27 -07:00

surgery

Fixes surgery bugs & removes organ rejection

2015-04-14 22:12:19 -04:00

telesci

…

vehicle

Lighting overhaul.

2015-05-10 12:03:27 -07:00

virus2

Lighting overhaul.

2015-05-10 12:03:27 -07:00