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

Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm

2015-04-28 08:43:31 +02:00

..

__HELPERS

Updates chemistry colors

2015-04-28 09:23:39 +03:00

_onclick

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

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

ATMOSPHERICS

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

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

controllers

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

2015-04-24 17:13:37 +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-04-28 08:43:31 +02:00

js

…

modules

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

2015-04-28 08:43:31 +02:00

TriDimension

Adds Destroys.

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

ZAS

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

2015-04-24 17:13:37 +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 branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

stylesheet.dm

Makes reflex shooting more obvious

2015-04-02 21:54:35 -04:00

world.dm

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

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