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

..

area

Revert "water pipes base + pda support"

2012-01-27 10:06:12 +02:00

mob

Lots of stuff, will elaborate later.

2012-01-27 11:18:14 -07:00

obj

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

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

procs

Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant.

2012-01-27 20:15:06 -07:00

atom.dm

- Added atom/proc/search_contents_for. Recursively searches through all contents of all atoms inside specified one for matches, returns a list of found atoms.

2011-10-31 22:09:36 +00:00

client.dm

Disable control_freak, jesus.

2012-01-04 18:20:44 -08:00

global.dm

Merge pull request #202 from SkyMarshal/master

2012-01-03 11:14:20 -08:00

hub.dm

Adding to #8. Edited README.txt, removed forum_activation.dm from the .dme, and added in the hub password

2011-11-21 20:44:57 +02:00

obj.dm

Ported Uplinks, Door stuff, Hacktools, Compressed Matter implant.

2012-01-27 20:15:06 -07:00

turf.dm

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

2012-01-15 16:29:08 -05:00

world.dm

…