Erthilo b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2012-05-29 15:00:11 +01:00

..

ATMOSPHERICS

I accidentally ALL THE THINGS! But yeah, ZAS is updated.

2012-05-26 02:01:26 -06:00

datums

Merge pull request #1188 from sick-trigger/master

2012-05-29 06:46:04 -07:00

defines

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

FEA

As many bugfixes as I could cram into here.

2012-05-20 14:23:10 -07:00

game

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

js

…

modules

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

unused

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

WorkInProgress

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

ZAS

Made some airflow changes. They won't be included in the processing code until they're more thoroughly tested, but the code is here anyway.

2012-05-28 16:42:40 -06:00

names.dm

…

setup.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-29 15:00:11 +01:00

stylesheet.dm

TG: - Added a middleclick function that swaps your hands.

2012-05-19 19:29:13 +01:00