cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 10:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,047 Commits 74 Branches 23 Tags
7fffed2e4ef8d466e882a90bcd8a2401bbbb231d
Commit Graph

6 Commits

Author SHA1 Message Date
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