CaelAislinn 1366bf7e34 Merge git://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/defines/procs/gamehelpers.dm
	code/game/mecha/mecha.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

2012-02-07 09:08:55 +10:00

..

ATMOSPHERICS

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

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

datums

Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.

2012-02-02 00:35:48 -07:00

defines

AI's can now understand pAI speech

2012-02-06 11:02:49 -07:00

FEA

turns out things broke from abi's runtime fix because that proc shouldn't ever be called here

2012-02-05 01:07:57 -05:00

game

Merge git://github.com/Baystation12/Baystation12

2012-02-07 09:08:55 +10:00

js

…

modules

AI's can now understand pAI speech

2012-02-06 11:02:49 -07:00

unused

Merge git://github.com/Baystation12/Baystation12

2012-02-07 03:28:09 +10:00

WorkInProgress

removed redundant proc, updated old blood in multiz

2012-02-07 03:53:01 +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