Neerti 6906acf193 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two ...

Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme

2015-05-10 04:21:37 -04:00

..

__HELPERS

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

_onclick

Merge remote-tracking branch 'upstream/master' into dev

2015-05-05 08:11:28 +02:00

ATMOSPHERICS

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

controllers

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

datums

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

defines

Acting jobs now sort with non-acting jobs on the manifest.

2015-05-09 15:36:04 +01:00

FEA

Adds Destroys.

2015-04-24 17:11:14 +02:00

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

TriDimension

Grilles and rods.

2015-05-02 21:35:02 +02:00

ZAS

Merge remote-tracking branch 'upstream/master' into dev

2015-05-02 21:50:11 +02:00

global.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 4/18/2015_bay_sync

2015-04-18 23:08:17 -04:00

hub.dm

…

names.dm

…

setup.dm

Merge pull request #9007 from PsiOmegaDelta/Initialize

2015-04-30 21:12:06 +03:00

stylesheet.dm

…

world.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00