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

broken but compiles and runs sans panics

Browse Source
This commit is contained in:
Putnam
2020-10-28 23:07:59 -07:00
parent 453d5081a7
commit 3c4eff605d
16 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/view_variables/reference_tracking.dm
+1 -1
View File
@@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(deletion_failures)
/world/proc/enable_reference_tracking()
if (fexists(EXTOOLS))
call(EXTOOLS, "ref_tracking_initialize")()
//call(EXTOOLS, "ref_tracking_initialize")()
/proc/get_back_references(datum/D)
CRASH("/proc/get_back_references not hooked by extools, reference tracking will not function!")
code/modules/atmospherics/gasmixtures/gas_mixture.dm
+12 -1
View File
@@ -23,10 +23,17 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list())
var/list/analyzer_results //used for analyzer feedback - not initialized until its used
var/_extools_pointer_gasmixture = 0 // Contains the memory address of the shared_ptr object for this gas mixture in c++ land. Don't. Touch. This. Var.
GLOBAL_VAR_INIT(auxmos_initialized,FALSE)
/proc/auxtools_atmos_init()
CRASH("Auxtools not loaded! Stuff will get messy!")
/datum/gas_mixture/New(volume)
if (!isnull(volume))
initial_volume = volume
ATMOS_EXTOOLS_CHECK
if(!GLOB.auxmos_initialized)
auxtools_atmos_init()
GLOB.auxmos_initialized = TRUE
__gasmixture_register()
reaction_results = new
@@ -327,6 +334,10 @@ get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
/datum/gas_mixture/turf
/datum/gas_mixture/turf/__gasmixture_register()
/datum/gas_mixture/turf/__gasmixture_unregister()
/*
/mob/verb/profile_atmos()
/world{loop_checks = 0;}
code/modules/atmospherics/machinery/components/unary_devices/tank.dm
+1 -1
View File
@@ -18,7 +18,7 @@
air_contents.set_volume(volume)
air_contents.set_temperature(T20C)
if(gas_type)
air_contents.set_moles(AIR_CONTENTS)
air_contents.set_moles(gas_type,AIR_CONTENTS)
name = "[name] ([GLOB.meta_gas_names[gas_type]])"
/obj/machinery/atmospherics/components/unary/tank/air
code/modules/atmospherics/machinery/portable/canister.dm
+3 -5
View File
@@ -22,7 +22,7 @@
integrity_failure = 0.4
pressure_resistance = 7 * ONE_ATMOSPHERE
var/temperature_resistance = 1000 + T0C
var/starter_temp
var/starter_temp = T20C
// Prototype vars
var/prototype = FALSE
var/valve_timer = null
@@ -216,13 +216,11 @@
/obj/machinery/portable_atmospherics/canister/proc/create_gas()
if(gas_type)
if(starter_temp)
air_contents.set_temperature(starter_temp)
air_contents.set_temperature(starter_temp)
air_contents.set_moles(gas_type,(maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
if(starter_temp)
air_contents.set_temperature(starter_temp)
/obj/machinery/portable_atmospherics/canister/air/create_gas()
air_contents.set_temperature(starter_temp)
air_contents.set_moles(/datum/gas/oxygen, (O2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))
air_contents.set_moles(/datum/gas/nitrogen, (N2STANDARD * maximum_pressure * filled) * air_contents.return_volume() / (R_IDEAL_GAS_EQUATION * air_contents.return_temperature()))