Merge branch 'Citadel-Station-13:master' into wingport

2021-12-29 15:27:08 -07:00
parent 0e3d30e59f 35a606007c
commit 9437a97967
21 changed files with 2399 additions and 1980 deletions
@@ -160,6 +160,9 @@
 //SNOSTATION
 #define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS"

+//FESTIVESTATION
+#define FESTIVE_ATMOS "o2=22;n2=82;TEMP=266" //this goes here right putnam??
+
 //ATMOSIA GAS MONITOR TAGS
 #define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in"
 #define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out"