ZomgPonies ebfa0a0fd2 Merge branch 'pr/2' ...

Conflicts:
	baystation12.dme
	config/example/dbconfig.txt

2013-08-17 15:22:49 -04:00

..

__HELPERS

Moved species defines to setup.dm, add whitelisted species global.

2013-08-07 01:12:11 -07:00

ATMOSPHERICS

Colouring tempfix.

2013-08-15 10:29:29 +03:00

controllers

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

2013-08-06 07:40:21 -07:00

datums

Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn.

2013-08-07 01:16:38 -07:00

defines

Added a knife harness/duelling knives.

2013-08-08 20:48:54 -07:00

FEA

…

game

Merge branch 'pr/2'

2013-08-17 15:22:49 -04:00

js

…

modules

Merge branch 'pr/2'

2013-08-17 15:22:49 -04:00

TriDimension

…

unused

…

WorkInProgress

Merge pull request #1 from Baystation12/master

2013-08-13 13:39:15 -07:00

ZAS

Disabled airlock heat transfer after community vote.

2013-08-17 01:03:13 +01:00

global.dm

General code chances

2013-08-14 01:40:07 +04:00

hub.dm

General code chances

2013-08-14 01:40:07 +04:00

names.dm

…

setup.dm

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

2013-08-14 01:01:18 -07:00

stylesheet.dm

Adds colored department radio channels.

2013-07-30 17:38:34 -04:00

world.dm

Made IRCbot's password and host a config option.

2013-08-05 14:07:06 +01:00