Zuhayr 5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

..

Jungle

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

Rust

Cables are now stacks

2014-08-25 18:54:35 +04:00

Supermatter

New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu!

2013-10-24 15:47:26 -04:00

covershield.dmi

…

meteor_battery.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

meteor_turret.dmi

…

sculpture.dm

Fixes #6647

2014-10-10 00:23:03 -04:00

unknown.dmi

…