jack-fractal 1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage ...

Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm

2014-05-13 20:45:05 -04: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

Fixes #4495.

2014-05-05 16:14:59 +09:30

cult

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage

2014-05-13 20:45:05 -04:00

epidemic

Expansion of every "icon = ''" path.

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

events

Changes all appropriate instances of toxins to phoron

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

extended

…

heist

Added the rest of the objectiveless antag types

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

malfunction

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage

2014-05-13 20:45:05 -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

Spelling correction: tratior and Tratior to traitor and Traitor

2014-04-22 01:12:17 -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

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