Cael_Aislinn fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-02-18 01:25:47 +10:00

..

__HELPERS

…

ATMOSPHERICS

…

controllers

disabled simultaneous admin PM warning

2013-02-13 17:49:48 +10:00

datums

Fixes virus crate having no model and cost.

2013-02-13 17:09:54 +00:00

defines

…

FEA

…

game

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-18 01:25:47 +10:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-18 01:25:47 +10:00

TriDimension

…

unused

…

WorkInProgress

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-02-18 01:25:47 +10:00

ZAS

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

global.dm

fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event

2013-02-14 23:17:54 +10:00

hub.dm

…

names.dm

…

setup.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

stylesheet.dm

unique voice text colour for soghun, skrell and taj

2013-02-10 22:36:23 +10:00

world.dm

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00