PsiOmegaDelta 265802d270 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/controllers/_DynamicAreaLighting_TG.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/explosion.dm

2015-07-10 12:57:46 +02:00

..

admin.dm

…

analyser.dm

…

antibodies.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

biohazard destroyer.dm

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

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

centrifuge.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

curer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

disease2.dm

Fixes virus infectionchance oversight

2015-07-09 17:26:15 -04:00

diseasesplicer.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

dishincubator.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

effect.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-03-31 17:44:42 +03:00

helpers.dm

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

2015-07-10 12:57:46 +02:00

isolator.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

items_devices.dm

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

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