ZomgPonies 91bc429721 Merge branch 'pr/4' ...

Conflicts:
	.gitignore

2013-08-24 17:25:58 -04:00

..

__HELPERS

Better gender checks.

2013-08-21 09:59:07 +01: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

Added back a bunch of new symptoms from /tg/

2013-08-20 19:13:42 -04:00

defines

Bike horns honks on hit

2013-08-20 02:49:18 -04:00

FEA

…

game

Merge branch 'pr/4'

2013-08-24 17:25:58 -04:00

js

…

modules

Merge branch 'pr/4'

2013-08-24 17:25:58 -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

Config files, rules, etc

2013-08-20 23:22:58 +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

Server-specific settings

2013-08-17 23:35:55 +04:00