Oops
Bleh
Lingading fixes

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	html/changelog.html
Bot down?  Let's not lock up the entire server.

Instead we'll spawn a thread to handle it, not like we care what is returned either way.

Conflicts:
	code/modules/ext_scripts/irc.dm
We use this
New system for CO2 asphixyation

Too much CO2 now makes you slowly gain oxyloss instead of making you
fall unconscious immediately and quickly killing you after 30 seconds.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
Completed unfinished species.breath_type switch

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
Adjusts co2 warning frequencies
Fixes missing 'else'

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
C02 -> carbon_dioxide

Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
Farmbot fixes

Fixed a few bugs in the construction code, before realizing there were a lot more bugs in the move_to_target() code, giving up and disabling it pending rewrite.
SHOULD fix fueltank bomb assemblies >:D
New recipes
TC use count appears on round end

Conflicts:
	code/datums/uplink_item.dm
	code/game/objects/items/devices/uplinks.dm

Adds Icons and purchase list

Conflicts:
	code/datums/uplink_item.dm
	code/game/gamemodes/traitor/traitor.dm
	code/stylesheet.dm

CSS is hard

Conflicts:
	code/game/gamemodes/traitor/traitor.dm

Mah Indents

Made Purchase Log Text rather than List

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Moved images to top "survived" line

Conflicts:
	code/game/objects/items/devices/uplinks.dm

Boxes show contents

Nuke Ops Group Shaming

Conflicts:
	code/game/gamemodes/nuclear/nuclear.dm

Uses compiled list for uplinks

Conflicts:
	code/game/objects/items/devices/uplinks.dm
Merge pull request #235 from alex-gh/uplink_greentext

TC use count appears on round end
Merge pull request #176 from ZomgPonies/master

30/05/14 - 2