Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

autotraitor

Code effeciency project: HUD items rewrite

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

blob

Nerf to shield blobs.

2013-12-26 13:20:38 -08:00

changeling

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

cult

Merge pull request #4723 from Jarcolr/diction

2014-04-09 21:48:19 +04:00

epidemic

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

events

Merge remote-tracking branch 'upstream/master'

2014-01-09 11:15:26 -06:00

extended

…

heist

Added the rest of the objectiveless antag types

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

malfunction

Fixes malf picking players to me malf who don't have BE_MALF toggled on.

2014-03-31 15:39:49 -04:00

meme

…

meteor

Fixes for the tg cherrypicks.

2014-01-08 20:32:35 +00:00

ninja

Added the rest of the objectiveless antag types

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

nuclear

Added the rest of the objectiveless antag types

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

revolution

Code effeciency project: HUD items rewrite

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

sandbox

…

traitor

Code cleanup for traitors

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

wizard

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

events.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

factions.dm

…

game_mode.dm

Adds 9 new Chameleon items.

2014-03-23 14:08:23 -07:00

gameticker.dm

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

intercept_report.dm

Efficiency: Joblist

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

newobjective.dm

…

objective.dm

Definition usage.

2014-01-31 00:22:24 +03:00

setupgame.dm

And now tested in game, with some fixes.

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