jack-fractal 245713418f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

2013-06-11 00:29:10 -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

Added the ability to give traitors all objectives.

2013-06-09 04:47:10 -04:00

defines

Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)

2013-06-10 22:35:01 -07:00

FEA

…

game

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

2013-06-11 00:29:10 -04:00

js

…

modules

Polished off some pneumatic cannon bugs. All done.

2013-06-11 12:19:20 -07:00

TriDimension

…

unused

…

WorkInProgress

Merge pull request #3016 from NicholasDV/tweaksAndFixes

2013-06-10 02:39:40 -07:00

ZAS

Fixes for ZAS issues.

2013-06-10 18:49:41 -07:00

global.dm

Squashed commit of the following:

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

hub.dm

…

names.dm

…

setup.dm

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

2013-06-05 18:39:43 -05:00

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