cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Atmospheric machines max power rating buff (#15229)

Browse Source
This commit is contained in:
Mykhailo Bykhovtsev
2022-12-07 02:54:19 -08:00
committed by GitHub
parent 9bc7490193
commit 372629de43
15 changed files with 321 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/components/binary_devices/dp_vent_pump.dm
+1 -1
View File
@@ -22,7 +22,7 @@
use_power = POWER_USE_OFF
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 7500 //7500 W ~ 10 HP
power_rating = 30000 //30000 W ~ 40 HP
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER //connects to regular, supply and scrubbers pipes
code/modules/atmospherics/components/binary_devices/pump.dm
+1 -1
View File
@@ -26,7 +26,7 @@ Thus, the two variables affect pump operation are set in New():
use_power = POWER_USE_OFF
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 7500 //7500 W ~ 10 HP
power_rating = 30000 //30000 W ~ 40 HP
var/max_pressure_setting = ATMOS_PUMP_MAX_PRESSURE //kPa
code/modules/atmospherics/components/binary_devices/volume_pump.dm
+3 -1
View File
@@ -6,7 +6,9 @@
name = "high power gas pump"
desc = "A pump. Has double the power rating of the standard gas pump."
power_rating = 15000 //15000 W ~ 20 HP
idle_power_usage = 450
power_rating = 45000 //45000 W ~ 60 HP
/obj/machinery/atmospherics/binary/pump/high_power/on
use_power = POWER_USE_IDLE
code/modules/atmospherics/components/omni_devices/filter.dm
+6 -4
View File
@@ -13,10 +13,10 @@
var/datum/omni_port/output
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 7500 //7500 W ~ 10 HP
power_rating = 15000 //15000 W ~ 20 HP
var/max_flow_rate = 200
var/set_flow_rate = 200
var/max_flow_rate = ATMOS_DEFAULT_VOLUME_FILTER
var/set_flow_rate = ATMOS_DEFAULT_VOLUME_FILTER
var/list/filtering_outputs = list() //maps gasids to gas_mixtures
@@ -97,7 +97,7 @@
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "omni_filter.tmpl", "Omni Filter Control", 330, 330)
ui = new(user, src, ui_key, "omni_filter.tmpl", "Omni Filter Control", 470, 330)
ui.set_initial_data(data)
ui.open()
@@ -107,6 +107,8 @@
data["power"] = use_power
data["config"] = configuring
data["last_power_draw"] = last_power_draw
data["max_power_draw"] = power_rating
var/portData[0]
for(var/datum/omni_port/P in ports)
code/modules/atmospherics/components/omni_devices/mixer.dm
+6 -4
View File
@@ -9,7 +9,7 @@
use_power = POWER_USE_IDLE
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 3700 //3700 W ~ 5 HP
power_rating = 15000 //15000 W ~ 20 HP
var/list/inputs = new()
var/datum/omni_port/output
@@ -20,8 +20,8 @@
var/tag_east_con
var/tag_west_con
var/max_flow_rate = 200
var/set_flow_rate = 200
var/max_flow_rate = ATMOS_DEFAULT_VOLUME_MIXER
var/set_flow_rate = ATMOS_DEFAULT_VOLUME_MIXER
var/list/mixing_inputs = list()
@@ -135,7 +135,7 @@
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "omni_mixer.tmpl", "Omni Mixer Control", 360, 330)
ui = new(user, src, ui_key, "omni_mixer.tmpl", "Omni Mixer Control", 470, 330)
ui.set_initial_data(data)
ui.open()
@@ -145,6 +145,8 @@
data["power"] = use_power
data["config"] = configuring
data["last_power_draw"] = last_power_draw
data["max_power_draw"] = power_rating
var/portData[0]
for(var/datum/omni_port/P in ports)
code/modules/atmospherics/components/trinary_devices/filter.dm
+1 -1
View File
@@ -8,7 +8,7 @@
use_power = POWER_USE_IDLE
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 7500 //This also doubles as a measure of how powerful the filter is, in Watts. 7500 W ~ 10 HP
power_rating = 15000 //15000 W ~ 20 HP
var/temp = null // -- TLE
code/modules/atmospherics/components/trinary_devices/mixer.dm
+1 -1
View File
@@ -8,7 +8,7 @@
use_power = POWER_USE_IDLE
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 3700 //This also doubles as a measure of how powerful the mixer is, in Watts. 3700 W ~ 5 HP
power_rating = 15000 //15000 W ~ 20 HP
var/set_flow_rate = ATMOS_DEFAULT_VOLUME_MIXER
var/list/mixing_inputs
code/modules/atmospherics/components/unary/outlet_injector.dm
+1 -1
View File
@@ -13,7 +13,7 @@
use_power = POWER_USE_OFF
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 15000 //15000 W ~ 20 HP
power_rating = 45000 //45000 W ~ 60 HP
var/injecting = 0
code/modules/atmospherics/components/unary/vent_pump.dm
+7 -7
View File
@@ -16,7 +16,7 @@
use_power = POWER_USE_OFF
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 7500 //7500 W ~ 10 HP
power_rating = 30000 //30000 W ~ 40 HP
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY //connects to regular and supply pipes
@@ -62,8 +62,8 @@
icon_state = "map_vent_in"
external_pressure_bound = 0
external_pressure_bound_default = 0
internal_pressure_bound = 2000
internal_pressure_bound_default = 2000
internal_pressure_bound = MAX_PUMP_PRESSURE
internal_pressure_bound_default = MAX_PUMP_PRESSURE
pressure_checks = 2
pressure_checks_default = 2
@@ -76,8 +76,8 @@
icon_state = "map_vent_in"
external_pressure_bound = 0
external_pressure_bound_default = 0
internal_pressure_bound = 2000
internal_pressure_bound_default = 2000
internal_pressure_bound = MAX_PUMP_PRESSURE
internal_pressure_bound_default = MAX_PUMP_PRESSURE
pressure_checks = 2
pressure_checks_default = 2
@@ -119,7 +119,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume
name = "Large Air Vent"
power_channel = EQUIP
power_rating = 15000 //15 kW ~ 20 HP
power_rating = 45000 //45 kW ~ 60 HP
/obj/machinery/atmospherics/unary/vent_pump/high_volume/Initialize()
. = ..()
@@ -128,7 +128,7 @@
/obj/machinery/atmospherics/unary/vent_pump/engine
name = "Reactor Core Vent"
power_channel = ENVIRON
power_rating = 30000 //15 kW ~ 20 HP
power_rating = 30000 //30 kW ~ 40 HP
/obj/machinery/atmospherics/unary/vent_pump/engine/Initialize()
. = ..()
code/modules/atmospherics/components/unary/vent_scrubber.dm
+1 -1
View File
@@ -8,7 +8,7 @@
use_power = POWER_USE_OFF
idle_power_usage = 150 //internal circuitry, friction losses and stuff
power_rating = 7500 //7500 W ~ 10 HP
power_rating = 30000 //30000 W ~ 40 HP
connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SCRUBBER //connects to regular and scrubber pipes