SkyMarshal 3e9146f99a Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	maps/tgstation.2.0.8.dmm

2012-01-28 02:03:42 -07:00

..

ATMOSPHERICS

added 4-way manifold, t-valve (like a railroad switch)

2012-01-19 22:04:50 -05:00

datums

Final bugfixes, port of AutoTraitor (tested) and RP-Rev (Untested)

2012-01-28 01:52:14 -07:00

defines

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

2012-01-28 02:03:42 -07:00

FEA

Runtime fix: division by zero

2011-10-04 01:58:47 +00:00

game

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

2012-01-28 02:03:42 -07:00

js

- Added href getter datum. Returns either what you want or null.

2011-10-11 20:24:14 +00:00

modules

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

2012-01-28 02:03:42 -07:00

unused

bones and dismemberment

2012-01-08 20:05:54 -05:00

WorkInProgress

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

2012-01-28 02:03:42 -07:00

names.dm

Did a bit of work on assemblies.

2011-09-09 06:15:38 +00:00

setup.dm

Added a new slurring variable, and set it up in the right places

2011-12-10 14:25:49 +02:00

stylesheet.dm

Fixed some borkenness with guns, and tried making the command channel readable.

2012-01-22 23:50:58 -07:00