Hawk-v3 c6790790c5 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/modules/power/apc.dm

2012-02-01 20:01:19 +00:00

..

ATMOSPHERICS

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

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

datums

Fix for fingerprints. (They work right, now!)

2012-01-31 21:23:37 -07:00

defines

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

2012-02-01 18:18:04 +10:00

FEA

…

game

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

2012-02-01 20:01:19 +00:00

js

…

modules

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

2012-02-01 20:01:19 +00:00

unused

MAJOR UPDATE: Detective/Fingerprints update

2012-01-31 02:01:38 -07:00

WorkInProgress

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

2012-02-01 18:18:04 +10:00

names.dm

…

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