PsiOmega 78a9a43de6 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/controllers/master_controller.dm
	code/game/objects/items/devices/powersink.dm

2015-05-06 12:19:50 +02:00

..

__HELPERS

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

2015-05-04 14:58:24 +02: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

Powersink Fix

2015-05-05 18:49:11 +02:00

datums

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

2015-04-26 15:52:18 +02:00

defines

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

2015-04-24 17:13:37 +02:00

FEA

Adds Destroys.

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

game

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

2015-05-06 12:19:50 +02:00

js

…

modules

Fixes the removal of all organs when admins use "Select Equipment"

2015-05-05 21:37:28 -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 remote-tracking branch 'upstream/dev' into CultPorting

2015-04-14 15:54:22 +02: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