duncathan eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm

2016-03-30 22:55:00 -06:00

..

conveyor2.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-03-30 22:55:00 -06:00

disposal-construction.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

disposal-structures.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

disposal-unit.dm

Atoms may now have many mobs buckled to them, as opposed to one, this is controlled by the new max_buckled_mobs var on atoms, defaults to 1 as to not change any current functionality

2016-03-07 18:03:25 +00:00

sortingmachinery.dm

Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem

2016-03-25 03:56:01 -07:00