Merge pull request #6333 from mwerezak/engine

Alternative to #6332

code/modules/power/smes.dm

@@ -15,7 +15,7 @@
 	var/lastout = 0			//Amount of power it actually outputs to the powernet
 	var/loaddemand = 0		//For use in restore()
 	var/capacity = 5e6		//Maximum amount of power it can hold
-	var/charge = 2.0e6		//Current amount of power it holds
+	var/charge = 1.0e6		//Current amount of power it holds
 	var/charging = 0		//1 if it's actually charging, 0 if not
 	var/chargemode = 0		//1 if it's trying to charge, 0 if not.
 	//var/chargecount = 0

code/modules/supermatter/supermatter.dm

@@ -16,7 +16,7 @@
 */
 
 //Controls how much power is produced by each collector in range - this is the main parameter for tweaking SM balance, as it basically controls how the power variable relates to the rest of the game.
-#define POWER_FACTOR 0.7             //Obtained from testing. Aiming to make the ideal running output (500 kW) run the SM to ~85% of the safety level.
+#define POWER_FACTOR 1.0
 #define DECAY_FACTOR 700             //Affects how fast the supermatter power decays
 #define CRITICAL_TEMPERATURE 800     //K
 #define CHARGING_FACTOR 0.05