Albert Iordache 604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master ...

Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi

2012-05-29 08:50:58 +03:00

..

ATMOSPHERICS

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

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

datums

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

2012-05-26 13:46:06 +01:00

defines

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

FEA

As many bugfixes as I could cram into here.

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

game

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

js

…

modules

Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master

2012-05-29 08:50:58 +03:00

unused

HUD Update

2012-05-23 22:58:52 +01:00

WorkInProgress

Fixes to Tajaran lying down sprites. Removed "lipstick" from Soghun/Tajaran. Removed "bumps" from Soghun.

2012-05-28 19:49:10 +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 git://github.com/Baystation12/Baystation12

2012-05-27 12:50:23 -06:00

stylesheet.dm

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

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