Commit Graph

4 Commits

Author SHA1 Message Date
Chompstation Bot
b85c5de137 Xenomorph Overhaul and fixes from Gurgstation 2021-07-20 01:06:44 +00:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05: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
Zuhayr
22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30