From 0a7b898253a07b7277a8c36372b2f9429deec109 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 30 Aug 2014 15:49:35 -0400 Subject: [PATCH 1/2] Fixes #6229 Entropy was being divided by total_moles twice. --- code/ZAS/_gas_mixture_xgm.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/ZAS/_gas_mixture_xgm.dm b/code/ZAS/_gas_mixture_xgm.dm index b193fb1692..eec285283b 100644 --- a/code/ZAS/_gas_mixture_xgm.dm +++ b/code/ZAS/_gas_mixture_xgm.dm @@ -124,8 +124,7 @@ . = 0 for(var/g in gas) - var/ratio = gas[g] / total_moles - . += ratio * specific_entropy_gas(g) + . += gas[g] * specific_entropy_gas(g) . /= total_moles /* From 762a1d1f0331540f21ad40bb7a04765e07418c52 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 30 Aug 2014 15:59:49 -0400 Subject: [PATCH 2/2] Increased disposal flow rate and pump power --- code/modules/recycling/disposal.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index e6fe39f903..fbcb983de5 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -7,7 +7,7 @@ // Toilets are a type of disposal bin for small objects only and work on magic. By magic, I mean torque rotation #define SEND_PRESSURE 700 //kPa. 7 bar - Based on existing pneumatic conveyor pressures. #define PRESSURE_TANK_VOLUME 70 //L - a 0.3 m diameter * 1 m long cylindrical tank. Happens to be the same volume as the regular oxygen tanks, so seems appropriate. -#define PUMP_MAX_FLOW_RATE 50 //L/s - 2 m/s using a 15 cm by 15 cm inlet +#define PUMP_MAX_FLOW_RATE 200 //L/s - 8 m/s using a 15 cm by 15 cm inlet /obj/machinery/disposal name = "disposal unit" @@ -24,7 +24,7 @@ var/flush_every_ticks = 30 //Every 30 ticks it will look whether it is ready to flush var/flush_count = 0 //this var adds 1 once per tick. When it reaches flush_every_ticks it resets and tries to flush. var/last_sound = 0 - active_power_usage = 1500 //the pneumatic pump power. 2 HP ~ 1500W + active_power_usage = 2200 //the pneumatic pump power. 3 HP ~ 2200W idle_power_usage = 100 // create a new disposal