PsiOmegaDelta 3a55b130a0 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	.travis.yml
	code/modules/virus2/disease2.dm
	maps/exodus-5.dmm

2015-08-14 08:34:42 +02:00

..

admin.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

analyser.dm

…

antibodies.dm

Moved antibodies to the rest of reagents.

2015-08-14 04:53:46 +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

…

curer.dm

…

disease2.dm

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

2015-08-14 08:34:42 +02:00

diseasesplicer.dm

…

dishincubator.dm

…

effect.dm

Merge branch 'dev' into ofChemistryAndStuff

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

helpers.dm

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

2015-07-11 10:58:49 +02:00

isolator.dm

…

items_devices.dm

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

2015-05-25 14:49:57 +09:30