From 9fea39dea216ed6fa1f1aa167d5c16c582a5e9ee Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 25 Aug 2014 17:06:56 -0400 Subject: [PATCH] Quick fix for engine core flow imbalance A more thorough fix should probably involve providing a way for players to control the flow rate. Also tweaks emitters and allows collectors to be read using a multitool. --- code/ATMOSPHERICS/components/unary/vent_pump.dm | 2 +- code/modules/power/singularity/collector.dm | 4 ++-- code/modules/power/singularity/emitter.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 7e409f859d..3743cf7be3 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -169,7 +169,7 @@ var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION) //limit flow rate from turfs - transfer_moles = min(transfer_moles, environment.total_moles*MAX_SIPHON_FLOWRATE/environment.volume) //group_multiplier gets divided out here + transfer_moles = min(transfer_moles, environment.total_moles*air_contents.volume/environment.volume) //group_multiplier gets divided out here power_draw = pump_gas(src, environment, air_contents, transfer_moles, active_power_usage) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index be32b3d41c..6b5597a250 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -50,8 +50,8 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/device/analyzer)) - user << "\blue The [W.name] detects that [last_power]W were recently produced." + if(istype(W, /obj/item/device/analyzer) || istype(W, /obj/item/device/multitool)) + user << "\blue \The [W] detects that [last_power]W were recently produced." return 1 else if(istype(W, /obj/item/weapon/tank/phoron)) if(!src.anchored) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 0b138c0bb3..d05b082057 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,4 +1,4 @@ -#define EMITTER_DAMAGE_POWER_TRANSFER 400 //used to transfer power to containment field generators +#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators /obj/machinery/power/emitter name = "Emitter"