Chinsky e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm

2013-06-08 05:55:42 +04:00

..

__HELPERS

Runtime fixes, tweaks.

2013-06-04 16:25:41 +04:00

ATMOSPHERICS

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

controllers

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

datums

Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.

2013-06-05 17:35:38 +09:30

defines

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

FEA

…

game

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-06-08 05:55:42 +04:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-06-08 05:55:42 +04:00

TriDimension

…

unused

…

WorkInProgress

Engineering tape can be placed on doors.

2013-05-30 19:30:36 +03:00

ZAS

Merge pull request #2981 from SkyMarshal/zas-cleanup

2013-06-05 14:54:32 -07:00

global.dm

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

hub.dm

…

names.dm

…

setup.dm

Merge conflict resolution, using BEF.

2013-06-05 14:22:04 +09:30

stylesheet.dm

Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.

2013-06-05 17:35:38 +09:30

world.dm

Commented out end-round noises. Should actually work this time.

2013-05-29 13:44:59 -04:00