Commit Graph

8 Commits

Author SHA1 Message Date
PsiOmegaDelta
654f2ccaa0 Makes all special role entries use unique ids now that it is possible. 2016-01-30 17:22:17 +01:00
PsiOmegaDelta
b74f2baf6d Makes special role preferences a list, instead of flag entry.
Allows us to define more than 16 special roles.
Updates some role usages to use the new ghost trap system.
2016-01-15 11:34:00 +01:00
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
PsiOmegaDelta
55c9f7533b Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name. 2015-10-07 08:56:13 +02:00
PsiOmegaDelta
a3a1f495a3 Implements my own comment suggestions and updates Travis' macro count. 2015-10-01 09:56:30 +02:00
Zuhayr
a985e036f0 Minor cleanup. 2015-09-21 20:43:53 +09:30
Zuhayr
bfe1d5a599 Span classes. 2015-09-21 20:36:51 +09:30
Zuhayr
22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30