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

Conflicts:
	baystation12.dme

2012-03-06 19:24:38 +00:00

..

ATMOSPHERICS

Added debug information (to the log with ooc and all that, feel free to make it actually make an error) for when the scrubber and distro atmos loops are directly linked at round start, fixed a thing where someone left multiple pipes with the same dir in a brig cell, causing pipes to freak the hell out

2012-02-26 02:35:58 +10:30

datums

Revert "Subject: [PATCH 089/285] TG Updates: Finally ready to like add this now oh man this is a huge thing sort of Added CC-Nanotrasen, an IRC bot"

2012-03-01 22:09:24 +00:00

defines

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

2012-03-06 19:24:38 +00:00

FEA

Merge remote-tracking branch 'upstream/master'

2012-02-13 01:12:13 -05:00

game

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

2012-03-06 19:24:38 +00:00

js

…

modules

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

2012-03-06 19:24:38 +00:00

unused

Cleaned up parts of the code, no other changes

2012-02-07 20:05:42 +02:00

WorkInProgress

Merge pull request #622 from SkyMarshal/master

2012-03-04 10:44:11 -08:00

names.dm

…

setup.dm

Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space.

2012-02-29 13:48:16 -07:00

stylesheet.dm

GODDAMN WHOEVER MAPPED THAT

2012-02-18 00:12:31 -07:00