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

Conflicts:
	code/game/objects/structures/janicart.dm

2015-10-12 22:01:57 +02:00

..

conveyor2.dm

Removes in world

2015-10-09 22:37:53 -05:00

disposal-construction.dm

Adds altclick rotation + description to doppler array, transit tubes, windoor assembly, infrared emitter, emitter, particle accelerator, disposal tubes.

2015-09-20 18:54:23 +03:00

disposal-structures.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

disposal-unit.dm

Slimes now uses buckling to feed and attach themselves on mobs. This removes the silly check in mob/Move(), reducing lag.

2015-10-10 20:41:27 +02:00

sortingmachinery.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00