Mloc-Argent 31d1307ed2 Merge branch 'master' into dev ...

Conflicts:
	code/modules/virus2/effect.dm

2013-08-20 21:57:01 +01: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

Nano UI Framework

2013-08-19 22:52:23 +01:00

datums

Added abilities for nymphs/evolution to a final form.

2013-08-19 17:22:23 -07:00

defines

Added a knife harness/duelling knives.

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

FEA

…

game

Merge branch 'master' into dev

2013-08-20 10:04:56 +01:00

js

…

modules

Merge branch 'master' into dev

2013-08-20 21:57:01 +01:00

TriDimension

…

unused

These files have been collapsed into root procs and can be deleted.

2013-08-16 17:48:25 -07:00

WorkInProgress

Added a fax machine to send messages to centcom with.

2013-08-18 14:39:08 -04:00

ZAS

Disabled airlock heat transfer after community vote.

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

global.dm

Nano UI Framework

2013-08-19 22:52:23 +01:00

hub.dm

…

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