PsiOmegaDelta 13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs ...

Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm

2015-10-10 12:05:36 +02:00

..

alien.dm

…

egg.dm

…

node.dm

Implements my own comment suggestions and updates Travis' macro count.

2015-10-01 09:56:30 +02:00

resin.dm

…