Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev ...

Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm

2015-02-04 04:44:09 +06:00

..

components

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

_atmos_setup.dm

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

_atmospherics_helpers.dm

Cleanup global.dm and setup.dm, fix typos in the other files

2015-01-10 02:01:55 +06:00

atmospherics.dm

Atmos machine update

2015-01-02 01:46:18 -05:00

datum_pipe_network.dm

Pipe networks now cache their total volume

2014-08-03 22:41:31 -04:00

datum_pipeline.dm

Updates comments

2015-01-27 22:14:26 -05:00

he_pipes.dm

HE pipe changes

2015-01-12 21:28:41 +00:00

mainspipe.dm

fix some misplaced set_dir()s

2014-12-08 10:09:09 +00:00

pipes.dm

refactor buckling to be more generic

2015-01-12 21:28:31 +00:00