shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3931 from Citadel-Station-13/upstream-merge-32685

Browse Source 
[MIRROR] Little things 2 Revenge of atmos components
This commit is contained in:
LetterJay
2017-11-14 15:52:32 -06:00
committed by GitHub
parent d9ce438bbb f2f816c489
commit 19abbdfd5f
5 changed files with 1 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/atmospherics/machinery/components/unary_devices/generator_input.dm
View File

@@ -1,16 +0,0 @@
/obj/machinery/atmospherics/components/unary/generator_input
icon_state = "he_intact"
density = TRUE
name = "generator input"
desc = "An input for a generator."
layer = LOW_OBJ_LAYER
var/update_cycle
/obj/machinery/atmospherics/components/unary/generator_input/update_icon()
icon_state = NODE1 ? "intact" : "exposed"
/obj/machinery/atmospherics/components/unary/generator_input/proc/return_exchange_air()
return AIR1

57
code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
View File

@@ -1,57 +0,0 @@
/obj/machinery/atmospherics/components/unary/oxygen_generator
icon_state = "o2gen_map"
name = "oxygen generator"
desc = "Generates oxygen."
dir = SOUTH
initialize_directions = SOUTH
layer = GAS_SCRUBBER_LAYER
var/on = FALSE
var/oxygen_content = 10
/obj/machinery/atmospherics/components/unary/oxygen_generator/update_icon_nopipes()
cut_overlays()
if(showpipe)
add_overlay(getpipeimage('icons/obj/atmospherics/components/unary_devices.dmi', "scrub_cap", initialize_directions)) //it works for now
if(!NODE1 || !on || !is_operational())
icon_state = "o2gen_off"
return
else
icon_state = "o2gen_on"
/obj/machinery/atmospherics/components/unary/oxygen_generator/New()
..()
var/datum/gas_mixture/air_contents = AIR1
air_contents.volume = 50
AIR1 = air_contents
/obj/machinery/atmospherics/components/unary/oxygen_generator/process_atmos()
..()
if(!on)
return 0
var/datum/gas_mixture/air_contents = AIR1
var/total_moles = air_contents.total_moles()
if(total_moles < oxygen_content)
var/current_heat_capacity = air_contents.heat_capacity()
var/added_oxygen = oxygen_content - total_moles
air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
ASSERT_GAS(/datum/gas/oxygen, air_contents)
air_contents.gases[/datum/gas/oxygen][MOLES] += added_oxygen
update_parents()
return 1