From 025838532a1ea6bc031efa031e6df6d0b3c4f43c Mon Sep 17 00:00:00 2001 From: mwerezak Date: Fri, 22 Aug 2014 21:43:03 -0400 Subject: [PATCH] Adjusts SM charging and output --- code/modules/power/singularity/emitter.dm | 2 +- code/modules/supermatter/supermatter.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ce059c757e..70f0a869e5 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,5 +1,5 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 -#define EMITTER_DAMAGE_POWER_TRANSFER 350 //used to transfer power to containment field generators +#define EMITTER_DAMAGE_POWER_TRANSFER 400 //used to transfer power to containment field generators /obj/machinery/power/emitter name = "Emitter" diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index c87886b9db..6d8d301874 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -6,9 +6,9 @@ #define REACTION_POWER_MODIFIER 1.1 //Higher == more overall power //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.35 //Obtained from testing. Aiming to make the ideal running output (600 kW) run the SM to ~85% of the safety level. +#define POWER_FACTOR 0.5 //Obtained from testing. Aiming to make the ideal running output (400 kW) run the SM to ~85% of the safety level. -#define CHARGING_FACTOR 0.55 +#define CHARGING_FACTOR 0.11 #define DAMAGE_RATE_LIMIT 5 //damage rate cap at power = 900, scales linearly with power