Mloc-Argent e809be825e Merge branch 'master' into dev ...

Conflicts:
	code/modules/mob/say.dm

2013-08-16 22:22:42 +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

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

- Added null checks for get_mobs_in_radio_range().

2013-01-17 06:52:49 +00:00

game

Merge branch 'master' into dev

2013-08-16 22:22:42 +01:00

js

…

modules

Merge branch 'master' into dev

2013-08-16 22:22:42 +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

Adds explosive implant admin messages, and jump button for explosions.

2013-08-12 12:34:13 +01:00

ZAS

Merge pull request #3524 from SkyMarshal/airfixes

2013-08-15 15:12:49 -07:00

global.dm

Adds a vox heist game mode. Fairly complex.

2013-07-28 05:18:04 -07: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