Chinsky 8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm

2012-10-14 20:39:26 +04:00

..

clothing

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

costume.dm

More file structuring.

2012-09-05 22:44:48 +00:00

door.dm

Cleaning up files and UltraLight, added some BS12 files, and fixes sprite issues.

2012-08-24 16:20:50 +01:00

hydro.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-10-05 22:21:26 +10:00

machinery.dm

Experimental tweak, I'll revert this if everyone hates it but for now I want to see how things will be if airlocks use the environmental power channel.

2012-09-30 18:51:23 +00:00

storage.dm

Merged money, ATMs, bible changes, nullrod changes, policetape.

2012-09-03 01:29:53 +01:00

toy.dm

Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.

2012-08-18 16:33:40 +00:00

vending.dm

Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

2012-10-12 17:53:17 +10:00

weapon.dm

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

2012-10-14 20:39:26 +04:00