cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-24 12:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6231 from mwerezak/entropy-fix

Browse Source 
Fixes #6229
This commit is contained in:
Chinsky
2014-09-01 16:35:23 +04:00
parent 8a8f1ce7e1 762a1d1f03
commit 4e281fde44
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ZAS/_gas_mixture_xgm.dm
+1 -2
View File
@@ -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
/*
code/modules/recycling/disposal.dm
+2 -2
View File
@@ -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