PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02:00

..

Jungle

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

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

Rust

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02: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

…