Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

autotraitor

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

blob

Fixes #5270

2014-06-16 23:30:37 +01:00

changeling

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

cult

Rune drawing update

2014-06-14 13:57:23 +04:00

epidemic

…

events

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

extended

…

heist

Moved the Vox skipjack console over to a multi-destination shuttle datum setup.

2014-06-03 23:21:10 +09:30

malfunction

Revert "Merge pull request #4985 from jack-fractal/dev"

2014-05-31 00:25:56 +01:00

meme

…

meteor

…

mutiny

Adds docking support to shuttles, NanoUI

2014-06-09 23:41:08 -04:00

ninja

Added the rest of the objectiveless antag types

2014-02-04 23:51:34 -08:00

nuclear

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

revolution

Removed all prefixes of type 'paper - '

2014-05-23 22:31:27 +02:00

sandbox

…

traitor

Code cleanup for traitors

2014-02-15 23:42:37 -08:00

wizard

Fixed doubled construct spells

2014-05-18 19:52:03 +12:00

events.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

factions.dm

…

game_mode.dm

Merge pull request #5116 from mwerezak/round-end

2014-06-02 23:00:48 +04:00

gameticker.dm

Adds docking controllers to shuttles

2014-06-09 23:37:37 -04:00

intercept_report.dm

Efficiency: Joblist

2014-03-10 21:57:36 -05:00

newobjective.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

objective.dm

Spelling correction: tratior and Tratior to traitor and Traitor

2014-04-22 01:12:17 -07:00

setupgame.dm

And now tested in game, with some fixes.

2014-02-10 22:47:29 -06:00