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

Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm

2014-03-28 18:46:04 -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

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

cult

Merge pull request #4524 from Ravensdale/PROTECITON

2014-03-04 23:11:43 -06: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

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

2013-11-25 11:59:57 +00: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

Added the rest of the objectiveless antag types

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

events.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

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

factions.dm

…

game_mode.dm

Fixed centcomm status reports listing vox raiders

2014-01-01 13:28:52 -05: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

Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain.

2013-02-25 19:48:00 -08:00

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