From 37394c7d60719f1f0e925f0a4d8a2d95bfdcdc56 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Tue, 12 Apr 2022 23:01:54 -0400
Subject: [PATCH 001/200] Initial commit
---
code/__DEFINES/subsystems.dm | 10 +
code/controllers/subsystem/zas.dm | 521 ++++++++++++++++++
code/modules/atmospherics/ZAS/Airflow.dm | 152 +++++
code/modules/atmospherics/ZAS/Atom.dm | 59 ++
code/modules/atmospherics/ZAS/Connection.dm | 168 ++++++
.../atmospherics/ZAS/ConnectionGroup.dm | 260 +++++++++
.../atmospherics/ZAS/ConnectionManager.dm | 105 ++++
code/modules/atmospherics/ZAS/Debug.dm | 20 +
code/modules/atmospherics/ZAS/Diagnostic.dm | 82 +++
code/modules/atmospherics/ZAS/Fire.dm | 443 +++++++++++++++
code/modules/atmospherics/ZAS/Plasma.dm | 176 ++++++
code/modules/atmospherics/ZAS/Turf.dm | 295 ++++++++++
code/modules/atmospherics/ZAS/XGM/gas_data.dm | 103 ++++
code/modules/atmospherics/ZAS/Zone.dm | 214 +++++++
code/modules/atmospherics/ZAS/_docs.dm | 28 +
tgstation.dme | 20 +-
16 files changed, 2655 insertions(+), 1 deletion(-)
create mode 100644 code/controllers/subsystem/zas.dm
create mode 100644 code/modules/atmospherics/ZAS/Airflow.dm
create mode 100644 code/modules/atmospherics/ZAS/Atom.dm
create mode 100644 code/modules/atmospherics/ZAS/Connection.dm
create mode 100644 code/modules/atmospherics/ZAS/ConnectionGroup.dm
create mode 100644 code/modules/atmospherics/ZAS/ConnectionManager.dm
create mode 100644 code/modules/atmospherics/ZAS/Debug.dm
create mode 100644 code/modules/atmospherics/ZAS/Diagnostic.dm
create mode 100644 code/modules/atmospherics/ZAS/Fire.dm
create mode 100644 code/modules/atmospherics/ZAS/Plasma.dm
create mode 100644 code/modules/atmospherics/ZAS/Turf.dm
create mode 100644 code/modules/atmospherics/ZAS/XGM/gas_data.dm
create mode 100644 code/modules/atmospherics/ZAS/Zone.dm
create mode 100644 code/modules/atmospherics/ZAS/_docs.dm
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index f4437406205..9e1d38c8394 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -271,6 +271,16 @@
#define SSAIR_SUPERCONDUCTIVITY 7
#define SSAIR_PROCESS_ATOMS 8
+//ZAS subsystem subtasks
+#define SSZAS_PIPENETS 1
+#define SSZAS_MACHINES 2
+#define SSZAS_TILES 3
+#define SSZAS_DEFERED_TILES 4
+#define SSZAS_EDGES 5
+#define SSZAS_FIRES 6
+#define SSZAS_HOTSPOTS 7
+#define SSZAS_ZONES 8
+
//Pipeline rebuild helper defines, these suck but it'll do for now //Fools you actually merged it
#define SSAIR_REBUILD_PIPELINE 1
#define SSAIR_REBUILD_QUEUE 2
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
new file mode 100644
index 00000000000..f6cf060c884
--- /dev/null
+++ b/code/controllers/subsystem/zas.dm
@@ -0,0 +1,521 @@
+/*
+
+Overview:
+ The air controller does everything. There are tons of procs in here.
+
+Class Vars:
+ zones - All zones currently holding one or more turfs.
+ edges - All processing edges.
+
+ tiles_to_update - Tiles scheduled to update next tick.
+ zones_to_update - Zones which have had their air changed and need air archival.
+ active_hotspots - All processing fire objects.
+
+ active_zones - The number of zones which were archived last tick. Used in debug verbs.
+ next_id - The next UID to be applied to a zone. Mostly useful for debugging purposes as zones do not need UIDs to function.
+
+Class Procs:
+
+ mark_for_update(turf/T)
+ Adds the turf to the update list. When updated, update_air_properties() will be called.
+ When stuff changes that might affect airflow, call this. It's basically the only thing you need.
+
+ add_zone(zone/Z) and remove_zone(zone/Z)
+ Adds zones to the zones list. Does not mark them for update.
+
+ air_blocked(turf/A, turf/B)
+ Returns a bitflag consisting of:
+ AIR_BLOCKED - The connection between turfs is physically blocked. No air can pass.
+ ZONE_BLOCKED - There is a door between the turfs, so zones cannot cross. Air may or may not be permeable.
+
+ has_valid_zone(turf/T)
+ Checks the presence and validity of T's zone.
+ May be called on unsimulated turfs, returning 0.
+
+ merge(zone/A, zone/B)
+ Called when zones have a direct connection and equivalent pressure and temperature.
+ Merges the zones to create a single zone.
+
+ connect(turf/simulated/A, turf/B)
+ Called by turf/update_air_properties(). The first argument must be simulated.
+ Creates a connection between A and B.
+
+ mark_zone_update(zone/Z)
+ Adds zone to the update list. Unlike mark_for_update(), this one is called automatically whenever
+ air is returned from a simulated turf.
+
+ equivalent_pressure(zone/A, zone/B)
+ Currently identical to A.air.compare(B.air). Returns 1 when directly connected zones are ready to be merged.
+
+ get_edge(zone/A, zone/B)
+ get_edge(zone/A, turf/B)
+ Gets a valid connection_edge between A and B, creating a new one if necessary.
+
+ has_same_air(turf/A, turf/B)
+ Used to determine if an unsimulated edge represents a specific turf.
+ Simulated edges use connection_edge/contains_zone() for the same purpose.
+ Returns 1 if A has identical gases and temperature to B.
+
+ remove_edge(connection_edge/edge)
+ Called when an edge is erased. Removes it from processing.
+
+*/
+
+SUBSYSTEM_DEF(zas)
+ name = "ZAS"
+ priority = FIRE_PRIORITY_AIR
+ init_order = INIT_ORDER_AIR
+ flags = SS_POST_FIRE_TIMING
+
+ //The variable setting controller
+ var/zas_controller/settings
+ //XGM gas data
+ var/datum/xgm_gas_data/gas_data
+ //Geometry lists
+ var/list/zones = list()
+ var/list/edges = list()
+
+ //Pipenets
+ var/list/networks = list()
+ var/list/rebuild_queue = list()
+ var/list/expansion_queue = list()
+
+ //Atmos Machines
+ var/list/atmos_machinery = list()
+
+ //Geometry updates lists
+ var/list/tiles_to_update = list()
+ var/list/zones_to_update = list()
+ var/list/active_fire_zones = list()
+ var/list/active_hotspots = list()
+ var/list/active_edges = list()
+
+ var/tmp/list/deferred = list()
+ var/tmp/list/processing_edges
+ var/tmp/list/processing_fires
+ var/tmp/list/processing_hotspots
+ var/tmp/list/processing_zones
+
+ //Currently processing
+ var/list/curr_tiles
+ var/list/curr_defer
+ var/list/curr_edges
+ var/list/curr_fire
+ var/list/curr_hotspot
+ var/list/curr_zones
+ var/list/curr_machines
+
+
+ var/current_process = SSZAS_TILES
+ var/active_zones = 0
+ var/next_id = 1
+
+/datum/controller/subsystem/zas/proc/Reboot()
+ // Stop processing while we rebuild.
+ can_fire = FALSE
+
+ // Make sure we don't rebuild mid-tick.
+ if (state != SS_IDLE)
+ to_chat(world, bold_announce("ZAS Rebuild initiated. Waiting for current air tick to complete before continuing."))
+ while (state != SS_IDLE)
+ stoplag()
+
+ while (zones.len)
+ var/zone/zone = zones[zones.len]
+ zones.len--
+
+ zone.c_invalidate()
+
+ edges.Cut()
+ tiles_to_update.Cut()
+ zones_to_update.Cut()
+ active_fire_zones.Cut()
+ active_hotspots.Cut()
+ active_edges.Cut()
+
+ // Re-run setup without air settling.
+ Initialize(REALTIMEOFDAY, simulate = FALSE)
+
+ // Update next_fire so the MC doesn't try to make up for missed ticks.
+ next_fire = world.time + wait
+ can_fire = TRUE
+
+/datum/controller/subsystem/zas/stat_entry(msg)
+ if(!can_fire)
+ msg += "REBOOTING..."
+ else
+ msg += "TtU: [length(tiles_to_update)]"
+ msg += "ZtU: [length(zones_to_update)]"
+ msg += "AFZ: [length(active_fire_zones)]"
+ msg += "AH: [length(active_hotspots)]"
+ msg += "AE: [length(active_edges)]"
+ return ..()
+
+/datum/controller/subsystem/zas/Initialize(timeofday, simulate = TRUE)
+
+ var/starttime = REALTIMEOFDAY
+ settings = new
+ gas_data = new /datum/xgm_gas_data
+
+ to_chat(world, bold_announce("Processing Geometry..."))
+
+ var/simulated_turf_count = 0
+ for(var/turf/simulated/S)
+ simulated_turf_count++
+ S.update_air_properties()
+
+ CHECK_TICK
+
+ to_chat(world, bold_announce(
+ {"Total Simulated Turfs: [simulated_turf_count]
+ Total Zones: [zones.len]
+ Total Edges: [edges.len]
+ Total Active Edges: [active_edges.len ? "[active_edges.len]" : "None"]
+ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]"}
+ ))
+
+ to_chat(world, bold_announce("Geometry processing completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
+
+ if (simulate)
+ to_chat(world, bold_announce("Settling air..."))
+
+ starttime = REALTIMEOFDAY
+ fire(FALSE, TRUE)
+
+ to_chat(world, bold_announce("Air settling completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
+
+ ..(timeofday)
+
+/datum/controller/subsystem/zas/fire(resumed = FALSE)
+ if (!resumed)
+ processing_edges = active_edges.Copy()
+ processing_fires = active_fire_zones.Copy()
+ processing_hotspots = active_hotspots.Copy()
+
+
+ curr_machines = atmos_machinery
+ if(current_process == SSZAS_MACHINES)
+ while (curr_machines.len)
+ var/obj/machinery/atmospherics/current_machine = curr_machines[curr_machines.len]
+ curr_machines.len--
+
+ if(!current_machine)
+ atmos_machinery -= current_machine
+ if(current_machine.process_atmos() == PROCESS_KILL)
+ stop_processing_machine(current_machine)
+
+ if(MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_TILES
+ curr_tiles = tiles_to_update
+ if(current_process == SSZAS_TILES || !resumed)
+ while (curr_tiles.len)
+ var/turf/T = curr_tiles[curr_tiles.len]
+ curr_tiles.len--
+
+ if (!T)
+ if (MC_TICK_CHECK)
+ return
+ continue
+
+ //check if the turf is self-zone-blocked
+ var/c_airblock
+ ATMOS_CANPASS_TURF(c_airblock, T, T)
+ if(c_airblock & ZONE_BLOCKED)
+ deferred += T
+ if (MC_TICK_CHECK)
+ return
+ continue
+
+ T.update_air_properties()
+ T.post_update_air_properties()
+ T.needs_air_update = 0
+ #ifdef ZASDBG
+ T.overlays -= mark
+ updated++
+ #endif
+
+ if (MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_DEFERED_TILES
+ curr_defer = deferred
+ if(current_process == SSZAS_DEFERED_TILES)
+ while (curr_defer.len)
+ var/turf/T = curr_defer[curr_defer.len]
+ curr_defer.len--
+
+ T.update_air_properties()
+ T.post_update_air_properties()
+ T.needs_air_update = 0
+ #ifdef ZASDBG
+ T.overlays -= mark
+ updated++
+ #endif
+
+ if (MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_EDGES
+ curr_edges = processing_edges
+ if(current_process == SSZAS_EDGES)
+ while (curr_edges.len)
+ var/connection_edge/edge = curr_edges[curr_edges.len]
+ curr_edges.len--
+
+ if (!edge)
+ if (MC_TICK_CHECK)
+ return
+ continue
+
+ edge.tick()
+ if (MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_FIRES
+ curr_fire = processing_fires
+ if(current_process == SSZAS_FIRES)
+ while (curr_fire.len)
+ var/zone/Z = curr_fire[curr_fire.len]
+ curr_fire.len--
+
+ Z.process_fire()
+
+ if (MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_HOTSPOTS
+ curr_hotspot = processing_hotspots
+ if(current_process == SSZAS_HOTSPOTS)
+ while (curr_hotspot.len)
+ var/obj/fire/F = curr_hotspot[curr_hotspot.len]
+ curr_hotspot.len--
+
+ F.Process()
+
+ if (MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_ZONES
+ curr_zones = processing_zones
+ if(current_process == SSZAS_ZONES)
+ while (curr_zones.len)
+ var/zone/Z = curr_zones[curr_zones.len]
+ curr_zones.len--
+
+ Z.tick()
+ Z.needs_update = FALSE
+
+ if (MC_TICK_CHECK)
+ return
+
+ current_process = SSZAS_MACHINES
+
+/**
+ * Adds a given machine to the processing system for SSAIR_ATMOSMACHINERY processing.
+ *
+ * Arguments:
+ * * machine - The machine to start processing. Can be any /obj/machinery.
+ */
+/datum/controller/subsystem/zas/proc/start_processing_machine(obj/machinery/machine)
+ if(machine.atmos_processing)
+ return
+ if(QDELETED(machine))
+ stack_trace("We tried to add a garbage collecting machine to SSzas. Don't")
+ return
+ machine.atmos_processing = TRUE
+ atmos_machinery += machine
+
+/**
+ * Removes a given machine to the processing system for SSZAS_MACHINES processing.
+ *
+ * Arguments:
+ * * machine - The machine to stop processing.
+ */
+/datum/controller/subsystem/zas/proc/stop_processing_machine(obj/machinery/machine)
+ if(!machine.atmos_processing)
+ return
+ machine.atmos_processing = FALSE
+ atmos_machinery -= machine
+
+ // If we're currently processing atmos machines, there's a chance this machine is in
+ // the currentrun list, which is a cache of atmos_machinery. Remove it from that list
+ // as well to prevent processing qdeleted objects in the cache.
+ if(current_process == SSZAS_MACHINES)
+ curr_machines -= machine
+
+/datum/controller/subsystem/zas/proc/add_to_rebuild_queue(obj/machinery/atmospherics/atmos_machine)
+ if(istype(atmos_machine, /obj/machinery/atmospherics) && !atmos_machine.rebuilding)
+ rebuild_queue += atmos_machine
+ atmos_machine.rebuilding = TRUE
+
+/datum/controller/subsystem/zas/proc/add_to_expansion(datum/pipeline/line, starting_point)
+ var/list/new_packet = new(SSAIR_REBUILD_QUEUE)
+ new_packet[SSZAS_REBUILD_PIPELINE] = line
+ new_packet[SSZAS_REBUILD_QUEUE] = list(starting_point)
+ expansion_queue += list(new_packet)
+
+/datum/controller/subsystem/zas/proc/add_zone(zone/z)
+ zones += z
+ z.name = "Zone [next_id++]"
+ mark_zone_update(z)
+
+/datum/controller/subsystem/zas/proc/remove_zone(zone/z)
+ zones -= z
+ zones_to_update -= z
+ if (processing_zones)
+ processing_zones -= z
+
+/datum/controller/subsystem/zas/proc/air_blocked(turf/A, turf/B)
+ #ifdef ZASDBG
+ ASSERT(isturf(A))
+ ASSERT(isturf(B))
+ #endif
+ var/ablock
+ ATMOS_CANPASS_TURF(ablock, A, B)
+ if(ablock == BLOCKED)
+ return BLOCKED
+ ATMOS_CANPASS_TURF(., B, A)
+ return ablock | .
+
+/datum/controller/subsystem/zas/proc/merge(zone/A, zone/B)
+ #ifdef ZASDBG
+ ASSERT(istype(A))
+ ASSERT(istype(B))
+ ASSERT(!A.invalid)
+ ASSERT(!B.invalid)
+ ASSERT(A != B)
+ #endif
+ if(A.contents.len < B.contents.len)
+ A.c_merge(B)
+ mark_zone_update(B)
+ else
+ B.c_merge(A)
+ mark_zone_update(A)
+
+/datum/controller/subsystem/zas/proc/connect(turf/simulated/A, turf/simulated/B)
+ #ifdef ZASDBG
+ ASSERT(istype(A))
+ ASSERT(isturf(B))
+ ASSERT(A.zone)
+ ASSERT(!A.zone.invalid)
+ //ASSERT(B.zone)
+ ASSERT(A != B)
+ #endif
+
+ var/block = air_blocked(A,B)
+ if(block & AIR_BLOCKED) return
+
+ var/direct = !(block & ZONE_BLOCKED)
+ var/space = !istype(B)
+
+ if(!space)
+ if(min(A.zone.contents.len, B.zone.contents.len) < ZONE_MIN_SIZE || (direct && (equivalent_pressure(A.zone,B.zone) || times_fired == 0)))
+ merge(A.zone,B.zone)
+ return
+
+ var/a_to_b = get_dir(A,B)
+ var/b_to_a = get_dir(B,A)
+
+ if(!A.connections) A.connections = new
+ if(!B.connections) B.connections = new
+
+ if(A.connections.get(a_to_b))
+ return
+ if(B.connections.get(b_to_a))
+ return
+ if(!space)
+ if(A.zone == B.zone) return
+
+
+ var/connection/c = new /connection(A,B)
+
+ A.connections.place(c, a_to_b)
+ B.connections.place(c, b_to_a)
+
+ if(direct) c.mark_direct()
+
+/datum/controller/subsystem/zas/proc/mark_for_update(turf/T)
+ #ifdef ZASDBG
+ ASSERT(isturf(T))
+ #endif
+ if(T.needs_air_update)
+ return
+ tiles_to_update += T
+ #ifdef ZASDBG
+ T.overlays += mark
+ #endif
+ T.needs_air_update = 1
+
+/datum/controller/subsystem/zas/proc/mark_zone_update(zone/Z)
+ #ifdef ZASDBG
+ ASSERT(istype(Z))
+ #endif
+ if(Z.needs_update)
+ return
+ zones_to_update += Z
+ Z.needs_update = 1
+
+/datum/controller/subsystem/zas/proc/mark_edge_sleeping(connection_edge/E)
+ #ifdef ZASDBG
+ ASSERT(istype(E))
+ #endif
+ if(E.sleeping)
+ return
+ active_edges -= E
+ E.sleeping = 1
+
+/datum/controller/subsystem/zas/proc/mark_edge_active(connection_edge/E)
+ #ifdef ZASDBG
+ ASSERT(istype(E))
+ #endif
+ if(!E.sleeping)
+ return
+ active_edges += E
+ E.sleeping = 0
+
+/datum/controller/subsystem/zas/proc/equivalent_pressure(zone/A, zone/B)
+ return A.air.compare(B.air)
+
+/datum/controller/subsystem/zas/proc/get_edge(zone/A, zone/B)
+ if(istype(B))
+ for(var/connection_edge/zone/edge in A.edges)
+ if(edge.contains_zone(B))
+ return edge
+ var/connection_edge/edge = new/connection_edge/zone(A,B)
+ edges += edge
+ edge.recheck()
+ return edge
+ else
+ for(var/connection_edge/unsimulated/edge in A.edges)
+ if(has_same_air(edge.B,B))
+ return edge
+ var/connection_edge/edge = new/connection_edge/unsimulated(A,B)
+ edges += edge
+ edge.recheck()
+ return edge
+
+/datum/controller/subsystem/zas/proc/has_same_air(turf/A, turf/B)
+ if(A.initial_gas)
+ if(!B.initial_gas)
+ return 0
+ for(var/g in A.initial_gas)
+ if(A.initial_gas[g] != B.initial_gas[g])
+ return 0
+ if(B.initial_gas)
+ if(!A.initial_gas)
+ return 0
+ for(var/g in B.initial_gas)
+ if(A.initial_gas[g] != B.initial_gas[g])
+ return 0
+ if(A.temperature != B.temperature)
+ return 0
+ return 1
+
+/datum/controller/subsystem/zas/proc/remove_edge(connection_edge/E)
+ edges -= E
+ if(!E.sleeping)
+ active_edges -= E
+ if(processing_edges)
+ processing_edges -= E
diff --git a/code/modules/atmospherics/ZAS/Airflow.dm b/code/modules/atmospherics/ZAS/Airflow.dm
new file mode 100644
index 00000000000..49020e27a64
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Airflow.dm
@@ -0,0 +1,152 @@
+/*
+Contains helper procs for airflow, handled in /connection_group.
+*/
+
+mob/var/tmp/last_airflow_stun = 0
+mob/proc/airflow_stun()
+ if(stat == 2)
+ return 0
+ if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
+
+ if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
+ to_chat(src, "You stay upright as the air rushes past you.")
+ return 0
+ if(buckled)
+ to_chat(src, "Air suddenly rushes past you!")
+ return 0
+ if(!lying)
+ to_chat(src, "The sudden rush of air knocks you over!")
+ Weaken(5)
+ last_airflow_stun = world.time
+
+mob/living/silicon/airflow_stun()
+ return
+
+mob/living/carbon/slime/airflow_stun()
+ return
+
+mob/living/carbon/human/airflow_stun()
+ if(!slip_chance())
+ to_chat(src, "Air suddenly rushes past you!")
+ return 0
+ ..()
+
+atom/movable/proc/check_airflow_movable(n)
+
+ if(anchored && !ismob(src)) return 0
+
+ if(!isobj(src) && n < vsc.airflow_dense_pressure) return 0
+
+ return 1
+
+mob/check_airflow_movable(n)
+ if(n < vsc.airflow_heavy_pressure)
+ return 0
+ return 1
+
+mob/living/silicon/check_airflow_movable()
+ return 0
+
+
+obj/check_airflow_movable(n)
+ if(isnull(w_class))
+ if(n < vsc.airflow_dense_pressure) return 0 //most non-item objs don't have a w_class yet
+ else
+ switch(w_class)
+ if(1,2)
+ if(n < vsc.airflow_lightest_pressure) return 0
+ if(3)
+ if(n < vsc.airflow_light_pressure) return 0
+ if(4,5)
+ if(n < vsc.airflow_medium_pressure) return 0
+ if(6)
+ if(n < vsc.airflow_heavy_pressure) return 0
+ if(7 to INFINITY)
+ if(n < vsc.airflow_dense_pressure) return 0
+ return ..()
+
+
+/atom/movable/var/tmp/turf/airflow_dest
+/atom/movable/var/tmp/airflow_speed = 0
+/atom/movable/var/tmp/airflow_time = 0
+/atom/movable/var/tmp/last_airflow = 0
+/atom/movable/var/tmp/airborne_acceleration = 0
+
+/atom/movable/proc/AirflowCanMove(n)
+ return 1
+
+/mob/AirflowCanMove(n)
+ if(status_flags & GODMODE)
+ return 0
+ if(buckled)
+ return 0
+ var/obj/item/shoes = get_equipped_item(slot_shoes)
+ if(istype(shoes) && (shoes.item_flags & ITEM_FLAG_NOSLIP))
+ return 0
+ return 1
+
+/atom/movable/Bump(atom/A)
+ if(airflow_speed > 0 && airflow_dest)
+ if(airborne_acceleration > 1)
+ airflow_hit(A)
+ else if(istype(src, /mob/living/carbon/human))
+ to_chat(src, "You are pinned against [A] by airflow!")
+ airborne_acceleration = 0
+ else
+ airflow_speed = 0
+ airflow_time = 0
+ airborne_acceleration = 0
+ . = ..()
+
+atom/movable/proc/airflow_hit(atom/A)
+ airflow_speed = 0
+ airflow_dest = null
+ airborne_acceleration = 0
+
+mob/airflow_hit(atom/A)
+ for(var/mob/M in hearers(src))
+ M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2)
+ playsound(src.loc, "smash.ogg", 25, 1, -1)
+ var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
+ Weaken(weak_amt)
+ . = ..()
+
+obj/airflow_hit(atom/A)
+ for(var/mob/M in hearers(src))
+ M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2)
+ playsound(src.loc, "smash.ogg", 25, 1, -1)
+ . = ..()
+
+obj/item/airflow_hit(atom/A)
+ airflow_speed = 0
+ airflow_dest = null
+
+mob/living/carbon/human/airflow_hit(atom/A)
+// for(var/mob/M in hearers(src))
+// M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2)
+ playsound(src.loc, "punch", 25, 1, -1)
+ if (prob(33))
+ loc:add_blood(src)
+ bloody_body(src)
+ var/b_loss = min(airflow_speed, (airborne_acceleration*2)) * vsc.airflow_damage
+
+ apply_damage(b_loss/3, BRUTE, BP_HEAD, used_weapon = "Airflow")
+
+ apply_damage(b_loss/3, BRUTE, BP_CHEST, used_weapon = "Airflow")
+
+ apply_damage(b_loss/3, BRUTE, BP_GROIN, used_weapon = "Airflow")
+
+ if(airflow_speed > 10)
+ Paralyse(round(airflow_speed * vsc.airflow_stun))
+ Stun(paralysis + 3)
+ else
+ Stun(round(airflow_speed * vsc.airflow_stun/2))
+ . = ..()
+
+zone/proc/movables()
+ . = list()
+ for(var/turf/T in contents)
+ for(var/atom/movable/A in T)
+ if(!A.simulated || A.anchored || istype(A, /obj/effect) || isobserver(A))
+ continue
+ . += A
diff --git a/code/modules/atmospherics/ZAS/Atom.dm b/code/modules/atmospherics/ZAS/Atom.dm
new file mode 100644
index 00000000000..fdf263052e7
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Atom.dm
@@ -0,0 +1,59 @@
+
+/atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
+ //Purpose: Determines if the object (or airflow) can pass this atom.
+ //Called by: Movement, airflow.
+ //Inputs: The moving atom (optional), target turf, "height" and air group
+ //Outputs: Boolean if can pass.
+
+ return (!density || !height || air_group)
+
+/turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
+ if(!target) return 0
+
+ if(istype(mover)) // turf/Enter(...) will perform more advanced checks
+ return !density
+
+ else // Now, doing more detailed checks for air movement and air group formation
+ if(target.blocks_air||blocks_air)
+ return 0
+
+ for(var/obj/obstacle in src)
+ if(!obstacle.CanPass(mover, target, height, air_group))
+ return 0
+ if(target != src)
+ for(var/obj/obstacle in target)
+ if(!obstacle.CanPass(mover, src, height, air_group))
+ return 0
+
+ return 1
+
+//Convenience function for atoms to update turfs they occupy
+/atom/movable/proc/update_nearby_tiles(need_rebuild)
+ for(var/turf/simulated/turf in locs)
+ SSair.mark_for_update(turf)
+
+ return 1
+
+//Basically another way of calling CanPass(null, other, 0, 0) and CanPass(null, other, 1.5, 1).
+//Returns:
+// 0 - Not blocked
+// AIR_BLOCKED - Blocked
+// ZONE_BLOCKED - Not blocked, but zone boundaries will not cross.
+// BLOCKED - Blocked, zone boundaries will not cross even if opened.
+atom/proc/c_airblock(turf/other)
+ #ifdef ZASDBG
+ ASSERT(isturf(other))
+ #endif
+ return (AIR_BLOCKED*!CanPass(null, other, 0, 0))|(ZONE_BLOCKED*!CanPass(null, other, 1.5, 1))
+
+// This is a legacy proc only here for compatibility - you probably should just use ATMOS_CANPASS_TURF directly.
+turf/c_airblock(turf/other)
+ #ifdef ZASDBG
+ ASSERT(isturf(other))
+ #endif
+
+ . = 0
+ ATMOS_CANPASS_TURF(., src, other)
+
+/atom/movable
+ var/atmos_canpass = CANPASS_ALWAYS
diff --git a/code/modules/atmospherics/ZAS/Connection.dm b/code/modules/atmospherics/ZAS/Connection.dm
new file mode 100644
index 00000000000..17c8ea16281
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Connection.dm
@@ -0,0 +1,168 @@
+#define CONNECTION_DIRECT 2
+#define CONNECTION_SPACE 4
+#define CONNECTION_INVALID 8
+
+/*
+
+Overview:
+ Connections are made between turfs by SSair.connect(). They represent a single point where two zones converge.
+
+Class Vars:
+ A - Always a simulated turf.
+ B - A simulated or unsimulated turf.
+
+ zoneA - The archived zone of A. Used to check that the zone hasn't changed.
+ zoneB - The archived zone of B. May be null in case of unsimulated connections.
+
+ edge - Stores the edge this connection is in. Can reference an edge that is no longer processed
+ after this connection is removed, so make sure to check edge.coefficient > 0 before re-adding it.
+
+Class Procs:
+
+ mark_direct()
+ Marks this connection as direct. Does not update the edge.
+ Called when the connection is made and there are no doors between A and B.
+ Also called by update() as a correction.
+
+ mark_indirect()
+ Unmarks this connection as direct. Does not update the edge.
+ Called by update() as a correction.
+
+ mark_space()
+ Marks this connection as unsimulated. Updating the connection will check the validity of this.
+ Called when the connection is made.
+ This will not be called as a correction, any connections failing a check against this mark are erased and rebuilt.
+
+ direct()
+ Returns 1 if no doors are in between A and B.
+
+ valid()
+ Returns 1 if the connection has not been erased.
+
+ erase()
+ Called by update() and connection_manager/erase_all().
+ Marks the connection as erased and removes it from its edge.
+
+ update()
+ Called by connection_manager/update_all().
+ Makes numerous checks to decide whether the connection is still valid. Erases it automatically if not.
+
+*/
+
+/connection/var/turf/simulated/A
+/connection/var/turf/simulated/B
+/connection/var/zone/zoneA
+/connection/var/zone/zoneB
+
+/connection/var/connection_edge/edge
+
+/connection/var/state = 0
+
+/connection/New(turf/simulated/A, turf/simulated/B)
+ #ifdef ZASDBG
+ ASSERT(SSair.has_valid_zone(A))
+ //ASSERT(SSair.has_valid_zone(B))
+ #endif
+ src.A = A
+ src.B = B
+ zoneA = A.zone
+ if(!istype(B))
+ mark_space()
+ edge = SSair.get_edge(A.zone,B)
+ edge.add_connection(src)
+ else
+ zoneB = B.zone
+ edge = SSair.get_edge(A.zone,B.zone)
+ edge.add_connection(src)
+
+/connection/proc/mark_direct()
+ if(!direct())
+ state |= CONNECTION_DIRECT
+ edge.direct++
+// log_debug("Marked direct.")
+
+/connection/proc/mark_indirect()
+ if(direct())
+ state &= ~CONNECTION_DIRECT
+ edge.direct--
+// log_debug("Marked indirect.")
+
+/connection/proc/mark_space()
+ state |= CONNECTION_SPACE
+
+/connection/proc/direct()
+ return (state & CONNECTION_DIRECT)
+
+/connection/proc/valid()
+ return !(state & CONNECTION_INVALID)
+
+/connection/proc/erase()
+ edge.remove_connection(src)
+ state |= CONNECTION_INVALID
+// log_debug("Connection Erased: [state]")
+
+/connection/proc/update()
+// log_debug("Updated, \...")
+ if(!istype(A,/turf/simulated))
+// log_debug("Invalid A.")
+ erase()
+ return
+
+ var/block_status = SSair.air_blocked(A,B)
+ if(block_status & AIR_BLOCKED)
+// log_debug("Blocked connection.")
+ erase()
+ return
+ else if(block_status & ZONE_BLOCKED)
+ mark_indirect()
+ else
+ mark_direct()
+
+ var/b_is_space = !istype(B,/turf/simulated)
+
+ if(state & CONNECTION_SPACE)
+ if(!b_is_space)
+// log_debug("Invalid B.")
+ erase()
+ return
+ if(A.zone != zoneA)
+// log_debug("Zone changed, \...")
+ if(!A.zone)
+ erase()
+// log_debug("erased.")
+ return
+ else
+ edge.remove_connection(src)
+ edge = SSair.get_edge(A.zone, B)
+ edge.add_connection(src)
+ zoneA = A.zone
+
+// log_debug("valid.")
+ return
+
+ else if(b_is_space)
+// log_debug("Invalid B.")
+ erase()
+ return
+
+ if(A.zone == B.zone)
+// log_debug("A == B")
+ erase()
+ return
+
+ if(A.zone != zoneA || (zoneB && (B.zone != zoneB)))
+
+// log_debug("Zones changed, \...")
+ if(A.zone && B.zone)
+ edge.remove_connection(src)
+ edge = SSair.get_edge(A.zone, B.zone)
+ edge.add_connection(src)
+ zoneA = A.zone
+ zoneB = B.zone
+ else
+// log_debug("erased.")
+ erase()
+ return
+
+
+// log_debug("valid.")
\ No newline at end of file
diff --git a/code/modules/atmospherics/ZAS/ConnectionGroup.dm b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
new file mode 100644
index 00000000000..17249aae155
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
@@ -0,0 +1,260 @@
+/*
+
+Overview:
+ These are what handle gas transfers between zones and into space.
+ They are found in a zone's edges list and in SSair.edges.
+ Each edge updates every air tick due to their role in gas transfer.
+ They come in two flavors, /connection_edge/zone and /connection_edge/unsimulated.
+ As the type names might suggest, they handle inter-zone and spacelike connections respectively.
+
+Class Vars:
+
+ A - This always holds a zone. In unsimulated edges, it holds the only zone.
+
+ connecting_turfs - This holds a list of connected turfs, mainly for the sake of airflow.
+
+ coefficent - This is a marker for how many connections are on this edge. Used to determine the ratio of flow.
+
+ connection_edge/zone
+
+ B - This holds the second zone with which the first zone equalizes.
+
+ direct - This counts the number of direct (i.e. with no doors) connections on this edge.
+ Any value of this is sufficient to make the zones mergeable.
+
+ connection_edge/unsimulated
+
+ B - This holds an unsimulated turf which has the gas values this edge is mimicing.
+
+ air - Retrieved from B on creation and used as an argument for the legacy ShareSpace() proc.
+
+Class Procs:
+
+ add_connection(connection/c)
+ Adds a connection to this edge. Usually increments the coefficient and adds a turf to connecting_turfs.
+
+ remove_connection(connection/c)
+ Removes a connection from this edge. This works even if c is not in the edge, so be careful.
+ If the coefficient reaches zero as a result, the edge is erased.
+
+ contains_zone(zone/Z)
+ Returns true if either A or B is equal to Z. Unsimulated connections return true only on A.
+
+ erase()
+ Removes this connection from processing and zone edge lists.
+
+ tick()
+ Called every air tick on edges in the processing list. Equalizes gas.
+
+ flow(list/movable, differential, repelled)
+ Airflow proc causing all objects in movable to be checked against a pressure differential.
+ If repelled is true, the objects move away from any turf in connecting_turfs, otherwise they approach.
+ A check against vsc.lightest_airflow_pressure should generally be performed before calling this.
+
+ get_connected_zone(zone/from)
+ Helper proc that allows getting the other zone of an edge given one of them.
+ Only on /connection_edge/zone, otherwise use A.
+
+*/
+
+
+/connection_edge/var/zone/A
+
+/connection_edge/var/list/connecting_turfs = list()
+/connection_edge/var/direct = 0
+/connection_edge/var/sleeping = 1
+
+/connection_edge/var/coefficient = 0
+
+/connection_edge/New()
+ CRASH("Cannot make connection edge without specifications.")
+
+/connection_edge/proc/add_connection(connection/c)
+ coefficient++
+ if(c.direct()) direct++
+// log_debug("Connection added: [type] Coefficient: [coefficient]")
+
+
+/connection_edge/proc/remove_connection(connection/c)
+// log_debug("Connection removed: [type] Coefficient: [coefficient-1]")
+
+ coefficient--
+ if(coefficient <= 0)
+ erase()
+ if(c.direct()) direct--
+
+/connection_edge/proc/contains_zone(zone/Z)
+
+/connection_edge/proc/erase()
+ SSair.remove_edge(src)
+// log_debug("[type] Erased.")
+
+
+/connection_edge/proc/tick()
+
+/connection_edge/proc/recheck()
+
+/connection_edge/proc/flow(list/movable, differential, repelled)
+ for(var/i = 1; i <= movable.len; i++)
+ var/atom/movable/M = movable[i]
+
+ //If they're already being tossed, don't do it again.
+ if(M.last_airflow > world.time - vsc.airflow_delay) continue
+ if(M.airflow_speed) continue
+
+ //Check for knocking people over
+ if(ismob(M) && differential > vsc.airflow_stun_pressure)
+ if(M:status_flags & GODMODE) continue
+ M:airflow_stun()
+
+ if(M.check_airflow_movable(differential))
+ //Check for things that are in range of the midpoint turfs.
+ var/list/close_turfs = list()
+ for(var/turf/U in connecting_turfs)
+ if(get_dist(M,U) < world.view) close_turfs += U
+ if(!close_turfs.len) continue
+
+ M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards.
+
+ if(repelled) spawn if(M) M.RepelAirflowDest(differential/5)
+ else spawn if(M) M.GotoAirflowDest(differential/10)
+
+
+
+
+/connection_edge/zone/var/zone/B
+
+/connection_edge/zone/New(zone/A, zone/B)
+
+ src.A = A
+ src.B = B
+ A.edges.Add(src)
+ B.edges.Add(src)
+ //id = edge_id(A,B)
+// log_debug("New edge between [A] and [B]")
+
+
+/connection_edge/zone/add_connection(connection/c)
+ . = ..()
+ connecting_turfs.Add(c.A)
+
+/connection_edge/zone/remove_connection(connection/c)
+ connecting_turfs.Remove(c.A)
+ . = ..()
+
+/connection_edge/zone/contains_zone(zone/Z)
+ return A == Z || B == Z
+
+/connection_edge/zone/erase()
+ A.edges.Remove(src)
+ B.edges.Remove(src)
+ . = ..()
+
+/connection_edge/zone/tick()
+ if(A.invalid || B.invalid)
+ erase()
+ return
+
+ var/equiv = A.air.share_ratio(B.air, coefficient)
+
+ var/differential = A.air.return_pressure() - B.air.return_pressure()
+ if(abs(differential) >= vsc.airflow_lightest_pressure)
+ var/list/attracted
+ var/list/repelled
+ if(differential > 0)
+ attracted = A.movables()
+ repelled = B.movables()
+ else
+ attracted = B.movables()
+ repelled = A.movables()
+
+ flow(attracted, abs(differential), 0)
+ flow(repelled, abs(differential), 1)
+
+ if(equiv)
+ if(direct)
+ erase()
+ SSair.merge(A, B)
+ return
+ else
+ A.air.equalize(B.air)
+ SSair.mark_edge_sleeping(src)
+
+ SSair.mark_zone_update(A)
+ SSair.mark_zone_update(B)
+
+/connection_edge/zone/recheck()
+ if(!A.air.compare(B.air, vacuum_exception = 1))
+ // Edges with only one side being vacuum need processing no matter how close.
+ SSair.mark_edge_active(src)
+
+//Helper proc to get connections for a zone.
+/connection_edge/zone/proc/get_connected_zone(zone/from)
+ if(A == from) return B
+ else return A
+
+/connection_edge/unsimulated/var/turf/B
+/connection_edge/unsimulated/var/datum/gas_mixture/air
+
+/connection_edge/unsimulated/New(zone/A, turf/B)
+ src.A = A
+ src.B = B
+ A.edges.Add(src)
+ air = B.return_air()
+ //id = 52*A.id
+// log_debug("New edge from [A] to [B].")
+
+
+/connection_edge/unsimulated/add_connection(connection/c)
+ . = ..()
+ connecting_turfs.Add(c.B)
+ air.group_multiplier = coefficient
+
+/connection_edge/unsimulated/remove_connection(connection/c)
+ connecting_turfs.Remove(c.B)
+ air.group_multiplier = coefficient
+ . = ..()
+
+/connection_edge/unsimulated/erase()
+ A.edges.Remove(src)
+ . = ..()
+
+/connection_edge/unsimulated/contains_zone(zone/Z)
+ return A == Z
+
+/connection_edge/unsimulated/tick()
+ if(A.invalid)
+ erase()
+ return
+
+ var/equiv = A.air.share_space(air)
+
+ var/differential = A.air.return_pressure() - air.return_pressure()
+ if(abs(differential) >= vsc.airflow_lightest_pressure)
+ var/list/attracted = A.movables()
+ flow(attracted, abs(differential), differential < 0)
+
+ if(equiv)
+ A.air.copy_from(air)
+ SSair.mark_edge_sleeping(src)
+
+ SSair.mark_zone_update(A)
+
+/connection_edge/unsimulated/recheck()
+ // Edges with only one side being vacuum need processing no matter how close.
+ // Note: This handles the glaring flaw of a room holding pressure while exposed to space, but
+ // does not specially handle the less common case of a simulated room exposed to an unsimulated pressurized turf.
+ if(!A.air.compare(air, vacuum_exception = 1))
+ SSair.mark_edge_active(src)
+
+proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
+ //This implements a simplistic version of the Stefan-Boltzmann law.
+ var/energy_delta = ((A.temperature - B.temperature) ** 4) * STEFAN_BOLTZMANN_CONSTANT * connecting_tiles * 2.5
+ var/maximum_energy_delta = max(0, min(A.temperature * A.heat_capacity() * A.group_multiplier, B.temperature * B.heat_capacity() * B.group_multiplier))
+ if(maximum_energy_delta > abs(energy_delta))
+ if(energy_delta < 0)
+ maximum_energy_delta *= -1
+ energy_delta = maximum_energy_delta
+
+ A.temperature -= energy_delta / (A.heat_capacity() * A.group_multiplier)
+ B.temperature += energy_delta / (B.heat_capacity() * B.group_multiplier)
diff --git a/code/modules/atmospherics/ZAS/ConnectionManager.dm b/code/modules/atmospherics/ZAS/ConnectionManager.dm
new file mode 100644
index 00000000000..3890cd85f5c
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/ConnectionManager.dm
@@ -0,0 +1,105 @@
+/*
+
+Overview:
+ The connection_manager class stores connections in each cardinal direction on a turf.
+ It isn't always present if a turf has no connections, check if(connections) before using.
+ Contains procs for mass manipulation of connection data.
+
+Class Vars:
+
+ NSEWUD - Connections to this turf in each cardinal direction.
+
+Class Procs:
+
+ get(d)
+ Returns the connection (if any) in this direction.
+ Preferable to accessing the connection directly because it checks validity.
+
+ place(connection/c, d)
+ Called by air_master.connect(). Sets the connection in the specified direction to c.
+
+ update_all()
+ Called after turf/update_air_properties(). Updates the validity of all connections on this turf.
+
+ erase_all()
+ Called when the turf is changed with ChangeTurf(). Erases all existing connections.
+
+Macros:
+ check(connection/c)
+ Checks for connection validity. It's possible to have a reference to a connection that has been erased.
+
+
+*/
+
+// macro-ized to cut down on proc calls
+#define check(c) (c && c.valid())
+
+/turf/var/tmp/connection_manager/connections
+
+/connection_manager/var/connection/N
+/connection_manager/var/connection/S
+/connection_manager/var/connection/E
+/connection_manager/var/connection/W
+
+#ifdef MULTIZAS
+/connection_manager/var/connection/U
+/connection_manager/var/connection/D
+#endif
+
+/connection_manager/proc/get(d)
+ switch(d)
+ if(NORTH)
+ if(check(N)) return N
+ else return null
+ if(SOUTH)
+ if(check(S)) return S
+ else return null
+ if(EAST)
+ if(check(E)) return E
+ else return null
+ if(WEST)
+ if(check(W)) return W
+ else return null
+
+ #ifdef MULTIZAS
+ if(UP)
+ if(check(U)) return U
+ else return null
+ if(DOWN)
+ if(check(D)) return D
+ else return null
+ #endif
+
+/connection_manager/proc/place(connection/c, d)
+ switch(d)
+ if(NORTH) N = c
+ if(SOUTH) S = c
+ if(EAST) E = c
+ if(WEST) W = c
+
+ #ifdef MULTIZAS
+ if(UP) U = c
+ if(DOWN) D = c
+ #endif
+
+/connection_manager/proc/update_all()
+ if(check(N)) N.update()
+ if(check(S)) S.update()
+ if(check(E)) E.update()
+ if(check(W)) W.update()
+ #ifdef MULTIZAS
+ if(check(U)) U.update()
+ if(check(D)) D.update()
+ #endif
+
+/connection_manager/proc/erase_all()
+ if(check(N)) N.erase()
+ if(check(S)) S.erase()
+ if(check(E)) E.erase()
+ if(check(W)) W.erase()
+ #ifdef MULTIZAS
+ if(check(U)) U.erase()
+ if(check(D)) D.erase()
+ #endif
+
+#undef check
diff --git a/code/modules/atmospherics/ZAS/Debug.dm b/code/modules/atmospherics/ZAS/Debug.dm
new file mode 100644
index 00000000000..6f0a67fd3eb
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Debug.dm
@@ -0,0 +1,20 @@
+var/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned")
+var/image/created = image('icons/Testing/Zone.dmi', icon_state = "created")
+var/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged")
+var/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid")
+var/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block")
+var/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock")
+var/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock")
+var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark")
+
+/connection_edge/var/dbg_out = 0
+
+/turf/var/tmp/dbg_img
+/turf/proc/dbg(image/img, d = 0)
+ if(d > 0) img.dir = d
+ overlays -= dbg_img
+ overlays += img
+ dbg_img = img
+
+proc/soft_assert(thing,fail)
+ if(!thing) message_admins(fail)
\ No newline at end of file
diff --git a/code/modules/atmospherics/ZAS/Diagnostic.dm b/code/modules/atmospherics/ZAS/Diagnostic.dm
new file mode 100644
index 00000000000..4433dfefdd8
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Diagnostic.dm
@@ -0,0 +1,82 @@
+client/proc/Zone_Info(turf/T as null|turf)
+ set category = "Debug"
+ if(T)
+ if(istype(T,/turf/simulated) && T:zone)
+ T:zone:dbg_data(src)
+ else
+ to_chat(mob, "No zone here.")
+ var/datum/gas_mixture/mix = T.return_air()
+ to_chat(mob, "[mix.return_pressure()] kPa [mix.temperature]C")
+ for(var/g in mix.gas)
+ to_chat(mob, "[g]: [mix.gas[g]]\n")
+ else
+ if(zone_debug_images)
+ for(var/zone in zone_debug_images)
+ images -= zone_debug_images[zone]
+ zone_debug_images = null
+
+client/var/list/zone_debug_images
+
+client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf)
+ set category = "Debug"
+ if(!istype(T))
+ return
+
+ var/direction_list = list(\
+ "North" = NORTH,\
+ "South" = SOUTH,\
+ "East" = EAST,\
+ "West" = WEST,\
+ #ifdef MULTIZAS
+ "Up" = UP,\
+ "Down" = DOWN,\
+ #endif
+ "N/A" = null)
+ var/direction = input("What direction do you wish to test?","Set direction") as null|anything in direction_list
+ if(!direction)
+ return
+
+ if(direction == "N/A")
+ if(!(T.c_airblock(T) & AIR_BLOCKED))
+ to_chat(mob, "The turf can pass air! :D")
+ else
+ to_chat(mob, "No air passage :x")
+ return
+
+ var/turf/simulated/other_turf = get_step(T, direction_list[direction])
+ if(!istype(other_turf))
+ return
+
+ var/t_block = T.c_airblock(other_turf)
+ var/o_block = other_turf.c_airblock(T)
+
+ if(o_block & AIR_BLOCKED)
+ if(t_block & AIR_BLOCKED)
+ to_chat(mob, "Neither turf can connect. :(")
+
+ else
+ to_chat(mob, "The initial turf only can connect. :\\")
+ else
+ if(t_block & AIR_BLOCKED)
+ to_chat(mob, "The other turf can connect, but not the initial turf. :/")
+
+ else
+ to_chat(mob, "Both turfs can connect! :)")
+
+ to_chat(mob, "Additionally, \...")
+
+ if(o_block & ZONE_BLOCKED)
+ if(t_block & ZONE_BLOCKED)
+ to_chat(mob, "neither turf can merge.")
+ else
+ to_chat(mob, "the other turf cannot merge.")
+ else
+ if(t_block & ZONE_BLOCKED)
+ to_chat(mob, "the initial turf cannot merge.")
+ else
+ to_chat(mob, "both turfs can merge.")
+
+client/proc/ZASSettings()
+ set category = "Debug"
+
+ vsc.SetDefault(mob)
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
new file mode 100644
index 00000000000..477714c2c76
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -0,0 +1,443 @@
+/*
+
+Making Bombs with ZAS:
+Get gas to react in an air tank so that it gains pressure. If it gains enough pressure, it goes boom.
+The more pressure, the more boom.
+If it gains pressure too slowly, it may leak or just rupture instead of exploding.
+*/
+
+//#define FIREDBG
+
+/turf/var/obj/fire/fire = null
+
+//Some legacy definitions so fires can be started.
+atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return null
+
+/atom/movable/proc/is_burnable()
+ return FALSE
+
+/mob/is_burnable()
+ return simulated
+
+turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
+
+
+/turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
+ if(fire_protection > world.time-300)
+ return 0
+ if(locate(/obj/fire) in src)
+ return 1
+ var/datum/gas_mixture/air_contents = return_air()
+ if(!air_contents || exposed_temperature < PHORON_MINIMUM_BURN_TEMPERATURE)
+ return 0
+
+ var/igniting = 0
+ var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in src
+
+ if(air_contents.check_combustability(liquid))
+ igniting = 1
+
+ create_fire(exposed_temperature)
+ return igniting
+
+/zone/proc/process_fire()
+ var/datum/gas_mixture/burn_gas = air.remove_ratio(vsc.fire_consuption_rate, fire_tiles.len)
+
+ var/firelevel = burn_gas.react(src, fire_tiles, force_burn = 1, no_check = 1)
+
+ air.merge(burn_gas)
+
+ if(firelevel)
+ for(var/turf/T in fire_tiles)
+ if(T.fire)
+ T.fire.firelevel = firelevel
+ else
+ var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
+ fire_tiles -= T
+ fuel_objs -= fuel
+ else
+ for(var/turf/simulated/T in fire_tiles)
+ if(istype(T.fire))
+ qdel(T.fire)
+ fire_tiles.Cut()
+ fuel_objs.Cut()
+
+ if(!fire_tiles.len)
+ SSair.active_fire_zones.Remove(src)
+
+/zone/proc/remove_liquidfuel(var/used_liquid_fuel, var/remove_fire=0)
+ if(!fuel_objs.len)
+ return
+
+ //As a simplification, we remove fuel equally from all fuel sources. It might be that some fuel sources have more fuel,
+ //some have less, but whatever. It will mean that sometimes we will remove a tiny bit less fuel then we intended to.
+
+ var/fuel_to_remove = used_liquid_fuel/(fuel_objs.len*LIQUIDFUEL_AMOUNT_TO_MOL) //convert back to liquid volume units
+
+ for(var/O in fuel_objs)
+ var/obj/effect/decal/cleanable/liquid_fuel/fuel = O
+ if(!istype(fuel))
+ fuel_objs -= fuel
+ continue
+
+ fuel.amount -= fuel_to_remove
+ if(fuel.amount <= 0)
+ fuel_objs -= fuel
+ if(remove_fire)
+ var/turf/T = fuel.loc
+ if(istype(T) && T.fire) qdel(T.fire)
+ qdel(fuel)
+
+/turf/proc/create_fire(fl)
+ return 0
+
+/turf/simulated/create_fire(fl)
+
+ if(submerged())
+ return 1
+
+ if(fire)
+ fire.firelevel = max(fl, fire.firelevel)
+ return 1
+
+ if(!zone)
+ return 1
+
+ fire = new(src, fl)
+ SSair.active_fire_zones |= zone
+
+ var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in src
+ zone.fire_tiles |= src
+ if(fuel) zone.fuel_objs += fuel
+
+ return 0
+
+/obj/fire
+ //Icon for fire on turfs.
+
+ anchored = TRUE
+ mouse_opacity = 0
+
+ blend_mode = BLEND_ADD
+
+ icon = 'icons/effects/fire.dmi'
+ icon_state = "1"
+ light_color = "#ed9200"
+ layer = FIRE_LAYER
+
+ var/firelevel = 1 //Calculated by gas_mixture.calculate_firelevel()
+
+/obj/fire/Process()
+ . = 1
+
+ var/turf/simulated/my_tile = loc
+ if(!istype(my_tile) || !my_tile.zone || my_tile.submerged())
+ if(my_tile && my_tile.fire == src)
+ my_tile.fire = null
+ qdel(src)
+ return PROCESS_KILL
+
+ var/datum/gas_mixture/air_contents = my_tile.return_air()
+
+ if(firelevel > 6)
+ icon_state = "3"
+ set_light(1, 2, 7)
+ else if(firelevel > 2.5)
+ icon_state = "2"
+ set_light(0.7, 2, 5)
+ else
+ icon_state = "1"
+ set_light(0.5, 1, 3)
+
+ for(var/mob/living/L in loc)
+ L.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure()) //Burn the mobs!
+
+ loc.fire_act(air_contents, air_contents.temperature, air_contents.volume)
+ for(var/atom/A in loc)
+ A.fire_act(air_contents, air_contents.temperature, air_contents.volume)
+
+ //spread
+ for(var/direction in GLOB.cardinal)
+ var/turf/simulated/enemy_tile = get_step(my_tile, direction)
+
+ if(istype(enemy_tile))
+ if(my_tile.open_directions & direction) //Grab all valid bordering tiles
+ if(!enemy_tile.zone || enemy_tile.fire)
+ continue
+
+ //if(!enemy_tile.zone.fire_tiles.len) TODO - optimize
+ var/datum/gas_mixture/acs = enemy_tile.return_air()
+ var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in enemy_tile
+ if(!acs || !acs.check_combustability(liquid))
+ continue
+
+ //If extinguisher mist passed over the turf it's trying to spread to, don't spread and
+ //reduce firelevel.
+ if(enemy_tile.fire_protection > world.time-30)
+ firelevel -= 1.5
+ continue
+
+ //Spread the fire.
+ if(prob( 50 + 50 * (firelevel/vsc.fire_firelevel_multiplier) ) && my_tile.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, my_tile, 0,0))
+ enemy_tile.create_fire(firelevel)
+
+ else
+ enemy_tile.adjacent_fire_act(loc, air_contents, air_contents.temperature, air_contents.volume)
+
+ animate(src, color = fire_color(air_contents.temperature), 5)
+ set_light(l_color = color)
+
+/obj/fire/New(newLoc,fl)
+ ..()
+
+ if(!istype(loc, /turf))
+ qdel(src)
+ return
+
+ set_dir(pick(GLOB.cardinal))
+
+ var/datum/gas_mixture/air_contents = loc.return_air()
+ color = fire_color(air_contents.temperature)
+ set_light(0.5, 1, 3, l_color = color)
+
+ firelevel = fl
+ SSair.active_hotspots.Add(src)
+
+/obj/fire/proc/fire_color(var/env_temperature)
+ var/temperature = max(4000*sqrt(firelevel/vsc.fire_firelevel_multiplier), env_temperature)
+ return heat2color(temperature)
+
+/obj/fire/Destroy()
+ var/turf/T = loc
+ if (istype(T))
+ set_light(0)
+ T.fire = null
+ SSair.active_hotspots.Remove(src)
+ . = ..()
+
+/turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again.
+/turf/proc/apply_fire_protection()
+/turf/simulated/apply_fire_protection()
+ fire_protection = world.time
+
+//Returns the firelevel
+/datum/gas_mixture/proc/react(zone/zone, force_burn, no_check = 0)
+ . = 0
+ if((temperature > PHORON_MINIMUM_BURN_TEMPERATURE || force_burn) && (no_check ||check_recombustability(zone? zone.fuel_objs : null)))
+
+ #ifdef FIREDBG
+ log_debug("***************** FIREDBG *****************")
+ log_debug("Burning [zone? zone.name : "zoneless gas_mixture"]!")
+ #endif
+
+ var/gas_fuel = 0
+ var/liquid_fuel = 0
+ var/total_fuel = 0
+ var/total_oxidizers = 0
+
+ //*** Get the fuel and oxidizer amounts
+ for(var/g in gas)
+ if(gas_data.flags[g] & XGM_GAS_FUEL)
+ gas_fuel += gas[g]
+ if(gas_data.flags[g] & XGM_GAS_OXIDIZER)
+ total_oxidizers += gas[g]
+ gas_fuel *= group_multiplier
+ total_oxidizers *= group_multiplier
+
+ //Liquid Fuel
+ var/fuel_area = 0
+ if(zone)
+ for(var/obj/effect/decal/cleanable/liquid_fuel/fuel in zone.fuel_objs)
+ liquid_fuel += fuel.amount*LIQUIDFUEL_AMOUNT_TO_MOL
+ fuel_area++
+
+ total_fuel = gas_fuel + liquid_fuel
+ if(total_fuel <= 0.005)
+ return 0
+
+ //*** Determine how fast the fire burns
+
+ //get the current thermal energy of the gas mix
+ //this must be taken here to prevent the addition or deletion of energy by a changing heat capacity
+ var/starting_energy = temperature * heat_capacity()
+
+ //determine how far the reaction can progress
+ var/reaction_limit = min(total_oxidizers*(FIRE_REACTION_FUEL_AMOUNT/FIRE_REACTION_OXIDIZER_AMOUNT), total_fuel) //stoichiometric limit
+
+ //vapour fuels are extremely volatile! The reaction progress is a percentage of the total fuel (similar to old zburn).)
+ var/gas_firelevel = calculate_firelevel(gas_fuel, total_oxidizers, reaction_limit, volume*group_multiplier) / vsc.fire_firelevel_multiplier
+ var/min_burn = 0.30*volume*group_multiplier/CELL_VOLUME //in moles - so that fires with very small gas concentrations burn out fast
+ var/gas_reaction_progress = min(max(min_burn, gas_firelevel*gas_fuel)*FIRE_GAS_BURNRATE_MULT, gas_fuel)
+
+ //liquid fuels are not as volatile, and the reaction progress depends on the size of the area that is burning. Limit the burn rate to a certain amount per area.
+ var/liquid_firelevel = calculate_firelevel(liquid_fuel, total_oxidizers, reaction_limit, 0) / vsc.fire_firelevel_multiplier
+ var/liquid_reaction_progress = min((liquid_firelevel*0.2 + 0.05)*fuel_area*FIRE_LIQUID_BURNRATE_MULT, liquid_fuel)
+
+ var/firelevel = (gas_fuel*gas_firelevel + liquid_fuel*liquid_firelevel)/total_fuel
+
+ var/total_reaction_progress = gas_reaction_progress + liquid_reaction_progress
+ var/used_fuel = min(total_reaction_progress, reaction_limit)
+ var/used_oxidizers = used_fuel*(FIRE_REACTION_OXIDIZER_AMOUNT/FIRE_REACTION_FUEL_AMOUNT)
+
+ #ifdef FIREDBG
+ log_debug("gas_fuel = [gas_fuel], liquid_fuel = [liquid_fuel], total_oxidizers = [total_oxidizers]")
+ log_debug("fuel_area = [fuel_area], total_fuel = [total_fuel], reaction_limit = [reaction_limit]")
+ log_debug("firelevel -> [firelevel] (gas: [gas_firelevel], liquid: [liquid_firelevel])")
+ log_debug("liquid_reaction_progress = [liquid_reaction_progress]")
+ log_debug("gas_reaction_progress = [gas_reaction_progress]")
+ log_debug("total_reaction_progress = [total_reaction_progress]")
+ log_debug("used_fuel = [used_fuel], used_oxidizers = [used_oxidizers]; ")
+ #endif
+
+ //if the reaction is progressing too slow then it isn't self-sustaining anymore and burns out
+ if(zone) //be less restrictive with canister and tank reactions
+ if((!liquid_fuel || used_fuel <= FIRE_LIQUD_MIN_BURNRATE) && (!gas_fuel || used_fuel <= FIRE_GAS_MIN_BURNRATE*zone.contents.len))
+ return 0
+
+
+ //*** Remove fuel and oxidizer, add carbon dioxide and heat
+
+ //remove and add gasses as calculated
+ var/used_gas_fuel = min(max(0.25, used_fuel*(gas_reaction_progress/total_reaction_progress)), gas_fuel) //remove in proportion to the relative reaction progress
+ var/used_liquid_fuel = min(max(0.25, used_fuel-used_gas_fuel), liquid_fuel)
+
+ //remove_by_flag() and adjust_gas() handle the group_multiplier for us.
+ remove_by_flag(XGM_GAS_OXIDIZER, used_oxidizers)
+ var/datum/gas_mixture/burned_fuel = remove_by_flag(XGM_GAS_FUEL, used_gas_fuel)
+ for(var/g in burned_fuel.gas)
+ adjust_gas(gas_data.burn_product[g], burned_fuel.gas[g])
+
+ if(zone)
+ zone.remove_liquidfuel(used_liquid_fuel, !check_combustability())
+
+ //calculate the energy produced by the reaction and then set the new temperature of the mix
+ temperature = (starting_energy + vsc.fire_fuel_energy_release * (used_gas_fuel + used_liquid_fuel)) / heat_capacity()
+ update_values()
+
+ #ifdef FIREDBG
+ log_debug("used_gas_fuel = [used_gas_fuel]; used_liquid_fuel = [used_liquid_fuel]; total = [used_fuel]")
+ log_debug("new temperature = [temperature]; new pressure = [return_pressure()]")
+ #endif
+
+ if (temperature<220)
+ firelevel = 0
+
+ return firelevel
+
+datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
+ . = 0
+ for(var/g in gas)
+ if(gas_data.flags[g] & XGM_GAS_OXIDIZER && gas[g] >= 0.1)
+ . = 1
+ break
+
+ if(!.)
+ return 0
+
+ if(fuel_objs && fuel_objs.len)
+ return 1
+
+ . = 0
+ for(var/g in gas)
+ if(gas_data.flags[g] & XGM_GAS_FUEL && gas[g] >= 0.1)
+ . = 1
+ break
+
+/datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fuel/liquid=null)
+ . = 0
+ for(var/g in gas)
+ if(gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * vsc.fire_consuption_rate) >= 0.1)
+ . = 1
+ break
+
+ if(!.)
+ return 0
+
+ if(liquid)
+ return 1
+
+ . = 0
+ for(var/g in gas)
+ if(gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * vsc.fire_consuption_rate) >= 0.1)
+ . = 1
+ break
+
+//returns a value between 0 and vsc.fire_firelevel_multiplier
+/datum/gas_mixture/proc/calculate_firelevel(total_fuel, total_oxidizers, reaction_limit, gas_volume)
+ //Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
+ var/firelevel = 0
+
+ var/total_combustables = (total_fuel + total_oxidizers)
+ var/active_combustables = (FIRE_REACTION_OXIDIZER_AMOUNT/FIRE_REACTION_FUEL_AMOUNT + 1)*reaction_limit
+
+ if(total_moles && total_combustables > 0)
+ //slows down the burning when the concentration of the reactants is low
+ var/damping_multiplier = min(1, active_combustables / (total_moles/group_multiplier))
+
+ //weight the damping mult so that it only really brings down the firelevel when the ratio is closer to 0
+ damping_multiplier = 2*damping_multiplier - (damping_multiplier*damping_multiplier)
+
+ //calculates how close the mixture of the reactants is to the optimum
+ //fires burn better when there is more oxidizer -- too much fuel will choke the fire out a bit, reducing firelevel.
+ var/mix_multiplier = 1 / (1 + (5 * ((total_fuel / total_combustables) ** 2)))
+
+ #ifdef FIREDBG
+ ASSERT(damping_multiplier <= 1)
+ ASSERT(mix_multiplier <= 1)
+ #endif
+
+ //toss everything together -- should produce a value between 0 and fire_firelevel_multiplier
+ firelevel = vsc.fire_firelevel_multiplier * mix_multiplier * damping_multiplier
+
+ return max( 0, firelevel)
+
+
+/mob/living/proc/FireBurn(var/firelevel, var/last_temperature, var/pressure)
+ var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+ apply_damage(2.5*mx, BURN)
+ return mx
+
+
+/mob/living/carbon/human/FireBurn(var/firelevel, var/last_temperature, var/pressure)
+ //Burns mobs due to fire. Respects heat transfer coefficients on various body parts.
+ //Due to TG reworking how fireprotection works, this is kinda less meaningful.
+
+ var/head_exposure = 1
+ var/chest_exposure = 1
+ var/groin_exposure = 1
+ var/legs_exposure = 1
+ var/arms_exposure = 1
+
+ //Get heat transfer coefficients for clothing.
+
+ for(var/obj/item/clothing/C in src)
+ if(l_hand == C || r_hand == C)
+ continue
+
+ if( C.max_heat_protection_temperature >= last_temperature )
+ if(C.body_parts_covered & HEAD)
+ head_exposure = 0
+ if(C.body_parts_covered & UPPER_TORSO)
+ chest_exposure = 0
+ if(C.body_parts_covered & LOWER_TORSO)
+ groin_exposure = 0
+ if(C.body_parts_covered & LEGS)
+ legs_exposure = 0
+ if(C.body_parts_covered & ARMS)
+ arms_exposure = 0
+ //minimize this for low-pressure environments
+ var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+
+ //Always check these damage procs first if fire damage isn't working. They're probably what's wrong.
+
+ apply_damage(0.9*mx*head_exposure, BURN, BP_HEAD, used_weapon = "Fire")
+ apply_damage(2.5*mx*chest_exposure, BURN, BP_CHEST, used_weapon = "Fire")
+ apply_damage(2.0*mx*groin_exposure, BURN, BP_GROIN, used_weapon = "Fire")
+ apply_damage(0.6*mx*legs_exposure, BURN, BP_L_LEG, used_weapon = "Fire")
+ apply_damage(0.6*mx*legs_exposure, BURN, BP_R_LEG, used_weapon = "Fire")
+ apply_damage(0.4*mx*arms_exposure, BURN, BP_L_ARM, used_weapon = "Fire")
+ apply_damage(0.4*mx*arms_exposure, BURN, BP_R_ARM, used_weapon = "Fire")
+
+ //return a truthy value of whether burning actually happened
+ return mx * (head_exposure + chest_exposure + groin_exposure + legs_exposure + arms_exposure)
diff --git a/code/modules/atmospherics/ZAS/Plasma.dm b/code/modules/atmospherics/ZAS/Plasma.dm
new file mode 100644
index 00000000000..e9543deb18d
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Plasma.dm
@@ -0,0 +1,176 @@
+GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contamination.dmi'))
+
+/pl_control
+ var/plasma_dmg = 3
+ var/plasma_dmg_name = "Plasma Damage Amount"
+ var/plasma_dmg_desc = "Self Descriptive"
+
+ var/cloth_contamination = TRUE
+ var/cloth_contamination_name = "Cloth Contamination"
+ var/cloth_contamination_desc = "If this is on, phoron does damage by getting into cloth."
+
+ var/plasmaguard_only = FALSE
+ var/plamaguard_only_name = "\"PlasmaGuard Only\""
+ var/plasmaguard_only_desc = "If this is on, only biosuits and spacesuits protect against contamination and ill effects."
+
+ var/genetic_corruption = FALSE
+ var/genetic_corruption_name = "Genetic Corruption Chance"
+ var/genetic_corruption_desc = "Chance of genetic corruption as well as toxic damage, X in 10,000."
+
+ var/skin_burns = TRUE
+ var/skin_burns_name = "Skin Burns"
+ var/skin_burns_desc = "Phoron has an effect similar to mustard gas on the un-suited."
+
+ var/eye_burns = TRUE
+ var/eye_burns_name = "Eye Burns"
+ var/eye_burns_desc = "Phoron burns the eyes of anyone not wearing eye protection."
+
+ var/contamination_loss = 0.02
+ var/contamination_loss_name = "Contamination Loss"
+ var/contamination_loss_desc = "How much toxin damage is dealt from contaminated clothing" //Per tick? ASK ARYN
+
+ var/phoron_hallucination = 0
+ var/phoron_hallucination_name = "Phoron Hallucination"
+ var/phoron_hallucination_desc = "Does being in phoron cause you to hallucinate?"
+
+
+/atom/proc/can_contaminate()
+ return
+
+/atom/proc/contaminate()
+ return
+
+/atom/proc/decontaminate()
+ return
+
+/obj/item/can_contaminate()
+ //Clothing can be contaminated, with exceptions for certain items which cannot be washed in washing_machine.dm
+ if(obj_flags & PLASMAGUARD)
+ return FALSE
+ return TRUE
+
+/obj/item/contaminate()
+ //Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
+ if(!(flags_1 & CONTAMINATED_1))
+ flags_1 |= CONTAMINATED_1
+ add_overlay(GLOB.contamination_overlay)
+
+/obj/item/decontaminate()
+ flags_1 ~= CONTAMINATED_1
+ cut_overlay(GLOB.contamination_overlay)
+
+
+/mob/living/carbon/human/contaminate()
+ //See if anything can be contaminated.
+
+ if(!pl_suit_protected())
+ suit_contamination()
+
+ if(!pl_head_protected())
+ if(prob(1))
+ suit_contamination() //Phoron can sometimes get through such an open suit.
+
+//Cannot wash backpacks currently.
+// if(istype(back,/obj/item/storage/backpack))
+// back.contaminate()
+
+/atom/proc/expose_plasma()
+ return
+
+/mob/living/carbon/human/expose_plasma()
+ //Handles all the bad things phoron can do.
+
+ //Contamination
+ if(SSzas.settings.plc.cloth_contamination)
+ contaminate()
+
+ //Anything else requires them to not be dead.
+ if(stat >= 2)
+ return
+
+ //Burn skin if exposed.
+ if(SSzas.settings.plc.skin_burns)
+ if(!pl_head_protected() || !pl_suit_protected())
+ burn_skin(0.75)
+ if(prob(20))
+ to_chat(src, "Your skin burns!")
+ updatehealth()
+
+ //Burn eyes if exposed.
+ if(SSzas.settings.plc.eye_burns)
+ if(!is_eyes_covered())
+ burn_eyes()
+
+ //Genetic Corruption
+ if(SSzas.settings.plc.genetic_corruption)
+ if(rand(1,10000) < SSzas.settings.plc.genetic_corruption)
+ easy_random_mutate(NEGATIVE)
+ to_chat(src, "High levels of toxins cause you to spontaneously mutate!")
+ domutcheck(src, null)
+
+/mob/proc/burn_eyes()
+ return
+
+/mob/living/carbon/human/burn_eyes()
+ var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
+ if(E && !E.status == ORGAN_ROBOTIC)
+ if(prob(20))
+ to_chat(src, "Your eyes burn!")
+ E.applyOrganDamage(2.5)
+ eye_blurry = min(eye_blurry+1.5,50)
+ if (prob(max(0, E.damage - 15) + 1) &&!eye_blind)
+ to_chat(src, "You are blinded!")
+ eye_blind += 20
+
+/mob/living/carbon/human/proc/pl_head_protected()
+ //Checks if the head is adequately sealed.
+ if(head)
+ if(SSzas.settings.plc.plasmaguard_only)
+ if(head.item_flags & PLASMAGUARD)
+ return TRUE
+ else if(is_eyes_covered())
+ return TRUE
+ return FALSE
+
+/mob/living/carbon/human/proc/pl_suit_protected()
+ //Checks if the suit is adequately sealed.
+ var/coverage = NONE
+ for(var/obj/item/protection in list(wear_suit, gloves, shoes))
+ if(!protection)
+ continue
+ if(istype(protection, /obj/item/clothing))
+ var/obj/item/clothing/clothing_item = protection
+ if(SSzas.settings.plc.plasmaguard_only && !((clothing_item.clothing_flags & THICKMATERIAL) || (clothing_item.clothing_flags & GAS_FILTERING) || (clothing_item.obj_flags & PLASMAGUARD)))
+ return FALSE
+
+ else if(SSzas.settings.plc.plasmaguard_only && !(protection.obj_flags & PLASMAGUARD))
+ return FALSE
+
+ coverage |= protection.body_parts_covered
+
+ if(SSzas.settings.plc.plasmaguard_only)
+ return TRUE
+
+ return (~(coverage) & (CHEST|LEGS|FEET|ARMS|HANDS) == 0)
+
+/mob/living/carbon/human/proc/suit_contamination()
+ //Runs over the things that can be contaminated and does so.
+ if (w_uniform && w_uniform.can_contaminate())
+ w_uniform.contaminate()
+ if (shoes && shoes.can_contaminate())
+ shoes.contaminate()
+ if (gloves && gloves.can_contaminate())
+ gloves.contaminate()
+
+
+/turf/Entered(obj/item/I)
+ . = ..()
+ //Items that are in plasma, but not on a mob, can still be contaminated.
+ if(istype(I) && SSzas && SSzas.settings.plc.cloth_contamination && I.can_contaminate())
+ var/datum/gas_mixture/env = return_air(1)
+ if(!env)
+ return
+ for(var/g in env.gas)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_CONTAMINANT && env.gas[g] > SSzas.gas_data.overlay_limit[g] + 1)
+ I.contaminate()
+ break
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
new file mode 100644
index 00000000000..7166223f43c
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -0,0 +1,295 @@
+/turf/simulated/var/zone/zone
+/turf/simulated/var/open_directions
+
+/turf/var/needs_air_update = 0
+/turf/var/datum/gas_mixture/air
+
+/turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null)
+ if(graphic_add && graphic_add.len)
+ vis_contents += graphic_add
+ if(graphic_remove && graphic_remove.len)
+ vis_contents -= graphic_remove
+
+/turf/proc/update_air_properties()
+ var/block
+ ATMOS_CANPASS_TURF(block, src, src)
+ if(block & AIR_BLOCKED)
+ //dbg(blocked)
+ return 1
+
+ #ifdef MULTIZAS
+ for(var/d = 1, d < 64, d *= 2)
+ #else
+ for(var/d = 1, d < 16, d *= 2)
+ #endif
+
+ var/turf/unsim = get_step(src, d)
+
+ if(!unsim)
+ continue
+
+ block = unsim.c_airblock(src)
+
+ if(block & AIR_BLOCKED)
+ //unsim.dbg(air_blocked, turn(180,d))
+ continue
+
+ var/r_block = c_airblock(unsim)
+
+ if(r_block & AIR_BLOCKED)
+ continue
+
+ if(istype(unsim, /turf/simulated))
+
+ var/turf/simulated/sim = unsim
+ if(TURF_HAS_VALID_ZONE(sim))
+ SSair.connect(sim, src)
+
+// Helper for can_safely_remove_from_zone().
+#define GET_ZONE_NEIGHBOURS(T, ret) \
+ ret = 0; \
+ if (T.zone) { \
+ for (var/_gzn_dir in gzn_check) { \
+ var/turf/simulated/other = get_step(T, _gzn_dir); \
+ if (istype(other) && other.zone == T.zone) { \
+ var/block; \
+ ATMOS_CANPASS_TURF(block, other, T); \
+ if (!(block & AIR_BLOCKED)) { \
+ ret |= _gzn_dir; \
+ } \
+ } \
+ } \
+ }
+
+/*
+ Simple heuristic for determining if removing the turf from it's zone will not partition the zone (A very bad thing).
+ Instead of analyzing the entire zone, we only check the nearest 3x3 turfs surrounding the src turf.
+ This implementation may produce false negatives but it (hopefully) will not produce any false postiives.
+*/
+
+/turf/simulated/proc/can_safely_remove_from_zone()
+ if(!zone)
+ return 1
+
+ var/check_dirs
+ GET_ZONE_NEIGHBOURS(src, check_dirs)
+ . = check_dirs
+ for(var/dir in csrfz_check)
+ //for each pair of "adjacent" cardinals (e.g. NORTH and WEST, but not NORTH and SOUTH)
+ if((dir & check_dirs) == dir)
+ //check that they are connected by the corner turf
+ var/turf/simulated/T = get_step(src, dir)
+ if (!istype(T))
+ . &= ~dir
+ continue
+
+ var/connected_dirs
+ GET_ZONE_NEIGHBOURS(T, connected_dirs)
+ if(connected_dirs && (dir & GLOB.reverse_dir[connected_dirs]) == dir)
+ . &= ~dir //they are, so unflag the cardinals in question
+
+ //it is safe to remove src from the zone if all cardinals are connected by corner turfs
+ . = !.
+
+/turf/simulated/update_air_properties()
+
+ if(zone && zone.invalid) //this turf's zone is in the process of being rebuilt
+ c_copy_air() //not very efficient :(
+ zone = null //Easier than iterating through the list at the zone.
+
+ var/s_block
+ ATMOS_CANPASS_TURF(s_block, src, src)
+ if(s_block & AIR_BLOCKED)
+ #ifdef ZASDBG
+ if(verbose) log_debug("Self-blocked.")
+ //dbg(blocked)
+ #endif
+ if(zone)
+ var/zone/z = zone
+
+ if(can_safely_remove_from_zone()) //Helps normal airlocks avoid rebuilding zones all the time
+ c_copy_air() //we aren't rebuilding, but hold onto the old air so it can be readded
+ z.remove(src)
+ else
+ z.rebuild()
+
+ return 1
+
+ var/previously_open = open_directions
+ open_directions = 0
+
+ var/list/postponed
+ #ifdef MULTIZAS
+ for(var/d = 1, d < 64, d *= 2)
+ #else
+ for(var/d = 1, d < 16, d *= 2)
+ #endif
+
+ var/turf/unsim = get_step(src, d)
+
+ if(!unsim) //edge of map
+ continue
+
+ var/block = unsim.c_airblock(src)
+ if(block & AIR_BLOCKED)
+
+ #ifdef ZASDBG
+ if(verbose) log_debug("[d] is blocked.")
+ //unsim.dbg(air_blocked, turn(180,d))
+ #endif
+
+ continue
+
+ var/r_block = c_airblock(unsim)
+ if(r_block & AIR_BLOCKED)
+
+ #ifdef ZASDBG
+ if(verbose) log_debug("[d] is blocked.")
+ //dbg(air_blocked, d)
+ #endif
+
+ //Check that our zone hasn't been cut off recently.
+ //This happens when windows move or are constructed. We need to rebuild.
+ if((previously_open & d) && istype(unsim, /turf/simulated))
+ var/turf/simulated/sim = unsim
+ if(zone && sim.zone == zone)
+ zone.rebuild()
+ return
+
+ continue
+
+ open_directions |= d
+
+ if(istype(unsim, /turf/simulated))
+
+ var/turf/simulated/sim = unsim
+ sim.open_directions |= GLOB.reverse_dir[d]
+
+ if(TURF_HAS_VALID_ZONE(sim))
+
+ //Might have assigned a zone, since this happens for each direction.
+ if(!zone)
+
+ //We do not merge if
+ // they are blocking us and we are not blocking them, or if
+ // we are blocking them and not blocking ourselves - this prevents tiny zones from forming on doorways.
+ if(((block & ZONE_BLOCKED) && !(r_block & ZONE_BLOCKED)) || ((r_block & ZONE_BLOCKED) && !(s_block & ZONE_BLOCKED)))
+ #ifdef ZASDBG
+ if(verbose) log_debug("[d] is zone blocked.")
+
+ //dbg(zone_blocked, d)
+ #endif
+
+ //Postpone this tile rather than exit, since a connection can still be made.
+ if(!postponed) postponed = list()
+ postponed.Add(sim)
+
+ else
+
+ sim.zone.add(src)
+
+ #ifdef ZASDBG
+ dbg(assigned)
+ if(verbose) log_debug("Added to [zone]")
+ #endif
+
+ else if(sim.zone != zone)
+
+ #ifdef ZASDBG
+ if(verbose) log_debug("Connecting to [sim.zone]")
+ #endif
+
+ SSair.connect(src, sim)
+
+
+ #ifdef ZASDBG
+ else if(verbose) log_debug("[d] has same zone.")
+
+ else if(verbose) log_debug("[d] has invalid zone.")
+ #endif
+
+ else
+
+ //Postponing connections to tiles until a zone is assured.
+ if(!postponed) postponed = list()
+ postponed.Add(unsim)
+
+ if(!TURF_HAS_VALID_ZONE(src)) //Still no zone, make a new one.
+ var/zone/newzone = new/zone()
+ newzone.add(src)
+
+ #ifdef ZASDBG
+ dbg(created)
+
+ ASSERT(zone)
+ #endif
+
+ //At this point, a zone should have happened. If it hasn't, don't add more checks, fix the bug.
+
+ for(var/turf/T in postponed)
+ SSair.connect(src, T)
+
+/turf/proc/post_update_air_properties()
+ if(connections) connections.update_all()
+
+/turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
+ return 0
+
+/turf/proc/assume_gas(gasid, moles, temp = 0)
+ return 0
+
+/turf/return_air()
+ //Create gas mixture to hold data for passing
+ var/datum/gas_mixture/GM = new
+
+ if(initial_gas)
+ GM.gas = initial_gas.Copy()
+ GM.temperature = temperature
+ GM.update_values()
+
+ return GM
+
+/turf/remove_air(amount as num)
+ var/datum/gas_mixture/GM = return_air()
+ return GM.remove(amount)
+
+/turf/simulated/assume_air(datum/gas_mixture/giver)
+ var/datum/gas_mixture/my_air = return_air()
+ my_air.merge(giver)
+
+/turf/simulated/assume_gas(gasid, moles, temp = null)
+ var/datum/gas_mixture/my_air = return_air()
+
+ if(isnull(temp))
+ my_air.adjust_gas(gasid, moles)
+ else
+ my_air.adjust_gas_temp(gasid, moles, temp)
+
+ return 1
+
+/turf/simulated/return_air()
+ if(zone)
+ if(!zone.invalid)
+ SSair.mark_zone_update(zone)
+ return zone.air
+ else
+ if(!air)
+ make_air()
+ c_copy_air()
+ return air
+ else
+ if(!air)
+ make_air()
+ return air
+
+/turf/proc/make_air()
+ air = new/datum/gas_mixture
+ air.temperature = temperature
+ if(initial_gas)
+ air.gas = initial_gas.Copy()
+ air.update_values()
+
+/turf/simulated/proc/c_copy_air()
+ if(!air) air = new/datum/gas_mixture
+ air.copy_from(zone.air)
+ air.group_multiplier = 1
diff --git a/code/modules/atmospherics/ZAS/XGM/gas_data.dm b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
new file mode 100644
index 00000000000..dc504b2f7dd
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
@@ -0,0 +1,103 @@
+/datum/xgm_gas_data
+ //Simple list of all the gas IDs.
+ var/list/gases = list()
+ //The friendly, human-readable name for the gas.
+ var/list/name = list()
+ //Specific heat of the gas. Used for calculating heat capacity.
+ var/list/specific_heat = list()
+ //Molar mass of the gas. Used for calculating specific entropy.
+ var/list/molar_mass = list()
+ //Tile overlays. /obj/effect/gas_overlay, created from references to 'icons/effects/tile_effects.dmi'
+ var/list/tile_overlay = list()
+ //Optional color for tile overlay
+ var/list/tile_overlay_color = list()
+ //Overlay limits. There must be at least this many moles for the overlay to appear.
+ var/list/overlay_limit = list()
+ //Flags.
+ var/list/flags = list()
+ //Products created when burned. For fuel only for now (not oxidizers)
+ var/list/burn_product = list()
+ // Reagent created when inhaled by lungs.
+ var/list/breathed_product = list()
+ // Temperature in K that the gas will condense.
+ var/list/condensation_points = list()
+ // Reagent path resulting from condesation.
+ var/list/condensation_products = list()
+ //If it shouldn't autogenerate a codex entry
+ var/list/hidden_from_codex = list()
+
+ //Holds the symbols
+ var/list/symbol_html = list()
+ var/list/symbol = list()
+
+/datum/xgm_gas
+ var/id = ""
+ var/name = "Unnamed Gas"
+ var/specific_heat = 20 // J/(mol*K)
+ var/molar_mass = 0.032 // kg/mol
+
+ var/tile_overlay = "generic"
+ var/tile_color = null
+ var/overlay_limit = null
+
+ var/flags = 0
+ var/burn_product = GAS_CO2
+ var/breathed_product
+ var/condensation_point = INFINITY
+ var/condensation_product
+ var/hidden_from_codex
+ var/symbol_html = "X"
+ var/symbol = "X"
+
+/datum/xgm_gas_data/Initialize()
+ for(var/p in subtypesof(/datum/xgm_gas))
+ var/datum/xgm_gas/gas = new p //avoid initial() because of potential New() actions
+
+ if(gas.id in SSzas.gas_data.gases)
+ stack_trace("Duplicate gas id `[gas.id]` in `[p]`")
+
+ SSzas.gas_data.gases += gas.id
+ SSzas.gas_data.name[gas.id] = gas.name
+ SSzas.gas_data.specific_heat[gas.id] = gas.specific_heat
+ SSzas.gas_data.molar_mass[gas.id] = gas.molar_mass
+ if(gas.overlay_limit)
+ SSzas.gas_data.overlay_limit[gas.id] = gas.overlay_limit
+ SSzas.gas_data.tile_overlay[gas.id] = gas.tile_overlay
+ SSzas.gas_data.tile_overlay_color[gas.id] = gas.tile_color
+ SSzas.gas_data.flags[gas.id] = gas.flags
+ SSzas.gas_data.burn_product[gas.id] = gas.burn_product
+
+ SSzas.gas_data.symbol_html[gas.id] = gas.symbol_html
+ SSzas.gas_data.symbol[gas.id] = gas.symbol
+
+ if(!isnull(gas.condensation_product) && !isnull(gas.condensation_point))
+ SSzas.gas_data.condensation_points[gas.id] = gas.condensation_point
+ SSzas.gas_data.condensation_products[gas.id] = gas.condensation_product
+
+ gas_data.breathed_product[gas.id] = gas.breathed_product
+ gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
+
+ return 1
+
+/obj/effect/gas_overlay
+ name = "gas"
+ desc = "You shouldn't be clicking this."
+ icon = 'icons/effects/tile_effects.dmi'
+ icon_state = "generic"
+ layer = FIRE_LAYER
+ appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
+ mouse_opacity = 0
+ var/gas_id
+
+/obj/effect/gas_overlay/proc/update_alpha_animation(var/new_alpha)
+ animate(src, alpha = new_alpha)
+ alpha = new_alpha
+ animate(src, alpha = 0.8 * new_alpha, time = 10, easing = SINE_EASING | EASE_OUT, loop = -1)
+ animate(alpha = new_alpha, time = 10, easing = SINE_EASING | EASE_IN, loop = -1)
+
+/obj/effect/gas_overlay/Initialize(mapload, gas)
+ . = ..()
+ gas_id = gas
+ if(SSzas.gas_data.tile_overlay[gas_id])
+ icon_state = SSzas.gas_data.tile_overlay[gas_id]
+ color = SSzas.gas_data.tile_overlay_color[gas_id]
diff --git a/code/modules/atmospherics/ZAS/Zone.dm b/code/modules/atmospherics/ZAS/Zone.dm
new file mode 100644
index 00000000000..aff8d23d929
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Zone.dm
@@ -0,0 +1,214 @@
+/*
+
+Overview:
+ Each zone is a self-contained area where gas values would be the same if tile-based equalization were run indefinitely.
+ If you're unfamiliar with ZAS, FEA's air groups would have similar functionality if they didn't break in a stiff breeze.
+
+Class Vars:
+ name - A name of the format "Zone [#]", used for debugging.
+ invalid - True if the zone has been erased and is no longer eligible for processing.
+ needs_update - True if the zone has been added to the update list.
+ edges - A list of edges that connect to this zone.
+ air - The gas mixture that any turfs in this zone will return. Values are per-tile with a group multiplier.
+
+Class Procs:
+ add(turf/simulated/T)
+ Adds a turf to the contents, sets its zone and merges its air.
+
+ remove(turf/simulated/T)
+ Removes a turf, sets its zone to null and erases any gas graphics.
+ Invalidates the zone if it has no more tiles.
+
+ c_merge(zone/into)
+ Invalidates this zone and adds all its former contents to into.
+
+ c_invalidate()
+ Marks this zone as invalid and removes it from processing.
+
+ rebuild()
+ Invalidates the zone and marks all its former tiles for updates.
+
+ add_tile_air(turf/simulated/T)
+ Adds the air contained in T.air to the zone's air supply. Called when adding a turf.
+
+ tick()
+ Called only when the gas content is changed. Archives values and changes gas graphics.
+
+ dbg_data(mob/M)
+ Sends M a printout of important figures for the zone.
+
+*/
+
+
+/zone
+ var/name
+ var/invalid = 0
+ var/list/contents = list()
+ var/list/fire_tiles = list()
+ var/list/fuel_objs = list()
+ var/needs_update = 0
+ var/list/edges = list()
+ var/datum/gas_mixture/air = new
+ var/list/graphic_add = list()
+ var/list/graphic_remove = list()
+ var/last_air_temperature = TCMB
+
+/zone/New()
+ SSair.add_zone(src)
+ air.temperature = TCMB
+ air.group_multiplier = 1
+ air.volume = CELL_VOLUME
+
+/zone/proc/add(turf/simulated/T)
+#ifdef ZASDBG
+ ASSERT(!invalid)
+ ASSERT(istype(T))
+ ASSERT(!SSair.has_valid_zone(T))
+#endif
+
+ var/datum/gas_mixture/turf_air = T.return_air()
+ add_tile_air(turf_air)
+ T.zone = src
+ contents.Add(T)
+ if(T.fire)
+ var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
+ fire_tiles.Add(T)
+ SSair.active_fire_zones |= src
+ if(fuel) fuel_objs += fuel
+ T.update_graphic(air.graphic)
+
+/zone/proc/remove(turf/simulated/T)
+#ifdef ZASDBG
+ ASSERT(!invalid)
+ ASSERT(istype(T))
+ ASSERT(T.zone == src)
+ soft_assert(T in contents, "Lists are weird broseph")
+#endif
+ contents.Remove(T)
+ fire_tiles.Remove(T)
+ if(T.fire)
+ var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
+ fuel_objs -= fuel
+ T.zone = null
+ T.update_graphic(graphic_remove = air.graphic)
+ if(contents.len)
+ air.group_multiplier = contents.len
+ else
+ c_invalidate()
+
+/zone/proc/c_merge(zone/into)
+#ifdef ZASDBG
+ ASSERT(!invalid)
+ ASSERT(istype(into))
+ ASSERT(into != src)
+ ASSERT(!into.invalid)
+#endif
+ c_invalidate()
+ for(var/turf/simulated/T in contents)
+ into.add(T)
+ T.update_graphic(graphic_remove = air.graphic)
+ #ifdef ZASDBG
+ T.dbg(merged)
+ #endif
+
+ //rebuild the old zone's edges so that they will be possessed by the new zone
+ for(var/connection_edge/E in edges)
+ if(E.contains_zone(into))
+ continue //don't need to rebuild this edge
+ for(var/turf/T in E.connecting_turfs)
+ SSair.mark_for_update(T)
+
+/zone/proc/c_invalidate()
+ invalid = 1
+ SSair.remove_zone(src)
+ #ifdef ZASDBG
+ for(var/turf/simulated/T in contents)
+ T.dbg(invalid_zone)
+ #endif
+
+/zone/proc/rebuild()
+ if(invalid) return //Short circuit for explosions where rebuild is called many times over.
+ c_invalidate()
+ for(var/turf/simulated/T in contents)
+ T.update_graphic(graphic_remove = air.graphic) //we need to remove the overlays so they're not doubled when the zone is rebuilt
+ //T.dbg(invalid_zone)
+ T.needs_air_update = 0 //Reset the marker so that it will be added to the list.
+ SSair.mark_for_update(T)
+
+/zone/proc/add_tile_air(datum/gas_mixture/tile_air)
+ //air.volume += CELL_VOLUME
+ air.group_multiplier = 1
+ air.multiply(contents.len)
+ air.merge(tile_air)
+ air.divide(contents.len+1)
+ air.group_multiplier = contents.len+1
+
+/zone/proc/tick()
+
+ // Update fires.
+ if(air.temperature >= PHORON_FLASHPOINT && !(src in SSair.active_fire_zones) && air.check_combustability() && contents.len)
+ var/turf/T = pick(contents)
+ if(istype(T))
+ T.create_fire(vsc.fire_firelevel_multiplier)
+
+ // Update gas overlays.
+ if(air.check_tile_graphic(graphic_add, graphic_remove))
+ for(var/turf/simulated/T in contents)
+ T.update_graphic(graphic_add, graphic_remove)
+ graphic_add.len = 0
+ graphic_remove.len = 0
+
+ // Update connected edges.
+ for(var/connection_edge/E in edges)
+ if(E.sleeping)
+ E.recheck()
+
+ // Handle condensation from the air.
+ for(var/g in air.gas)
+ var/product = gas_data.condensation_products[g]
+ if(product && air.temperature <= gas_data.condensation_points[g])
+ var/condensation_area = air.group_multiplier
+ while(condensation_area > 0)
+ condensation_area--
+ var/turf/flooding = pick(contents)
+ var/condense_amt = min(air.gas[g], rand(3,5))
+ if(condense_amt < 1)
+ break
+ air.adjust_gas(g, -condense_amt)
+ flooding.add_fluid(condense_amt, product)
+
+ // Update atom temperature.
+ if(abs(air.temperature - last_air_temperature) >= ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD)
+ last_air_temperature = air.temperature
+ for(var/turf/simulated/T in contents)
+ for(var/check_atom in T.contents)
+ var/atom/checking = check_atom
+ if(checking.simulated)
+ QUEUE_TEMPERATURE_ATOMS(checking)
+ CHECK_TICK
+
+/zone/proc/dbg_data(mob/M)
+ to_chat(M, name)
+ for(var/g in air.gas)
+ to_chat(M, "[gas_data.name[g]]: [air.gas[g]]")
+ to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)")
+ to_chat(M, "O2 per N2: [(air.gas[GAS_NITROGEN] ? air.gas[GAS_OXYGEN]/air.gas[GAS_NITROGEN] : "N/A")] Moles: [air.total_moles]")
+ to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])")
+// to_chat(M, "Unsimulated: [unsimulated_contents.len]")
+// to_chat(M, "Edges: [edges.len]")
+ if(invalid) to_chat(M, "Invalid!")
+ var/zone_edges = 0
+ var/space_edges = 0
+ var/space_coefficient = 0
+ for(var/connection_edge/E in edges)
+ if(E.type == /connection_edge/zone) zone_edges++
+ else
+ space_edges++
+ space_coefficient += E.coefficient
+ to_chat(M, "[E:air:return_pressure()]kPa")
+
+ to_chat(M, "Zone Edges: [zone_edges]")
+ to_chat(M, "Space Edges: [space_edges] ([space_coefficient] connections)")
+
+ //for(var/turf/T in unsimulated_contents)
+// to_chat(M, "[T] at ([T.x],[T.y])")
diff --git a/code/modules/atmospherics/ZAS/_docs.dm b/code/modules/atmospherics/ZAS/_docs.dm
new file mode 100644
index 00000000000..41372ea2a06
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/_docs.dm
@@ -0,0 +1,28 @@
+/*
+
+Zone Air System:
+
+This air system divides the station into impermeable areas called zones.
+When something happens, i.e. a door opening or a wall being taken down,
+zones equalize and eventually merge. Making an airtight area closes the connection again.
+
+Control Flow:
+Every air tick:
+ Marked turfs are updated with update_air_properties(), followed by post_update_air_properties().
+ Edges, including those generated by connections in the previous step, are processed. This is where gas is exchanged.
+ Fire is processed.
+ Marked zones have their air archived.
+
+Important Functions:
+
+SSair.mark_for_update(turf)
+ When stuff happens, call this. It works on everything. You basically don't need to worry about any other
+ functions besides CanPass().
+
+Notes for people who used ZAS before:
+ There is no connected_zones anymore.
+ To get the zones that are connected to a zone, use this loop:
+ for(var/connection_edge/zone/edge in zone.edges)
+ var/zone/connected_zone = edge.get_connected_zone(zone)
+
+*/
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index cc56f8a8b02..a0d92e739f5 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -448,7 +448,7 @@
#include "code\controllers\subsystem\achievements.dm"
#include "code\controllers\subsystem\addiction.dm"
#include "code\controllers\subsystem\ai_controllers.dm"
-#include "code\controllers\subsystem\air.dm"
+//#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\ambience.dm"
#include "code\controllers\subsystem\assets.dm"
#include "code\controllers\subsystem\atoms.dm"
@@ -526,6 +526,7 @@
#include "code\controllers\subsystem\wardrobe.dm"
#include "code\controllers\subsystem\weather.dm"
#include "code\controllers\subsystem\wiremod_composite.dm"
+#include "code\controllers\subsystem\zas.dm"
#include "code\controllers\subsystem\movement\ai_movement.dm"
#include "code\controllers\subsystem\movement\move_handler.dm"
#include "code\controllers\subsystem\movement\movement.dm"
@@ -2274,6 +2275,7 @@
#include "code\modules\asset_cache\assets\vv.dm"
#include "code\modules\asset_cache\transports\asset_transport.dm"
#include "code\modules\asset_cache\transports\webroot_transport.dm"
+/*
#include "code\modules\atmospherics\environmental\LINDA_fire.dm"
#include "code\modules\atmospherics\environmental\LINDA_system.dm"
#include "code\modules\atmospherics\environmental\LINDA_turf_tile.dm"
@@ -2282,6 +2284,7 @@
#include "code\modules\atmospherics\gasmixtures\immutable_mixtures.dm"
#include "code\modules\atmospherics\gasmixtures\reaction_factors.dm"
#include "code\modules\atmospherics\gasmixtures\reactions.dm"
+*/
#include "code\modules\atmospherics\machinery\airalarm.dm"
#include "code\modules\atmospherics\machinery\atmosmachinery.dm"
#include "code\modules\atmospherics\machinery\bluespace_vendor.dm"
@@ -2301,6 +2304,7 @@
#include "code\modules\atmospherics\machinery\components\binary_devices\volume_pump.dm"
#include "code\modules\atmospherics\machinery\components\electrolyzer\electrolyzer.dm"
#include "code\modules\atmospherics\machinery\components\electrolyzer\electrolyzer_reactions.dm"
+/*
#include "code\modules\atmospherics\machinery\components\fusion\hfr_core.dm"
#include "code\modules\atmospherics\machinery\components\fusion\hfr_defines.dm"
#include "code\modules\atmospherics\machinery\components\fusion\hfr_fuel_datums.dm"
@@ -2310,6 +2314,7 @@
#include "code\modules\atmospherics\machinery\components\gas_recipe_machines\atmos_machines_recipes.dm"
#include "code\modules\atmospherics\machinery\components\gas_recipe_machines\crystallizer.dm"
#include "code\modules\atmospherics\machinery\components\gas_recipe_machines\crystallizer_items.dm"
+*/
#include "code\modules\atmospherics\machinery\components\trinary_devices\filter.dm"
#include "code\modules\atmospherics\machinery\components\trinary_devices\mixer.dm"
#include "code\modules\atmospherics\machinery\components\trinary_devices\trinary_devices.dm"
@@ -2335,7 +2340,20 @@
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\junction.dm"
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\manifold.dm"
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\manifold4w.dm"
+#include "code\modules\atmospherics\ZAS\Connection.dm"
+#include "code\modules\atmospherics\ZAS\ConnectionGroup.dm"
+#include "code\modules\atmospherics\ZAS\ConnectionManager.dm"
+#include "code\modules\atmospherics\ZAS\Debug.dm"
+#include "code\modules\atmospherics\ZAS\Diagnostic.dm"
+#include "code\modules\atmospherics\ZAS\Fire.dm"
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\simple.dm"
+#include "code\modules\atmospherics\ZAS\Turf.dm"
+#include "code\modules\atmospherics\ZAS\Zone.dm"
+#include "code\modules\atmospherics\ZAS\_docs.dm"
+#include "code\modules\atmospherics\ZAS\Airflow.dm"
+#include "code\modules\atmospherics\ZAS\Atom.dm"
+#include "code\modules\atmospherics\ZAS\Plasma.dm"
+#include "code\modules\atmospherics\ZAS\XGM\gas_data.dm"
#include "code\modules\atmospherics\machinery\portable\canister.dm"
#include "code\modules\atmospherics\machinery\portable\portable_atmospherics.dm"
#include "code\modules\atmospherics\machinery\portable\pump.dm"
From 5860ade6f08db3f20df74b7252702d737521e6d7 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Wed, 13 Apr 2022 14:53:17 -0400
Subject: [PATCH 002/200] PAIN AND AGONY
---
code/__DEFINES/atmospherics/ZAS.dm | 268 +++++++++
code/__DEFINES/atmospherics/ZAS_math.dm | 31 +
code/__DEFINES/atmospherics/atmos_core.dm | 46 +-
.../atmospherics/atmos_mob_interaction.dm | 6 +-
code/__DEFINES/atmospherics/atmos_piping.dm | 8 +-
code/__DEFINES/colors.dm | 2 +
code/__DEFINES/flags.dm | 2 +
code/__DEFINES/movespeed_modification.dm | 1 +
code/__DEFINES/obj_flags.dm | 1 +
code/__DEFINES/sound.dm | 2 +-
code/__DEFINES/subsystems.dm | 5 +
code/__HELPERS/_logging.dm | 7 +-
code/__HELPERS/areas.dm | 4 +-
code/__HELPERS/atmospherics.dm | 29 +-
code/_onclick/adjacent.dm | 39 ++
code/controllers/subsystem/airflow.dm | 150 +++++
code/controllers/subsystem/minor_mapping.dm | 2 +-
code/controllers/subsystem/time_track.dm | 4 +-
code/controllers/subsystem/zas.dm | 47 +-
code/datums/atmosphere/_atmosphere.dm | 6 +-
.../components/atmos_reaction_recorder.dm | 7 +-
code/datums/components/combustible_flooder.dm | 6 +-
code/datums/components/gas_leaker.dm | 8 +-
code/datums/diseases/_disease.dm | 4 +-
code/datums/diseases/advance/symptoms/heal.dm | 6 +-
code/datums/elements/atmos_requirements.dm | 12 +-
code/datums/elements/atmos_sensitive.dm | 12 +-
code/datums/helper_datums/teleport.dm | 26 +-
code/game/atoms_movable.dm | 2 +-
code/game/gamemodes/objective_items.dm | 2 +-
code/game/machinery/_machinery.dm | 5 +-
.../computer/atmos_computers/_air_sensor.dm | 4 +-
.../atmos_computers/_atmos_control.dm | 2 +-
code/game/machinery/doors/airlock.dm | 6 +-
code/game/machinery/doors/door.dm | 14 +-
code/game/machinery/doors/firedoor.dm | 8 +-
code/game/machinery/doors/windowdoor.dm | 8 +-
code/game/machinery/pipe/construction.dm | 4 +-
code/game/machinery/shieldgen.dm | 12 +-
code/game/machinery/spaceheater.dm | 8 +-
code/game/objects/effects/anomalies.dm | 7 +-
.../effects/effect_system/effects_foam.dm | 23 +-
.../effects/effect_system/effects_smoke.dm | 11 +-
code/game/objects/items.dm | 2 +-
code/game/objects/items/RCD.dm | 2 +-
code/game/objects/items/RPD.dm | 2 +-
code/game/objects/items/cigs_lighters.dm | 4 +-
code/game/objects/items/devices/powersink.dm | 2 +-
.../items/devices/scanners/gas_analyzer.dm | 16 +-
code/game/objects/items/flamethrower.dm | 4 +-
.../objects/items/grenades/atmos_grenades.dm | 2 +
code/game/objects/items/secret_documents.dm | 2 +-
code/game/objects/items/tanks/jetpack.dm | 3 +-
code/game/objects/items/tanks/tanks.dm | 4 +-
code/game/objects/structures.dm | 2 +-
code/game/objects/structures/aliens.dm | 4 +-
code/game/objects/structures/false_walls.dm | 4 +-
code/game/objects/structures/grille.dm | 2 +-
code/game/objects/structures/holosign.dm | 4 +-
code/game/objects/structures/mineral_doors.dm | 10 +-
code/game/objects/structures/plasticflaps.dm | 6 +-
code/game/objects/structures/tram_walls.dm | 2 +-
.../structures/transit_tubes/station.dm | 2 +-
.../objects/structures/windoor_assembly.dm | 4 +-
code/game/objects/structures/window.dm | 10 +-
code/game/turfs/open/_open.dm | 2 +-
code/game/turfs/turf.dm | 5 +-
code/modules/admin/admin_verbs.dm | 2 +-
.../abductor/equipment/glands/plasma.dm | 4 +-
code/modules/antagonists/blob/blob_mobs.dm | 2 +-
.../antagonists/blob/structures/_blob.dm | 4 +-
.../antagonists/blob/structures/shield.dm | 2 +-
code/modules/atmospherics/ZAS/Airflow.dm | 127 ++--
code/modules/atmospherics/ZAS/Atom.dm | 48 +-
code/modules/atmospherics/ZAS/Connection.dm | 18 +-
.../atmospherics/ZAS/ConnectionGroup.dm | 32 +-
code/modules/atmospherics/ZAS/Debug.dm | 4 +-
code/modules/atmospherics/ZAS/Diagnostic.dm | 12 +-
code/modules/atmospherics/ZAS/Fire.dm | 74 ++-
code/modules/atmospherics/ZAS/Plasma.dm | 6 +-
code/modules/atmospherics/ZAS/Turf.dm | 44 +-
code/modules/atmospherics/ZAS/XGM/gas_data.dm | 6 +-
code/modules/atmospherics/ZAS/XGM/gases.dm | 241 ++++++++
.../atmospherics/ZAS/XGM/xgm_gas_mixture.dm | 553 ++++++++++++++++++
code/modules/atmospherics/ZAS/ZAS_Settings.dm | 78 +++
code/modules/atmospherics/ZAS/Zone.dm | 22 +-
.../atmospherics/environmental/LINDA_fire.dm | 2 +-
.../environmental/LINDA_system.dm | 6 +-
.../environmental/LINDA_turf_tile.dm | 6 +-
.../atmospherics/machinery/airalarm.dm | 27 +-
.../atmospherics/machinery/atmosmachinery.dm | 18 +-
.../components/electrolyzer/electrolyzer.dm | 2 +-
.../components/unary_devices/passive_vent.dm | 2 +-
.../machinery/portable/canister.dm | 4 +-
.../portable/portable_atmospherics.dm | 16 +-
.../atmospherics/machinery/portable/pump.dm | 2 +-
.../machinery/portable/scrubber.dm | 2 +-
code/modules/awaymissions/cordon.dm | 1 -
code/modules/hydroponics/fermenting_barrel.dm | 2 +-
code/modules/mapping/map_template.dm | 2 +-
code/modules/mining/aux_base.dm | 2 +-
code/modules/mining/equipment/survival_pod.dm | 4 +-
code/modules/mining/satchel_ore_boxdm.dm | 2 +-
.../mob/living/carbon/alien/humanoid/queen.dm | 2 +-
.../mob/living/carbon/carbon_defines.dm | 2 +-
.../mob/living/carbon/human/human_defines.dm | 2 +-
code/modules/mob/living/living_defines.dm | 2 +-
.../mob/living/simple_animal/constructs.dm | 2 +-
.../living/simple_animal/heretic_monsters.dm | 2 +-
.../mob/living/simple_animal/hostile/carp.dm | 2 +-
.../simple_animal/hostile/retaliate/ghost.dm | 2 +-
.../simple_animal/hostile/space_dragon.dm | 2 +-
code/modules/mob/mob_defines.dm | 2 +-
code/modules/movespeed/modifiers/mobs.dm | 5 +
code/modules/paperwork/folders.dm | 2 +-
code/modules/paperwork/paper.dm | 2 +-
code/modules/paperwork/paperbin.dm | 2 +-
code/modules/paperwork/pen.dm | 4 +-
code/modules/paperwork/stamps.dm | 2 +-
.../power/singularity/containment_field.dm | 4 +-
.../power/singularity/field_generator.dm | 4 +-
.../power/supermatter/supermatter_process.dm | 4 +-
code/modules/power/turbine/turbine.dm | 4 +-
code/modules/reagents/reagent_dispenser.dm | 2 +-
code/modules/recycling/disposal/bin.dm | 2 +-
.../recycling/disposal/construction.dm | 2 +-
code/modules/research/experimentor.dm | 4 +-
code/modules/research/server.dm | 2 +-
.../xenobiology/crossbreeding/chilling.dm | 2 +-
code/modules/shuttle/on_move.dm | 8 +-
code/modules/vehicles/mecha/_mecha.dm | 8 +-
.../mecha/equipment/tools/other_tools.dm | 2 +-
.../components/sensors/pressuresensor.dm | 2 +-
.../wiremod/components/sensors/tempsensor.dm | 2 +-
tgstation.dme | 8 +-
135 files changed, 1931 insertions(+), 502 deletions(-)
create mode 100644 code/__DEFINES/atmospherics/ZAS.dm
create mode 100644 code/__DEFINES/atmospherics/ZAS_math.dm
create mode 100644 code/controllers/subsystem/airflow.dm
create mode 100644 code/modules/atmospherics/ZAS/XGM/gases.dm
create mode 100644 code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
create mode 100644 code/modules/atmospherics/ZAS/ZAS_Settings.dm
diff --git a/code/__DEFINES/atmospherics/ZAS.dm b/code/__DEFINES/atmospherics/ZAS.dm
new file mode 100644
index 00000000000..b3e9fbcade6
--- /dev/null
+++ b/code/__DEFINES/atmospherics/ZAS.dm
@@ -0,0 +1,268 @@
+//#define ZASDBG
+//#define MULTIZAS
+
+#define AIR_BLOCKED 1
+#define ZONE_BLOCKED 2
+#define BLOCKED 3
+
+#define ZONE_MIN_SIZE 14 //zones with less than this many turfs will always merge, even if the connection is not direct
+
+#define CANPASS_ALWAYS 1
+#define CANPASS_DENSITY 2
+#define CANPASS_PROC 3
+#define CANPASS_NEVER 4
+
+#define NORTHUP (NORTH|UP)
+#define EASTUP (EAST|UP)
+#define SOUTHUP (SOUTH|UP)
+#define WESTUP (WEST|UP)
+#define NORTHDOWN (NORTH|DOWN)
+#define EASTDOWN (EAST|DOWN)
+#define SOUTHDOWN (SOUTH|DOWN)
+#define WESTDOWN (WEST|DOWN)
+
+#define TURF_HAS_VALID_ZONE(T) (istype(T, /turf/simulated) && T:zone && !T:zone:invalid)
+
+#ifdef MULTIZAS
+
+var/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTHUP, EASTUP, WESTUP, SOUTHUP, NORTHDOWN, EASTDOWN, WESTDOWN, SOUTHDOWN)
+var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST, UP, DOWN)
+
+#define ATMOS_CANPASS_TURF(ret,A,B) \
+ if (A.blocks_air & AIR_BLOCKED || B.blocks_air & AIR_BLOCKED) { \
+ ret = BLOCKED; \
+ } \
+ else if (B.z != A.z) { \
+ if (B.z < A.z) { \
+ ret = (A.z_flags & ZM_ALLOW_ATMOS) ? ZONE_BLOCKED : BLOCKED; \
+ } \
+ else { \
+ ret = (B.z_flags & ZM_ALLOW_ATMOS) ? ZONE_BLOCKED : BLOCKED; \
+ } \
+ } \
+ else if (A.blocks_air & ZONE_BLOCKED || B.blocks_air & ZONE_BLOCKED) { \
+ ret = (A.z == B.z) ? ZONE_BLOCKED : AIR_BLOCKED; \
+ } \
+ else if (A.contents.len) { \
+ ret = 0;\
+ for (var/thing in A) { \
+ var/atom/movable/AM = thing; \
+ switch (AM.can_atmos_pass) { \
+ if (CANPASS_ALWAYS) { \
+ continue; \
+ } \
+ if (CANPASS_DENSITY) { \
+ if (AM.density) { \
+ ret |= AIR_BLOCKED; \
+ } \
+ } \
+ if (CANPASS_PROC) { \
+ ret |= AM.c_airblock(B); \
+ } \
+ if (CANPASS_NEVER) { \
+ ret = BLOCKED; \
+ } \
+ } \
+ if (ret == BLOCKED) { \
+ break;\
+ }\
+ }\
+ }
+#else
+
+var/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
+var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
+
+#define ATMOS_CANPASS_TURF(ret,A,B) \
+ if (A.blocks_air & AIR_BLOCKED || B.blocks_air & AIR_BLOCKED) { \
+ ret = BLOCKED; \
+ } \
+ else if (A.blocks_air & ZONE_BLOCKED || B.blocks_air & ZONE_BLOCKED) { \
+ ret = ZONE_BLOCKED; \
+ } \
+ else if (A.contents.len) { \
+ ret = 0;\
+ for (var/thing in A) { \
+ var/atom/movable/AM = thing; \
+ switch (AM.can_atmos_pass) { \
+ if (CANPASS_ALWAYS) { \
+ continue; \
+ } \
+ if (CANPASS_DENSITY) { \
+ if (AM.density) { \
+ ret |= AIR_BLOCKED; \
+ } \
+ } \
+ if (CANPASS_PROC) { \
+ ret |= AM.c_airblock(B); \
+ } \
+ if (CANPASS_NEVER) { \
+ ret = BLOCKED; \
+ } \
+ } \
+ if (ret == BLOCKED) { \
+ break;\
+ }\
+ }\
+ }
+
+#endif
+
+
+#define CELL_VOLUME 2500 // Liters in a cell.
+#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) // Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C.
+
+#define O2STANDARD 0.21 // Percentage.
+#define N2STANDARD 0.79
+
+#define MOLES_PHORON_VISIBLE 0.7 // Moles in a standard cell after which phoron is visible.
+#define MOLES_O2STANDARD (MOLES_CELLSTANDARD * O2STANDARD) // O2 standard value (21%)
+#define MOLES_N2STANDARD (MOLES_CELLSTANDARD * N2STANDARD) // N2 standard value (79%)
+#define MOLES_O2ATMOS (MOLES_O2STANDARD*50)
+#define MOLES_N2ATMOS (MOLES_N2STANDARD*50)
+
+// These are for when a mob breathes poisonous air.
+#define MIN_TOXIN_DAMAGE 1
+#define MAX_TOXIN_DAMAGE 10
+
+#define STD_BREATH_VOLUME 12 // Liters in a normal breath.
+
+#define HUMAN_HEAT_CAPACITY 280000 //J/K For 80kg person
+
+#define SOUND_MINIMUM_PRESSURE 10
+
+#define PRESSURE_DAMAGE_COEFFICIENT 4 // The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE.
+#define MAX_HIGH_PRESSURE_DAMAGE 4 // This used to be 20... I got this much random rage for some retarded decision by polymorph?! Polymorph now lies in a pool of blood with a katana jammed in his spleen. ~Errorage --PS: The katana did less than 20 damage to him :(
+#define LOW_PRESSURE_DAMAGE 0.6 // The amount of damage someone takes when in a low pressure area. (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
+
+#define MINIMUM_PRESSURE_DIFFERENCE_TO_SUSPEND (MINIMUM_AIR_TO_SUSPEND*R_IDEAL_GAS_EQUATION*T20C)/CELL_VOLUME // Minimum pressure difference between zones to suspend
+#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05 // Minimum ratio of air that must move to/from a tile to suspend group processing
+#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD * MINIMUM_AIR_RATIO_TO_SUSPEND) // Minimum amount of air that has to move before a group processing can be suspended
+#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD * MINIMUM_AIR_RATIO_TO_SUSPEND) // Either this must be active
+#define MINIMUM_TEMPERATURE_TO_MOVE (T20C + 100) // or this (or both, obviously)
+
+#define MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND 0.012 // Minimum temperature difference before group processing is suspended.
+#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4
+#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5 // Minimum temperature difference before the gas temperatures are just set to be equal.
+#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C + 10)
+#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C + 200)
+
+// Must be between 0 and 1. Values closer to 1 equalize temperature faster. Should not exceed 0.4, else strange heat flow occurs.
+#define FLOOR_HEAT_TRANSFER_COEFFICIENT 0.4
+#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0
+#define DOOR_HEAT_TRANSFER_COEFFICIENT 0.0
+#define SPACE_HEAT_TRANSFER_COEFFICIENT 0.2 // A hack to partly simulate radiative heat.
+#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4
+#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1 // A hack for now.
+
+// Fire damage.
+#define CARBON_LIFEFORM_FIRE_RESISTANCE (T0C + 200)
+#define CARBON_LIFEFORM_FIRE_DAMAGE 4
+
+// Phoron fire properties.
+#define PHORON_MINIMUM_BURN_TEMPERATURE (T0C + 126) //400 K - autoignite temperature in tanks and canisters - enclosed environments I guess
+#define PHORON_FLASHPOINT (T0C + 246) //519 K - autoignite temperature in air if that ever gets implemented.
+
+//These control the mole ratio of oxidizer and fuel used in the combustion reaction
+#define FIRE_REACTION_OXIDIZER_AMOUNT 3 //should be greater than the fuel amount if fires are going to spread much
+#define FIRE_REACTION_FUEL_AMOUNT 2
+
+//These control the speed at which fire burns
+#define FIRE_GAS_BURNRATE_MULT 1
+#define FIRE_LIQUID_BURNRATE_MULT 0.225
+
+//If the fire is burning slower than this rate then the reaction is going too slow to be self sustaining and the fire burns itself out.
+//This ensures that fires don't grind to a near-halt while still remaining active forever.
+#define FIRE_GAS_MIN_BURNRATE 0.01
+#define FIRE_LIQUD_MIN_BURNRATE 0.0025
+
+//How many moles of fuel are contained within one solid/liquid fuel volume unit
+#define LIQUIDFUEL_AMOUNT_TO_MOL 0.45 //mol/volume unit
+
+// XGM gas flags.
+#define XGM_GAS_FUEL 1
+#define XGM_GAS_OXIDIZER 2
+#define XGM_GAS_CONTAMINANT 4
+#define XGM_GAS_FUSION_FUEL 8
+
+#define TANK_LEAK_PRESSURE (30 * ONE_ATMOSPHERE) // Tank starts leaking.
+#define TANK_RUPTURE_PRESSURE (40 * ONE_ATMOSPHERE) // Tank spills all contents into atmosphere.
+#define TANK_FRAGMENT_PRESSURE (50 * ONE_ATMOSPHERE) // Boom 3x3 base explosion.
+#define TANK_FRAGMENT_SCALE (10 * ONE_ATMOSPHERE) // +1 for each SCALE kPa above threshold. Was 2 atm.
+
+#define NORMPIPERATE 30 // Pipe-insulation rate divisor.
+#define HEATPIPERATE 8 // Heat-exchange pipe insulation.
+#define FLOWFRAC 0.99 // Fraction of gas transfered per process.
+
+//Flags for zone sleeping
+#define ZONE_ACTIVE 1
+#define ZONE_SLEEPING 0
+
+// Defines how much of certain gas do the Atmospherics tanks start with. Values are in kpa per tile (assuming 20C)
+#define ATMOSTANK_NITROGEN 90000 // A lot of N2 is needed to produce air mix, that's why we keep 90MPa of it
+#define ATMOSTANK_OXYGEN 50000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it.
+#define ATMOSTANK_CO2 60000 // CO2 is used for the GUP, Charon, and Torch as the primary fuel propellant, and we need lots to stick around.
+#define ATMOSTANK_PHORON 25000
+#define ATMOSTANK_PHORON_FUEL 15000
+#define ATMOSTANK_HYDROGEN 50000
+#define ATMOSTANK_HYDROGEN_FUEL 25000
+#define ATMOSTANK_NITROUSOXIDE 10000 // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
+
+#define MAX_PUMP_PRESSURE 15000 // Maximal pressure setting for pumps and vents
+#define MAX_OMNI_PRESSURE 15000 // Maximal output(s) pressure for omni devices (filters/mixers)
+
+#define GAS_OXYGEN "oxygen"
+#define GAS_CO2 "carbon_dioxide"
+#define GAS_CO "carbon_monoxide"
+#define GAS_METHYL_BROMIDE "methyl_bromide"
+#define GAS_N2O "sleeping_agent"
+#define GAS_NITROGEN "nitrogen"
+#define GAS_NO2 "nitrodioxide"
+#define GAS_NO "nitricoxide"
+#define GAS_METHANE "methane"
+#define GAS_ALIEN "aliether"
+#define GAS_HYDROGEN "hydrogen"
+#define GAS_DEUTERIUM "deuterium"
+#define GAS_TRITIUM "tritium"
+#define GAS_HELIUM "helium"
+#define GAS_ARGON "argon"
+#define GAS_KRYPTON "krypton"
+#define GAS_NEON "neon"
+#define GAS_XENON "xenon"
+#define GAS_AMMONIA "ammonia"
+#define GAS_CHLORINE "chlorine"
+#define GAS_SULFUR "sulfurdioxide"
+#define GAS_STEAM "water"
+#define GAS_PLASMA "phoron"
+
+#define ALL_GASES list(GAS_OXYGEN, GAS_CO2, GAS_CO, GAS_METHYL_BROMIDE, GAS_N2O, GAS_NITROGEN, GAS_NO, GAS_METHANE, GAS_ALIEN, GAS_HYDROGEN, GAS_DEUTERIUM, GAS_TRITIUM, GAS_HELIUM, GAS_ARGON, GAS_KRYPTON, GAS_NEON, GAS_XENON, GAS_AMMONIA, GAS_CHLORINE, GAS_SULFUR, GAS_STEAM, GAS_PLASMA)
+
+GLOBAL_LIST_INIT(reverse_dir, list( // reverse_dir[dir] = reverse of dir
+ 2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15,
+ 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47,
+ 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31,
+ 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63
+))
+
+#define ATOM_IS_TEMPERATURE_SENSITIVE(A) (A && !QDELETED(A) && !(A.atom_flags & ATOM_FLAG_NO_TEMP_CHANGE))
+#define ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD 5
+#define ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT 0.25
+
+#define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
+ _atom.temperature = _temp; \
+ if(_atom.reagents) { \
+ HANDLE_REACTIONS(_atom.reagents); \
+ } \
+ QUEUE_TEMPERATURE_ATOMS(_atom);
+
+#define QUEUE_TEMPERATURE_ATOMS(_atoms) \
+ if(islist(_atoms)) { \
+ for(var/thing in _atoms) { \
+ var/atom/A = thing; \
+ if(ATOM_IS_TEMPERATURE_SENSITIVE(A)) { \
+ SStemperature.processing[A] = TRUE; \
+ } \
+ } \
+ } else if(ATOM_IS_TEMPERATURE_SENSITIVE(_atoms)) { \
+ SStemperature.processing[_atoms] = TRUE; \
+ }
diff --git a/code/__DEFINES/atmospherics/ZAS_math.dm b/code/__DEFINES/atmospherics/ZAS_math.dm
new file mode 100644
index 00000000000..2c8ac21470b
--- /dev/null
+++ b/code/__DEFINES/atmospherics/ZAS_math.dm
@@ -0,0 +1,31 @@
+// Math constants.
+#define R_IDEAL_GAS_EQUATION 8.31 // kPa*L/(K*mol).
+#define ONE_ATMOSPHERE 101.325 // kPa.
+#define IDEAL_GAS_ENTROPY_CONSTANT 1164 // (mol^3 * s^3) / (kg^3 * L).
+
+// Radiation constants.
+#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8 // W/(m^2*K^4).
+#define COSMIC_RADIATION_TEMPERATURE 3.15 // K.
+#define AVERAGE_SOLAR_RADIATION 200 // W/m^2. Kind of arbitrary. Really this should depend on the sun position much like solars.
+#define RADIATOR_OPTIMUM_PRESSURE 3771 // kPa at 20 C. This should be higher as gases aren't great conductors until they are dense. Used the critical pressure for air.
+#define GAS_CRITICAL_TEMPERATURE 132.65 // K. The critical point temperature for air.
+
+#define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 // (3 cm + 100 cm * sin(3deg))/(2*(3+100 cm)). Unitless ratio.
+#define HUMAN_EXPOSED_SURFACE_AREA 5.2 //m^2, surface area of 1.7m (H) x 0.46m (D) cylinder
+
+#define T0C 273.15 // 0.0 degrees celsius
+#define T20C 293.15 // 20.0 degrees celsius
+#define T100C 373.15 // 100.0 degrees celsius
+#define TCMB 2.7 // -270.3 degrees celsius
+
+#define CELSIUS + T0C
+
+#define ATMOS_PRECISION 0.0001
+#define QUANTIZE(variable) (round(variable, ATMOS_PRECISION))
+
+// Determines the exchange ratio of reagents being converted to gas and vice versa.
+#define REAGENT_GAS_EXCHANGE_FACTOR 10
+
+//where a unit turf is 1 on a side, its diagonal is sqrt(2)
+#define UNIT_DIAGONAL 1.41421356237
+#define HALF_UNIT_DIAGONAL 0.70710678118
diff --git a/code/__DEFINES/atmospherics/atmos_core.dm b/code/__DEFINES/atmospherics/atmos_core.dm
index c0ca6bb78c8..bfb3455f636 100644
--- a/code/__DEFINES/atmospherics/atmos_core.dm
+++ b/code/__DEFINES/atmospherics/atmos_core.dm
@@ -25,17 +25,17 @@
//ATMOS
//stuff you should probably leave well alone!
/// kPa*L/(K*mol)
-#define R_IDEAL_GAS_EQUATION 8.31
+//#define R_IDEAL_GAS_EQUATION 8.31
/// kPa
-#define ONE_ATMOSPHERE 101.325
+//#define ONE_ATMOSPHERE 101.325
/// -270.3degC
-#define TCMB 2.7
+//#define TCMB 2.7
/// -48.15degC
#define TCRYO 225
/// 0degC
-#define T0C 273.15
+//#define T0C 273.15
/// 20degC
-#define T20C 293.15
+//#define T20C 293.15
/// -14C - Temperature used for kitchen cold room, medical freezer, etc.
#define COLD_ROOM_TEMP 259.15
@@ -100,31 +100,31 @@
/// number of FULL air controller ticks before an excited group dismantles and removes its turfs from active
#define EXCITED_GROUP_DISMANTLE_CYCLES (EXCITED_GROUP_BREAKDOWN_CYCLES * 2) + 1 //Reset after 2 breakdowns
/// Ratio of air that must move to/from a tile to reset group processing
-#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1
+//#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1
/// Minimum ratio of air that must move to/from a tile
-#define MINIMUM_AIR_RATIO_TO_MOVE 0.001
+//#define MINIMUM_AIR_RATIO_TO_MOVE 0.001
/// Minimum amount of air that has to move before a group processing can be suspended (Round about 10)
-#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND)
+//#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND)
/// Either this must be active (round about 0.1) //Might need to raise this a tad to better support space leaks. we'll see
-#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_MOVE)
+//#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_MOVE)
/// or this (or both, obviously)
-#define MINIMUM_TEMPERATURE_TO_MOVE (T20C+100)
+//#define MINIMUM_TEMPERATURE_TO_MOVE (T20C+100)
/// Minimum temperature difference before group processing is suspended
-#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4
+//#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4
/// Minimum temperature difference before the gas temperatures are just set to be equal
-#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5
+//#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5
///Minimum temperature to continue superconduction once started
-#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+80)
+//#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+80)
///Minimum temperature to start doing superconduction calculations
-#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+400)
+//#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+400)
//HEAT TRANSFER COEFFICIENTS
//Must be between 0 and 1. Values closer to 1 equalize temperature faster
//Should not exceed 0.4 else strange heat flow occur
-#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0
-#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4
+//#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0
+//#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4
/// a hack for now
-#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1
+//#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1
/// a hack to help make vacuums "cold", sacrificing realism for gameplay
#define HEAT_CAPACITY_VACUUM 7000
@@ -139,19 +139,19 @@
#define FIRE_GROWTH_RATE 40000
///moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC (103 or so)
-#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))
+//#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))
///compared against for superconductivity
#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005)
/// percentage of oxygen in a normal mixture of air
-#define O2STANDARD 0.21
+//#define O2STANDARD 0.21
/// same but for nitrogen
-#define N2STANDARD 0.79
+//#define N2STANDARD 0.79
/// O2 standard value (21%)
-#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD)
+//#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD)
/// N2 standard value (79%)
-#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD)
+//#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD)
/// liters in a cell
-#define CELL_VOLUME 2500
+//#define CELL_VOLUME 2500
///O2 value for anesthetic canister
#define O2_ANESTHETIC 0.65
diff --git a/code/__DEFINES/atmospherics/atmos_mob_interaction.dm b/code/__DEFINES/atmospherics/atmos_mob_interaction.dm
index 1f0c3a0669e..84476d2b431 100644
--- a/code/__DEFINES/atmospherics/atmos_mob_interaction.dm
+++ b/code/__DEFINES/atmospherics/atmos_mob_interaction.dm
@@ -79,10 +79,10 @@
#define BODYTEMP_COLD_WARNING_3 (BODYTEMP_COLD_DAMAGE_LIMIT - 150) //120k
/// The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE
-#define PRESSURE_DAMAGE_COEFFICIENT 2
-#define MAX_HIGH_PRESSURE_DAMAGE 2
+//#define PRESSURE_DAMAGE_COEFFICIENT 2
+//#define MAX_HIGH_PRESSURE_DAMAGE 2
/// The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
-#define LOW_PRESSURE_DAMAGE 2
+//#define LOW_PRESSURE_DAMAGE 2
/// Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this
#define COLD_SLOWDOWN_FACTOR 20
diff --git a/code/__DEFINES/atmospherics/atmos_piping.dm b/code/__DEFINES/atmospherics/atmos_piping.dm
index f0919f37276..8624de386e1 100644
--- a/code/__DEFINES/atmospherics/atmos_piping.dm
+++ b/code/__DEFINES/atmospherics/atmos_piping.dm
@@ -44,13 +44,13 @@
/// The internal temperature in kelvins at which a handheld gas tank begins to take damage.
#define TANK_MELT_TEMPERATURE 1000000
/// The internal pressure in kPa at which a handheld gas tank begins to take damage.
-#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE)
+//#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE)
/// The internal pressure in kPa at which a handheld gas tank almost immediately ruptures.
-#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE)
+//#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE)
/// The internal pressure in kPa at which an gas tank that breaks will cause an explosion.
-#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE)
+//#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE)
/// Range scaling constant for tank explosions. Calibrated so that a TTV assembled using two 70L tanks will hit the maxcap at at least 160atm.
-#define TANK_FRAGMENT_SCALE (84.*ONE_ATMOSPHERE)
+//#define TANK_FRAGMENT_SCALE (84.*ONE_ATMOSPHERE)
/// Denotes that our tank is overpressurized simply from gas merging.
#define TANK_MERGE_OVERPRESSURE "tank_overpressure"
// Indices for the reaction_results returned by explosion_information()
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
index 7d7325e6007..eab21d13db1 100644
--- a/code/__DEFINES/colors.dm
+++ b/code/__DEFINES/colors.dm
@@ -219,3 +219,5 @@
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA")
/// Icon filter that creates gaussian blur
#define GAUSSIAN_BLUR(filter_size) filter(type="blur", size=filter_size)
+
+#define RANDOM_RGB rgb(rand(0,255), rand(0,255), rand(0,255))
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index b09a0d11214..389a4f2681b 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -58,6 +58,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define IS_PLAYER_COLORABLE_1 (1<<21)
/// Whether or not this atom has contextual screentips when hovered OVER
#define HAS_CONTEXTUAL_SCREENTIPS_1 (1<<22)
+///Plasma Contamination
+#define CONTAMINATED_1 (1<<23)
// Update flags for [/atom/proc/update_appearance]
/// Update the atom's name
diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm
index c4300d96606..fe6ac65a3b6 100644
--- a/code/__DEFINES/movespeed_modification.dm
+++ b/code/__DEFINES/movespeed_modification.dm
@@ -11,3 +11,4 @@
#define MOVESPEED_ID_MOB_GRAB_STATE "mob_grab_state"
#define MOVESPEED_ID_MOB_WALK_RUN "mob_walk_run"
+#define MOVESPEED_ID_MOB_ATMOS_AFFLICTION "mob_atmos_pressured"
diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm
index 159a8de9fc7..4c5bdb7169d 100644
--- a/code/__DEFINES/obj_flags.dm
+++ b/code/__DEFINES/obj_flags.dm
@@ -15,6 +15,7 @@
#define BLOCK_Z_IN_DOWN (1<<11) // Should this object block z falling from above?
#define BLOCK_Z_IN_UP (1<<12) // Should this object block z uprise from below?
#define NO_BUILD (1<<13) // Can we build on this object?
+#define PLASMAGUARD (1<<14) //Immune to plasma contamination
// If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support
diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index e0a46bb6e62..1ebdf032034 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -27,7 +27,7 @@
#define MAX_INSTRUMENT_CHANNELS (128 * 6)
-#define SOUND_MINIMUM_PRESSURE 10
+//#define SOUND_MINIMUM_PRESSURE 10
#define INTERACTION_SOUND_RANGE_MODIFIER -3
#define EQUIP_SOUND_VOLUME 30
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 9e1d38c8394..44e17d7c122 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -173,6 +173,7 @@
#define FIRE_PRIORITY_AMBIENCE 10
#define FIRE_PRIORITY_GARBAGE 15
#define FIRE_PRIORITY_DATABASE 16
+#define FIRE_PRIORITY_AIRFLOW 17
#define FIRE_PRIORITY_WET_FLOORS 20
#define FIRE_PRIORITY_AIR 20
#define FIRE_PRIORITY_NPC 20
@@ -280,6 +281,10 @@
#define SSZAS_FIRES 6
#define SSZAS_HOTSPOTS 7
#define SSZAS_ZONES 8
+#define SSZAS_ATOMS 9
+
+#define SSZAS_REBUILD_PIPELINE 1
+#define SSZAS_REBUILD_QUEUE 2
//Pipeline rebuild helper defines, these suck but it'll do for now //Fools you actually merged it
#define SSAIR_REBUILD_PIPELINE 1
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index 2b142806d43..bb72d342457 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -178,10 +178,9 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
/// Logs the contents of the gasmix to the game log, prefixed by text
/proc/log_atmos(text, datum/gas_mixture/mix)
var/message = text
- message += "TEMP=[mix.temperature],MOL=[mix.total_moles()],VOL=[mix.volume]"
- for(var/key in mix.gases)
- var/list/gaslist = mix.gases[key]
- message += "[gaslist[GAS_META][META_GAS_ID]]=[gaslist[MOLES]];"
+ message += "TEMP=[mix.return_temperature()],MOL=[mix.total_moles()],VOL=[mix.volume]"
+ for(var/key in mix.gas)
+ message += "[key]=[mix.get_gas(key)];"
log_game(message)
/proc/log_say(text)
diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index cc99089e29d..a15767bb241 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -36,7 +36,9 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engineerin
if(break_if_found[checkT.type] || break_if_found[checkT.loc.type])
return FALSE
var/static/list/cardinal_cache = list("[NORTH]"=TRUE, "[EAST]"=TRUE, "[SOUTH]"=TRUE, "[WEST]"=TRUE)
- if(!cardinal_cache["[dir]"] || !TURFS_CAN_SHARE(sourceT, checkT))
+ var/canpass
+ ATMOS_CANPASS_TURF(canpass, sourceT, checkT)
+ if(!cardinal_cache["[dir]"] || !canpass)
continue
found_turfs += checkT // Since checkT is connected, add it to the list to be processed
diff --git a/code/__HELPERS/atmospherics.dm b/code/__HELPERS/atmospherics.dm
index 6df62fec3ef..2635c68c148 100644
--- a/code/__HELPERS/atmospherics.dm
+++ b/code/__HELPERS/atmospherics.dm
@@ -41,18 +41,18 @@
)
if(!gasmix)
return
- for(var/gas_path in gasmix.gases)
+ for(var/gas_path in gasmix.gas)
.["gases"] += list(list(
- gasmix.gases[gas_path][GAS_META][META_GAS_ID],
- gasmix.gases[gas_path][GAS_META][META_GAS_NAME],
- gasmix.gases[gas_path][MOLES],
- ))
- for(var/datum/gas_reaction/reaction_result as anything in gasmix.reaction_results)
- .["reactions"] += list(list(
- initial(reaction_result.id),
- initial(reaction_result.name),
- gasmix.reaction_results[reaction_result],
+ "[gas_path]",
+ "[gas_path]",
+ gasmix.get_gas(gas_path),
))
+ //.for(var/datum/gas_reaction/reaction_result as anything in gasmix.reaction_results)
+ .["reactions"] += list(list(
+ "UNIMPLIMENTED",
+ "UNIMPLIMENTED",
+ "UNIMPLIMENTED",
+ ))
.["total_moles"] = gasmix.total_moles()
.["temperature"] = gasmix.temperature
.["volume"] = gasmix.volume
@@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(gas_handbook)
/// Automatically populates gas_handbook and reaction_handbook. They are formatted lists containing information regarding gases and reactions they participate in.
/// Structure can be found in TS form at AtmosHandbook.tsx
-/proc/atmos_handbooks_init()
+/*/proc/atmos_handbooks_init()
if(length(GLOB.reaction_handbook))
GLOB.reaction_handbook = list()
if(length(GLOB.gas_handbook))
@@ -84,8 +84,8 @@ GLOBAL_LIST_EMPTY(gas_handbook)
gas_info["specific_heat"] = meta_information[META_GAS_SPECIFIC_HEAT]
gas_info["reactions"] = list()
momentary_gas_list[gas_path] = gas_info
-
- for (var/datum/gas_reaction/reaction_path as anything in subtypesof(/datum/gas_reaction))
+
+ for (var/datum/gas_reaction/reaction_path as anything in subtypesof(/datum/gas_reaction))
var/datum/gas_reaction/reaction = new reaction_path
var/list/reaction_info = list()
reaction_info["id"] = reaction.id
@@ -117,7 +117,7 @@ GLOBAL_LIST_EMPTY(gas_handbook)
reaction_info["factors"] += list(factor_info)
GLOB.reaction_handbook += list(reaction_info)
qdel(reaction)
-
+
for (var/gas_info_index in momentary_gas_list)
GLOB.gas_handbook += list(momentary_gas_list[gas_info_index])
@@ -125,3 +125,4 @@ GLOBAL_LIST_EMPTY(gas_handbook)
/// For UIs, simply do data += return_atmos_handbooks() to use.
/proc/return_atmos_handbooks()
return list("gasInfo" = GLOB.gas_handbook, "reactionInfo" = GLOB.reaction_handbook)
+*/
diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm
index e33ba9cb540..5b30c07d1eb 100644
--- a/code/_onclick/adjacent.dm
+++ b/code/_onclick/adjacent.dm
@@ -75,6 +75,45 @@
return TRUE
return FALSE
+/turf/proc/Adjacent_free_dir(atom/destination, path_dir = 0)
+ var/turf/dest_T = get_turf(destination)
+ if(dest_T == src)
+ return TRUE
+ if(!dest_T || dest_T.z != z)
+ return FALSE
+ if(get_dist(src,dest_T) > 1)
+ return FALSE
+ if(!path_dir)
+ return FALSE
+
+ if(dest_T.x == x || dest_T.y == y) //orthogonal
+ return dest_T.ClickCross(get_dir(dest_T, src), border_only = 1)
+
+ var/turf/intermediate_T = get_step(src, path_dir) //diagonal
+ if(!intermediate_T || intermediate_T.density \
+ || !intermediate_T.ClickCross(get_dir(intermediate_T, src) | get_dir(intermediate_T, dest_T), border_only = 0))
+ return FALSE
+
+ if(!dest_T.ClickCross(get_dir(dest_T, intermediate_T), border_only = 1))
+ return FALSE
+
+ return TRUE
+
+/**
+* Quick adjacency (to turf):
+* If you are in the same turf, always true
+* If you are not adjacent, then false
+*/
+/turf/proc/AdjacentQuick(var/atom/neighbor, var/atom/target = null)
+ var/turf/T0 = get_turf(neighbor)
+ if(T0 == src)
+ return 1
+
+ if(get_dist(src,T0) > 1)
+ return 0
+
+ return 1
+
// This is necessary for storage items not on your person.
/obj/item/Adjacent(atom/neighbor, atom/target, atom/movable/mover, recurse = 1)
if(neighbor == loc)
diff --git a/code/controllers/subsystem/airflow.dm b/code/controllers/subsystem/airflow.dm
new file mode 100644
index 00000000000..31407e67fa9
--- /dev/null
+++ b/code/controllers/subsystem/airflow.dm
@@ -0,0 +1,150 @@
+#define CLEAR_OBJECT(TARGET) \
+ processing -= TARGET; \
+ TARGET.airflow_dest = null; \
+ TARGET.airflow_speed = 0; \
+ TARGET.airflow_time = 0; \
+ TARGET.airflow_skip_speedcheck = FALSE; \
+ if (TARGET.airflow_od) { \
+ TARGET.set_density(FALSE); \
+ }
+
+
+SUBSYSTEM_DEF(airflow)
+ name = "Airflow"
+ wait = 1
+ flags = SS_NO_INIT
+ priority = FIRE_PRIORITY_AIRFLOW
+
+ var/static/tmp/list/processing = list()
+ var/static/tmp/list/current = list()
+
+
+/datum/controller/subsystem/airflow/Recover()
+ current.Cut()
+
+
+/datum/controller/subsystem/airflow/fire(resumed, no_mc_tick)
+ if (!resumed)
+ current = processing.Copy()
+ var/atom/movable/target
+ for (var/i = current.len to 1 step -1)
+ target = current[i]
+ if (QDELETED(target))
+ if (target)
+ CLEAR_OBJECT(target)
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ if (target.airflow_speed <= 0)
+ CLEAR_OBJECT(target)
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ if (target.airflow_process_delay > 0)
+ target.airflow_process_delay -= 1
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ else if (target.airflow_process_delay)
+ target.airflow_process_delay = 0
+ target.airflow_speed = min(target.airflow_speed, 15)
+ target.airflow_speed -= SSzas.settings.airflow_speed_decay
+ if (!target.airflow_skip_speedcheck)
+ if (target.airflow_speed > 7)
+ if (target.airflow_time++ >= target.airflow_speed - 7)
+ if (target.airflow_od)
+ target.set_density(FALSE)
+ target.airflow_skip_speedcheck = TRUE
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ else
+ if (target.airflow_od)
+ target.set_density(FALSE)
+ target.airflow_process_delay = max(1, 10 - (target.airflow_speed + 3))
+ target.airflow_skip_speedcheck = TRUE
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ target.airflow_skip_speedcheck = FALSE
+ if (target.airflow_od)
+ target.set_density(TRUE)
+ if (!target.airflow_dest || target.loc == target.airflow_dest)
+ target.airflow_dest = locate(min(max(target.x + target.airflow_xo, 1), world.maxx), min(max(target.y + target.airflow_yo, 1), world.maxy), target.z)
+ if ((target.x == 1) || (target.x == world.maxx) || (target.y == 1) || (target.y == world.maxy))
+ CLEAR_OBJECT(target)
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ if (!isturf(target.loc))
+ CLEAR_OBJECT(target)
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+ continue
+ step_towards(target, target.airflow_dest)
+ if (ismob(target))
+ var/mob/M = target
+ M.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/atmos_pressure, TRUE, SSzas.settings.airflow_mob_slowdown)
+ addtimer(CALLBACK(M, /mob/proc/remove_movespeed_modifier, /datum/movespeed_modifier/atmos_pressure, TRUE))
+ if (MC_TICK_CHECK)
+ current.Cut(i)
+ return
+
+#undef CLEAR_OBJECT
+
+
+/atom/movable/var/tmp/airflow_xo
+/atom/movable/var/tmp/airflow_yo
+/atom/movable/var/tmp/airflow_od
+/atom/movable/var/tmp/airflow_process_delay
+/atom/movable/var/tmp/airflow_skip_speedcheck
+
+
+/atom/movable/proc/prepare_airflow(strength)
+ if (!airflow_dest || airflow_speed < 0 || last_airflow > world.time - SSzas.settings.airflow_delay)
+ return FALSE
+ if (airflow_speed)
+ airflow_speed = strength / max(get_dist(src, airflow_dest), 1)
+ return FALSE
+ if (airflow_dest == loc)
+ step_away(src, loc)
+ if (!AirflowCanMove(strength))
+ return FALSE
+ if (ismob(src))
+ to_chat(src, span_danger("You are pushed away by a rush of air!"))
+ last_airflow = world.time
+ var/airflow_falloff = 9 - sqrt((x - airflow_dest.x) ** 2 + (y - airflow_dest.y) ** 2)
+ if (airflow_falloff < 1)
+ airflow_dest = null
+ return FALSE
+ airflow_speed = min(max(strength * (9 / airflow_falloff), 1), 9)
+ airflow_od = FALSE
+ if (!density)
+ set_density(TRUE)
+ airflow_od = TRUE
+ return TRUE
+
+
+/atom/movable/proc/GotoAirflowDest(strength)
+ if (!prepare_airflow(strength))
+ return
+ airflow_xo = airflow_dest.x - x
+ airflow_yo = airflow_dest.y - y
+ airflow_dest = null
+ SSairflow.processing += src
+
+
+/atom/movable/proc/RepelAirflowDest(strength)
+ if (!prepare_airflow(strength))
+ return
+ airflow_xo = -(airflow_dest.x - x)
+ airflow_yo = -(airflow_dest.y - y)
+ airflow_dest = null
+ SSairflow.processing += src
diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm
index 32a04f57ba4..a45c9921098 100644
--- a/code/controllers/subsystem/minor_mapping.dm
+++ b/code/controllers/subsystem/minor_mapping.dm
@@ -30,7 +30,7 @@ SUBSYSTEM_DEF(minor_mapping)
mouse.forceMove(proposed_turf)
else
mouse = new /mob/living/simple_animal/hostile/regalrat/controlled(proposed_turf)
- if(proposed_turf.air.has_gas(/datum/gas/oxygen, 5))
+ if(proposed_turf.air.has_gas(GAS_OXYGEN, 5))
num_mice -= 1
mouse = null
diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm
index c2a0ff0f195..17ece9c7e85 100644
--- a/code/controllers/subsystem/time_track.dm
+++ b/code/controllers/subsystem/time_track.dm
@@ -129,7 +129,7 @@ SUBSYSTEM_DEF(time_track)
time_dilation_avg_slow,
MAPTICK_LAST_INTERNAL_TICK_USAGE,
length(SStimer.timer_id_dict),
- SSair.cost_turfs,
+ /*SSair.cost_turfs,
SSair.cost_groups,
SSair.cost_highpressure,
SSair.cost_hotspots,
@@ -141,7 +141,7 @@ SUBSYSTEM_DEF(time_track)
length(SSair.hotspots),
length(SSair.networks),
length(SSair.high_pressure_delta),
- length(SSair.active_super_conductivity),
+ length(SSair.active_super_conductivity),*/
SSdbcore.all_queries_num,
SSdbcore.queries_active_num,
SSdbcore.queries_standby_num
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index f6cf060c884..26a3631b8e0 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -68,9 +68,10 @@ SUBSYSTEM_DEF(zas)
flags = SS_POST_FIRE_TIMING
//The variable setting controller
- var/zas_controller/settings
+ var/datum/zas_controller/settings
//XGM gas data
var/datum/xgm_gas_data/gas_data
+
//Geometry lists
var/list/zones = list()
var/list/edges = list()
@@ -82,6 +83,8 @@ SUBSYSTEM_DEF(zas)
//Atmos Machines
var/list/atmos_machinery = list()
+ //Atoms to be processed
+ var/list/atom_process = list()
//Geometry updates lists
var/list/tiles_to_update = list()
@@ -104,6 +107,7 @@ SUBSYSTEM_DEF(zas)
var/list/curr_hotspot
var/list/curr_zones
var/list/curr_machines
+ var/list/curr_atoms
var/current_process = SSZAS_TILES
@@ -116,7 +120,7 @@ SUBSYSTEM_DEF(zas)
// Make sure we don't rebuild mid-tick.
if (state != SS_IDLE)
- to_chat(world, bold_announce("ZAS Rebuild initiated. Waiting for current air tick to complete before continuing."))
+ to_chat(world, span_boldannounce("ZAS Rebuild initiated. Waiting for current air tick to complete before continuing."))
while (state != SS_IDLE)
stoplag()
@@ -155,9 +159,9 @@ SUBSYSTEM_DEF(zas)
var/starttime = REALTIMEOFDAY
settings = new
- gas_data = new /datum/xgm_gas_data
+ gas_data = new
- to_chat(world, bold_announce("Processing Geometry..."))
+ to_chat(world, span_boldannounce("Processing Geometry..."))
var/simulated_turf_count = 0
for(var/turf/simulated/S)
@@ -166,7 +170,7 @@ SUBSYSTEM_DEF(zas)
CHECK_TICK
- to_chat(world, bold_announce(
+ to_chat(world, span_boldannounce(
{"Total Simulated Turfs: [simulated_turf_count]
Total Zones: [zones.len]
Total Edges: [edges.len]
@@ -174,15 +178,15 @@ SUBSYSTEM_DEF(zas)
Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]"}
))
- to_chat(world, bold_announce("Geometry processing completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
+ to_chat(world, span_boldannounce("Geometry processing completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
if (simulate)
- to_chat(world, bold_announce("Settling air..."))
+ to_chat(world, span_boldannounce("Settling air..."))
starttime = REALTIMEOFDAY
fire(FALSE, TRUE)
- to_chat(world, bold_announce("Air settling completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
+ to_chat(world, span_boldannounce("Air settling completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
..(timeofday)
@@ -310,6 +314,18 @@ SUBSYSTEM_DEF(zas)
if (MC_TICK_CHECK)
return
+ current_process = SSZAS_ATOMS
+ curr_atoms = atom_process
+ if(current_process == SSZAS_ATOMS)
+ while(curr_atoms.len)
+ var/atom/talk_to = curr_atoms[curr_atoms.len]
+ curr_atoms.len--
+ if(!talk_to)
+ return
+ talk_to.process_exposure()
+ if(MC_TICK_CHECK)
+ return
+
current_process = SSZAS_MACHINES
/**
@@ -519,3 +535,18 @@ SUBSYSTEM_DEF(zas)
active_edges -= E
if(processing_edges)
processing_edges -= E
+
+/datum/controller/subsystem/zas/proc/get_init_dirs(type, dir, init_dir)
+
+ if(!pipe_init_dirs_cache[type])
+ pipe_init_dirs_cache[type] = list()
+
+ if(!pipe_init_dirs_cache[type]["[init_dir]"])
+ pipe_init_dirs_cache[type]["[init_dir]"] = list()
+
+ if(!pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"])
+ var/obj/machinery/atmospherics/temp = new type(null, FALSE, dir, init_dir)
+ pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"] = temp.get_init_directions()
+ qdel(temp)
+
+ return pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"]
diff --git a/code/datums/atmosphere/_atmosphere.dm b/code/datums/atmosphere/_atmosphere.dm
index 431a6695753..5bc91a7d85b 100644
--- a/code/datums/atmosphere/_atmosphere.dm
+++ b/code/datums/atmosphere/_atmosphere.dm
@@ -1,5 +1,5 @@
/datum/atmosphere
- var/gas_string
+ //var/gas_string
var/id
var/list/base_gases // A list of gases to always have
@@ -14,8 +14,9 @@
var/maximum_temp
/datum/atmosphere/New()
- generate_gas_string()
+ //generate_gas_string()
+/*
/datum/atmosphere/proc/generate_gas_string()
var/list/spicy_gas = restricted_gases.Copy()
var/target_pressure = rand(minimum_pressure, maximum_pressure)
@@ -65,3 +66,4 @@
gas_string_builder += "[gas[GAS_META][META_GAS_ID]]=[gas[MOLES]]"
gas_string_builder += "TEMP=[gasmix.temperature]"
gas_string = gas_string_builder.Join(";")
+*/
diff --git a/code/datums/components/atmos_reaction_recorder.dm b/code/datums/components/atmos_reaction_recorder.dm
index 02ec672655c..d2f1ffa6895 100644
--- a/code/datums/components/atmos_reaction_recorder.dm
+++ b/code/datums/components/atmos_reaction_recorder.dm
@@ -5,13 +5,13 @@
* Add this component after gasmixes has been initialized.
*/
/datum/component/atmos_reaction_recorder
- /// The list we write append each reaction tick to.
+ /// The list we write append each reaction tick to.
/// This is often a list initialized by something else (passed as a reference under Initialize).
var/list/copied_reaction_results
/// Signals we have been listening to.
var/list/registered_signals
-/**
+/**
* Verify that parent is indeed an atom, and then register signals.
* Args:
* - target_list (list): The list we are writing the captured reaction_results to.
@@ -46,8 +46,7 @@
/// Fetches reaction_results and updates the list.
/datum/component/atmos_reaction_recorder/proc/update_data(datum/gas_mixture/recorded_gasmix)
SIGNAL_HANDLER
- for (var/reaction in recorded_gasmix.reaction_results)
- copied_reaction_results[reaction] += recorded_gasmix.reaction_results[reaction]
+ //copied_reaction_results[reaction] += "UNIMPLIMENTED: ATMOS REACTION RECORDER"
/datum/component/atmos_reaction_recorder/proc/reset_data()
SIGNAL_HANDLER
diff --git a/code/datums/components/combustible_flooder.dm b/code/datums/components/combustible_flooder.dm
index 98c88e3290d..cae32ef8f64 100644
--- a/code/datums/components/combustible_flooder.dm
+++ b/code/datums/components/combustible_flooder.dm
@@ -37,8 +37,8 @@
flooded_turf = parent_turf.ScrapeAway(1, CHANGETURF_INHERIT_AIR)
delete_parent = FALSE
- flooded_turf.atmos_spawn_air("[gas_id]=[gas_amount];TEMP=[temp_amount || trigger_temperature]")
-
+ flooded_turf.atmos_spawn_air(gas_id, gas_amount, temp_amount||trigger_temperature)
+
// Logging-related
var/admin_message = "[parent] ignited in [ADMIN_VERBOSEJMP(flooded_turf)]"
var/log_message = "[parent] ignited in [AREACOORD(flooded_turf)]"
@@ -52,7 +52,7 @@
log_game(log_message)
if(delete_parent && !QDELETED(parent))
- qdel(parent) // For things with the explodable component like plasma mats this isn't necessary, but there's no harm.
+ qdel(parent) // For things with the explodable component like plasma mats this isn't necessary, but there's no harm.
qdel(src)
/// fire_act reaction.
diff --git a/code/datums/components/gas_leaker.dm b/code/datums/components/gas_leaker.dm
index 71565bb29f4..b5977d93bd5 100644
--- a/code/datums/components/gas_leaker.dm
+++ b/code/datums/components/gas_leaker.dm
@@ -31,7 +31,7 @@
src.leak_rate = leak_rate
/datum/component/gas_leaker/Destroy(force, silent)
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
return ..()
/datum/component/gas_leaker/RegisterWithParent()
@@ -56,7 +56,7 @@
SIGNAL_HANDLER
// Hello fellow atmospherics machines, I too am definitely an atmos machine like you!
// This component needs to tick at the same rate as the atmos system
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
/datum/component/gas_leaker/proc/process_obj(obj/master, list/airs=list())
airs += master.return_air()
@@ -78,9 +78,7 @@
var/turf/location = get_turf(master)
var/true_rate = (1 - (current_integrity / master.max_integrity)) * leak_rate
for(var/datum/gas_mixture/mix as anything in airs)
- var/pressure = mix.return_pressure()
- if(mix.release_gas_to(location.return_air(), pressure, true_rate))
- location.air_update_turf(FALSE, FALSE)
+ mix.mingle_with_turf(get_turf(parent), true_rate)//Not sure this is the best way to do this buuuuuut, ZASSED!
#undef PROCESS_OBJ
#undef PROCESS_MACHINE
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index 2306f13407c..5039ca06fd6 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -126,7 +126,9 @@
if(end == start)
return TRUE
var/turf/Temp = get_step_towards(end, start)
- if(!TURFS_CAN_SHARE(end, Temp)) //Don't go through a wall
+ var/canpass_air
+ ATMOS_CANPASS_TURF(canpass_air, end, Temp)
+ if(!canpass_air) //Don't go through a wall
return FALSE
end = Temp
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index b9088b7efb5..a5e9fbed306 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -489,10 +489,8 @@
if(M.loc)
environment = M.loc.return_air()
- if(environment)
- gases = environment.gases
- if(gases[/datum/gas/plasma])
- . += power * min(0.5, gases[/datum/gas/plasma][MOLES] * HEALING_PER_MOL)
+ if(environment && environment.get_gas(GAS_PLASMA))
+ . += power * min(0.5, environment.get_gas(GAS_PLASMA) * HEALING_PER_MOL)
if(M.reagents.has_reagent(/datum/reagent/toxin/plasma, needs_metabolizing = TRUE))
. += power * 0.75 //Determines how much the symptom heals if injected or ingested
diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm
index 94493a18097..6b3c13899fc 100644
--- a/code/datums/elements/atmos_requirements.dm
+++ b/code/datums/elements/atmos_requirements.dm
@@ -46,15 +46,13 @@
if(!open_turf.air && (atmos_requirements["min_oxy"] || atmos_requirements["min_tox"] || atmos_requirements["min_n2"] || atmos_requirements["min_co2"]))
return FALSE
- var/open_turf_gases = open_turf.air.gases
- open_turf.air.assert_gases(arglist(GLOB.hardcoded_gases))
+ var/datum/gas_mixture/open_turf_gases = open_turf.return_air()
- var/plas = open_turf_gases[/datum/gas/plasma][MOLES]
- var/oxy = open_turf_gases[/datum/gas/oxygen][MOLES]
- var/n2 = open_turf_gases[/datum/gas/nitrogen][MOLES]
- var/co2 = open_turf_gases[/datum/gas/carbon_dioxide][MOLES]
- open_turf.air.garbage_collect()
+ var/plas = open_turf_gases.get_gas(GAS_PLASMA)
+ var/oxy = open_turf_gases.get_gas(GAS_OXYGEN)
+ var/n2 = open_turf_gases.get_gas(GAS_NITROGEN)
+ var/co2 = open_turf_gases.get_gas(GAS_CO2)
. = TRUE
if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"])
diff --git a/code/datums/elements/atmos_sensitive.dm b/code/datums/elements/atmos_sensitive.dm
index ca676327e26..9cc8799db7b 100644
--- a/code/datums/elements/atmos_sensitive.dm
+++ b/code/datums/elements/atmos_sensitive.dm
@@ -24,7 +24,7 @@
us.RemoveElement(/datum/element/connect_loc, pass_on)
if(us.flags_1 & ATMOS_IS_PROCESSING_1)
us.atmos_end()
- SSair.atom_process -= us
+ SSzas.atom_process -= us
us.flags_1 &= ~ATMOS_IS_PROCESSING_1
return ..()
@@ -40,11 +40,11 @@
if(should_atmos_process(air, exposed_temperature))
if(flags_1 & ATMOS_IS_PROCESSING_1)
return
- SSair.atom_process += src
+ SSzas.atom_process += src
flags_1 |= ATMOS_IS_PROCESSING_1
else if(flags_1 & ATMOS_IS_PROCESSING_1)
atmos_end()
- SSair.atom_process -= src
+ SSzas.atom_process -= src
flags_1 &= ~ATMOS_IS_PROCESSING_1
/atom/proc/process_exposure()
@@ -52,12 +52,12 @@
if(!istype(loc, /turf/open))
//If you end up in a locker or a wall reconsider your life decisions
atmos_end()
- SSair.atom_process -= src
+ SSzas.atom_process -= src
flags_1 &= ~ATMOS_IS_PROCESSING_1
return
if(!should_atmos_process(spot.air, spot.air.temperature)) //Things can change without a tile becoming active
atmos_end()
- SSair.atom_process -= src
+ SSzas.atom_process -= src
flags_1 &= ~ATMOS_IS_PROCESSING_1
return
atmos_expose(spot.air, spot.air.temperature)
@@ -65,7 +65,7 @@
/turf/open/process_exposure()
if(!should_atmos_process(air, air.temperature))
atmos_end()
- SSair.atom_process -= src
+ SSzas.atom_process -= src
flags_1 &= ~ATMOS_IS_PROCESSING_1
return
atmos_expose(air, air.temperature)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index cb5aa00386a..3fc5a504215 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -128,32 +128,22 @@
if(no_teleport && (destination_area.area_flags & NOTELEPORT))
return
- var/datum/gas_mixture/floor_gas_mixture = floor_turf.air
- if(!floor_gas_mixture)
- return
-
- var/list/floor_gases = floor_gas_mixture.gases
- var/trace_gases
- for(var/id in floor_gases)
- if(id in GLOB.hardcoded_gases)
- continue
- trace_gases = TRUE
- break
+ var/datum/gas_mixture/floor_gases= floor_turf.return_air()
- // Can most things breathe?
- if(trace_gases)
+ if(!floor_gases)
return
- if(!(floor_gases[/datum/gas/oxygen] && floor_gases[/datum/gas/oxygen][MOLES] >= 16))
+
+ if(!(floor_gases.get_gas(GAS_OXYGEN) >= 16))
return
- if(floor_gases[/datum/gas/plasma])
+ if(floor_gases.get_gas(GAS_PLASMA))
return
- if(floor_gases[/datum/gas/carbon_dioxide] && floor_gases[/datum/gas/carbon_dioxide][MOLES] >= 10)
+ if(floor_gases.get_gas(GAS_CO2) >= 10)
return
// Aim for goldilocks temperatures and pressure
- if((floor_gas_mixture.temperature <= 270) || (floor_gas_mixture.temperature >= 360))
+ if((floor_gases.temperature <= 270) || (floor_gases.temperature >= 360))
return
- var/pressure = floor_gas_mixture.return_pressure()
+ var/pressure = floor_gases.return_pressure()
if((pressure <= 20) || (pressure >= 550))
return
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 79ddce1ff12..bdaa6a41803 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -116,7 +116,7 @@
//Restore air flow if we were blocking it (movables with ATMOS_PASS_PROC will need to do this manually if necessary)
if(((can_atmos_pass == ATMOS_PASS_DENSITY && density) || can_atmos_pass == ATMOS_PASS_NO) && isturf(loc))
can_atmos_pass = ATMOS_PASS_YES
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
loc.handle_atom_del(src)
if(opacity)
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 39665740779..4c66c5e301d 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -299,7 +299,7 @@
var/target_amount = text2num(name)
var/found_amount = 0
var/datum/gas_mixture/mix = T.return_air()
- found_amount += mix.gases[/datum/gas/plasma] ? mix.gases[/datum/gas/plasma][MOLES] : 0
+ found_amount += mix.get_gas(GAS_PLASMA)
return found_amount>=target_amount
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 4f5a5125183..316ab1fa2ee 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -90,7 +90,7 @@
desc = "Some kind of machine."
verb_say = "beeps"
verb_yell = "blares"
- pressure_resistance = 15
+ //pressure_resistance = 15
pass_flags_self = PASSMACHINE
max_integrity = 200
layer = BELOW_OBJ_LAYER //keeps shit coming out of the machine from ending up underneath it.
@@ -536,10 +536,11 @@
if(!.)
return FALSE
- var/turf/user_turf = get_turf(user)
+ /*var/turf/user_turf = get_turf(user)
var/turf/machine_turf = get_turf(src)
if(!(user_turf in machine_turf.atmos_adjacent_turfs))
return FALSE
+ */
if((interaction_flags_machine & INTERACT_MACHINE_REQUIRES_SIGHT) && user.is_blind())
to_chat(user, span_warning("This machine requires sight to use."))
diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
index 72a3df3153e..7b4a83bad3c 100644
--- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm
+++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
@@ -16,13 +16,13 @@
/obj/machinery/air_sensor/Initialize(mapload)
id_tag = chamber_id + "_sensor"
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)
return ..()
/obj/machinery/air_sensor/Destroy()
INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency)
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
SSradio.remove_object(src, frequency)
return ..()
diff --git a/code/game/machinery/computer/atmos_computers/_atmos_control.dm b/code/game/machinery/computer/atmos_computers/_atmos_control.dm
index 7651109971f..9d3416aa1e1 100644
--- a/code/game/machinery/computer/atmos_computers/_atmos_control.dm
+++ b/code/game/machinery/computer/atmos_computers/_atmos_control.dm
@@ -133,7 +133,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
data["maxOutput"] = MAX_OUTPUT_PRESSURE
data["control"] = control
data["reconnecting"] = reconnecting
- data += return_atmos_handbooks()
+ //data += return_atmos_handbooks()
return data
/obj/machinery/computer/atmos_control/ui_data(mob/user)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index b817ef75e3f..9e15c38656a 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1220,7 +1220,7 @@
filler.set_density(FALSE)
//PARIAH STATION EDIT END
flags_1 &= ~PREVENT_CLICK_UNDER_1
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
sleep(1)
layer = OPEN_DOOR_LAYER
update_icon(ALL, AIRLOCK_OPEN, TRUE)
@@ -1270,7 +1270,7 @@
if(multi_tile)
filler.density = TRUE
//PARIAH STATION EDIT END
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
sleep(1)
if(!air_tight)
set_density(TRUE)
@@ -1279,7 +1279,7 @@
if(multi_tile)
filler.density = TRUE
//PARIAH STATION EDIT END
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
sleep(4)
if(dangerous_close)
crush()
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index ab7943b5c57..8e9b2fc379f 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -47,7 +47,7 @@
. = ..()
set_init_door_layer()
update_freelook_sight()
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
register_context()
GLOB.airlocks += src
spark_system = new /datum/effect_system/spark_spread
@@ -101,7 +101,7 @@
if(spark_system)
qdel(spark_system)
spark_system = null
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
return ..()
/**
@@ -169,8 +169,8 @@
/obj/machinery/door/Move()
var/turf/T = loc
. = ..()
- if(density) //Gotta be closed my friend
- move_update_air(T)
+ /*if(density) //Gotta be closed my friend
+ move_update_air(T)*/
/obj/machinery/door/CanAllowThrough(atom/movable/mover, border_dir)
. = ..()
@@ -183,7 +183,7 @@
/obj/machinery/door/proc/bumpopen(mob/user)
if(operating || !can_open_with_hands)
return
-
+
add_fingerprint(user)
if(!density || (obj_flags & EMAGGED))
return
@@ -353,7 +353,7 @@
update_appearance()
set_opacity(0)
operating = FALSE
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
update_freelook_sight()
if(autoclose)
autoclose_in(DOOR_CLOSE_WAIT)
@@ -383,7 +383,7 @@
if(visible && !glass)
set_opacity(1)
operating = FALSE
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
update_freelook_sight()
if(!can_crush)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 3d4779d748e..f314b223636 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -46,7 +46,7 @@
///The merger_id and merger_typecache variables are used to make rows of firelocks activate at the same time.
var/merger_id = "firelocks"
var/static/list/merger_typecache
-
+
///Overlay object for the warning lights. This and some plane settings allows the lights to glow in the dark.
var/mutable_appearance/warn_lights
@@ -239,7 +239,7 @@
/obj/machinery/door/firedoor/proc/unregister_adjacent_turfs(atom/loc)
for(var/dir in GLOB.cardinals)
var/turf/checked_turf = get_step(get_turf(loc), dir)
-
+
if(!checked_turf)
continue
@@ -270,7 +270,7 @@
var/turf/checked_turf = source
var/result = check_atmos(checked_turf)
- if(result && TURF_SHARES(checked_turf))
+ if(result && Adjacent(checked_turf))
issue_turfs |= checked_turf
if(!alarm_type)
start_activation_process(result)
@@ -278,7 +278,7 @@
issue_turfs -= checked_turf
if(!length(issue_turfs))
start_deactivation_process()
-
+
/**
* Begins activation process of us and our neighbors.
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index b6464443065..b989be0dbbf 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -72,8 +72,8 @@
if(atom_integrity == 0)
playsound(src, SFX_SHATTER, 70, TRUE)
electronics = null
- var/turf/floor = get_turf(src)
- floor.air_update_turf(TRUE, FALSE)
+ /*var/turf/floor = get_turf(src)
+ floor.air_update_turf(TRUE, FALSE)*/
return ..()
/obj/machinery/door/window/update_icon_state()
@@ -214,7 +214,7 @@
icon_state ="[base_state]open"
sleep(10)
set_density(FALSE)
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
update_freelook_sight()
if(operating == 1) //emag again
@@ -236,7 +236,7 @@
icon_state = base_state
set_density(TRUE)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
update_freelook_sight()
sleep(10)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index ab71b554508..99d1e3195f0 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -55,7 +55,7 @@ Buildable meters
update()
pixel_x += rand(-5, 5)
pixel_y += rand(-5, 5)
-
+
//Flipping handled manually due to custom handling for trinary pipes
AddComponent(/datum/component/simple_rotation, ROTATION_NO_FLIPPING)
return ..()
@@ -171,7 +171,7 @@ Buildable meters
// See if we would conflict with any of the potentially interacting machines
for(var/obj/machinery/atmospherics/machine as anything in potentially_conflicting_machines)
// if the pipes have any directions in common, we can't place it that way.
- var/our_init_dirs = SSair.get_init_dirs(pipe_type, fixed_dir(), p_init_dir)
+ var/our_init_dirs = SSzas.get_init_dirs(pipe_type, fixed_dir(), p_init_dir)
if(machine.get_init_directions() & our_init_dirs)
// We have a conflict!
if (length(potentially_conflicting_machines) != 1 || !try_smart_reconfiguration(machine, our_init_dirs, user))
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 17fc788ca5e..eca093c49b7 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -14,16 +14,16 @@
/obj/structure/emergency_shield/Initialize(mapload)
. = ..()
setDir(pick(GLOB.cardinals))
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/emergency_shield/Destroy()
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
. = ..()
/obj/structure/emergency_shield/Move()
var/turf/T = loc
- . = ..()
- move_update_air(T)
+ /*. = ..()
+ move_update_air(T)*/
/obj/structure/emergency_shield/emp_act(severity)
. = ..()
@@ -101,7 +101,7 @@
*/
/obj/structure/emergency_shield/cult/barrier/proc/Toggle()
set_density(!density)
- air_update_turf(TRUE, !density)
+ //air_update_turf(TRUE, !density)
invisibility = initial(invisibility)
if(!density)
invisibility = INVISIBILITY_OBSERVER
@@ -114,7 +114,7 @@
density = TRUE
opacity = FALSE
anchored = FALSE
- pressure_resistance = 2*ONE_ATMOSPHERE
+ //pressure_resistance = 2*ONE_ATMOSPHERE
req_access = list(ACCESS_ENGINE)
max_integrity = 100
var/active = FALSE
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 7233be61c25..3134a41d209 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -48,10 +48,10 @@
if(ispath(cell))
cell = new cell(src)
update_appearance()
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
/obj/machinery/space_heater/Destroy()
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
return..()
/obj/machinery/space_heater/on_deconstruction()
@@ -125,7 +125,7 @@
delta_temperature *= -1
if(delta_temperature)
enviroment.temperature += delta_temperature
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
cell.use(required_energy / efficiency)
/obj/machinery/space_heater/RefreshParts()
@@ -265,7 +265,7 @@
usr.visible_message(span_notice("[usr] switches [on ? "on" : "off"] \the [src]."), span_notice("You switch [on ? "on" : "off"] \the [src]."))
update_appearance()
if (on)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
///For use with heating reagents in a ghetto way
/obj/machinery/space_heater/improvised_chem_heater
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 5a813c89084..abf34991f33 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -326,7 +326,8 @@
ticks -= releasedelay
var/turf/open/T = get_turf(src)
if(istype(T))
- T.atmos_spawn_air("o2=5;plasma=5;TEMP=1000")
+ T.atmos_spawn_air(GAS_OXYGEN, 5, 1000)
+ T.atmos_spawn_air(GAS_PLASMA, 5, 1000)
/obj/effect/anomaly/pyro/detonate()
INVOKE_ASYNC(src, .proc/makepyroslime)
@@ -334,7 +335,9 @@
/obj/effect/anomaly/pyro/proc/makepyroslime()
var/turf/open/T = get_turf(src)
if(istype(T))
- T.atmos_spawn_air("o2=500;plasma=500;TEMP=1000") //Make it hot and burny for the new slime
+ T.atmos_spawn_air(GAS_OXYGEN, 5, 1000)
+ T.atmos_spawn_air(GAS_PLASMA, 5, 1000)
+
var/new_colour = pick("red", "orange")
var/mob/living/simple_animal/slime/S = new(T, new_colour)
S.rabid = TRUE
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index a49d1548b38..80a9ab9b5ba 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -45,14 +45,13 @@
if(hotspot && istype(T) && T.air)
qdel(hotspot)
var/datum/gas_mixture/G = T.air
- if(G.gases[/datum/gas/plasma])
- var/plas_amt = min(30,G.gases[/datum/gas/plasma][MOLES]) //Absorb some plasma
- G.gases[/datum/gas/plasma][MOLES] -= plas_amt
+ if(G.get_gas(GAS_PLASMA))
+ var/plas_amt = min(30, G.get_gas(GAS_PLASMA)) //Absorb some plasma
+ G.remove_gas(GAS_PLASMA, plas_amt)
absorbed_plasma += plas_amt
if(G.temperature > T20C)
G.temperature = max(G.temperature/2,T20C)
- G.garbage_collect()
- T.air_update_turf(FALSE, FALSE)
+ //T.air_update_turf(FALSE, FALSE)
/obj/effect/particle_effect/foam/firefighting/kill_foam()
STOP_PROCESSING(SSfastprocess, src)
@@ -283,16 +282,16 @@
/obj/structure/foamedmetal/Initialize(mapload)
. = ..()
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/foamedmetal/Destroy()
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
. = ..()
/obj/structure/foamedmetal/Move()
var/turf/T = loc
. = ..()
- move_update_air(T)
+ //move_update_air(T)
/obj/structure/foamedmetal/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
@@ -364,12 +363,12 @@
G.temperature = 293.15
for(var/obj/effect/hotspot/H in O)
qdel(H)
- var/list/G_gases = G.gases
+ var/list/G_gases = G.gas
for(var/I in G_gases)
- if(I == /datum/gas/oxygen || I == /datum/gas/nitrogen)
+ if(I == GAS_OXYGEN || I == GAS_NITROGEN)
continue
- G_gases[I][MOLES] = 0
- G.garbage_collect()
+ G_gases[I] = 0
+ G.update_values()
for(var/obj/machinery/atmospherics/components/unary/U in O)
if(!U.welded)
U.welded = TRUE
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 24b1af4ee2a..75308cce91a 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -173,15 +173,12 @@
var/datum/gas_mixture/G = T.air
if(!distcheck || get_dist(T, location) < blast) // Otherwise we'll get silliness like people using Nanofrost to kill people through walls with cold air
G.temperature = temperature
- T.air_update_turf(FALSE, FALSE)
+ //T.air_update_turf(FALSE, FALSE)
for(var/obj/effect/hotspot/H in T)
qdel(H)
- var/list/G_gases = G.gases
- if(G_gases[/datum/gas/plasma])
- G.assert_gas(/datum/gas/nitrogen)
- G_gases[/datum/gas/nitrogen][MOLES] += (G_gases[/datum/gas/plasma][MOLES])
- G_gases[/datum/gas/plasma][MOLES] = 0
- G.garbage_collect()
+ if(G.get_gas(GAS_PLASMA))
+ G.add_gas(GAS_NITROGEN, G.get_gas(GAS_PLASMA))
+ G.remove_gas(GAS_PLASMA, G.gas[GAS_PLASMA])
if (weldvents)
for(var/obj/machinery/atmospherics/components/unary/U in T)
if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index e9fb99dd5e8..d32d35ae8dd 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -86,7 +86,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
///This is used to determine on which slots an item can fit.
var/slot_flags = 0
pass_flags = PASSTABLE
- pressure_resistance = 4
+ //pressure_resistance = 4
/// This var exists as a weird proxy "owner" ref
/// It's used in a few places. Stop using it, and optimially replace all uses please
var/obj/item/master = null
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 2c9a60067f2..e2f7b63f5c5 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -1005,7 +1005,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window())
for(var/direction in GLOB.cardinals)
var/turf/C = get_step(W, direction)
var/list/dupes = checkdupes(C)
- if((isspaceturf(C) || TURF_SHARES(C)) && !dupes.len)
+ if((isspaceturf(C) || C.TryGetNonDenseNeighbour()) && !dupes.len)
candidates += C
if(!candidates.len)
to_chat(user, span_warning("Valid target not found..."))
diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index f376c9d6358..cbc9d797ce6 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
for (var/obj/machinery/atmospherics/O in S.nodes)
O.atmos_init()
O.add_member(src)
- SSair.add_to_rebuild_queue(S)
+ SSzas.add_to_rebuild_queue(S)
// Finally, update our internal state - update_pipe_icon also updates dir and connections
S.update_pipe_icon()
user.visible_message(span_notice("[user] reprograms the \the [S]."),span_notice("You reprogram \the [S]."))
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index ec8483d5961..b8740740a76 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -194,7 +194,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen
var/datum/gas_mixture/air = return_air()
- if(!air || !air.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn
+ if(!air || !air.has_gas(GAS_OXYGEN, 1)) //or oxygen on a tile to burn
to_chat(user, span_notice("Your [name] needs a source of oxygen to burn."))
return ..()
@@ -315,7 +315,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
user?.IgniteMob()
if(!reagents.has_reagent(/datum/reagent/oxygen)) //cigarettes need oxygen
var/datum/gas_mixture/air = return_air()
- if(!air || !air.has_gas(/datum/gas/oxygen, 1)) //or oxygen on a tile to burn
+ if(!air || !air.has_gas(GAS_OXYGEN, 1)) //or oxygen on a tile to burn
extinguish()
return
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 905e7fdecab..123e215b394 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -142,7 +142,7 @@
var/delta_temperature = temp_to_give / environment.heat_capacity()
if(delta_temperature)
environment.temperature += delta_temperature
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
if(admins_warned && internal_heat < max_heat * 0.75)
admins_warned = FALSE
message_admins("Power sink at ([x],[y],[z] - JMP) has cooled down and will not explode.")
diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm
index cf5316866e9..997d0da6585 100644
--- a/code/game/objects/items/devices/scanners/gas_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm
@@ -101,7 +101,7 @@
ui.open()
/obj/item/analyzer/ui_static_data(mob/user)
- return return_atmos_handbooks()
+ return //return_atmos_handbooks()
/obj/item/analyzer/ui_data(mob/user)
LAZYINITLIST(last_gasmix_data)
@@ -125,7 +125,7 @@
/**
* Outputs a message to the user describing the target's gasmixes.
- *
+ *
* Gets called by analyzer_act, which in turn is called by tool_act.
* Also used in other chat-based gas scans.
*/
@@ -133,7 +133,7 @@
var/mixture = target.return_analyzable_air()
if(!mixture)
return FALSE
-
+
var/icon = target
var/message = list()
if(!silent && isliving(user))
@@ -157,17 +157,17 @@
if(total_moles > 0)
message += span_notice("Moles: [round(total_moles, 0.01)] mol")
-
- var/list/cached_gases = air.gases
+
+ var/list/cached_gases = air.gas
for(var/id in cached_gases)
- var/gas_concentration = cached_gases[id][MOLES]/total_moles
- message += span_notice("[cached_gases[id][GAS_META][META_GAS_NAME]]: [round(cached_gases[id][MOLES], 0.01)] mol ([round(gas_concentration*100, 0.01)] %)")
+ var/gas_concentration = air.get_total_moles(gas_id)/total_moles
+ message += span_notice("[id]: [round(air.get_gas(id), 0.01)] mol ([round(gas_concentration*100, 0.01)] %)")
message += span_notice("Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)")
message += span_notice("Volume: [volume] L")
message += span_notice("Pressure: [round(pressure, 0.01)] kPa")
else
message += airs.len > 1 ? span_notice("This node is empty!") : span_notice("[target] is empty!")
-
+
gasmix_data += list(gas_mixture_parser(air, mix_name))
if(istype(tool))
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index 730df0413be..c1234098dfd 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -202,9 +202,9 @@
for(var/turf/T in turflist)
if(T == previousturf)
continue //so we don't burn the tile we be standin on
- var/list/turfs_sharing_with_prev = previousturf.get_atmos_adjacent_turfs(alldir=1)
+ /*var/list/turfs_sharing_with_prev = previousturf.TryGetNonDenseNeighbour()
if(!(T in turfs_sharing_with_prev))
- break
+ break*/
if(igniter)
igniter.ignite_turf(src,T)
else
diff --git a/code/game/objects/items/grenades/atmos_grenades.dm b/code/game/objects/items/grenades/atmos_grenades.dm
index 27223969a34..a17fe6e9e32 100644
--- a/code/game/objects/items/grenades/atmos_grenades.dm
+++ b/code/game/objects/items/grenades/atmos_grenades.dm
@@ -70,6 +70,8 @@
var/distance_from_center = max(get_dist(turf_loc, loc), 1)
var/turf/open/floor_loc = turf_loc
floor_loc.atmos_spawn_air("n2=[n2_gas_amount / distance_from_center];o2=[o2_gas_amount / distance_from_center];TEMP=273")
+ floor_loc.atmos_spawn_air(GAS_NITROGEN, n2_gas_amount/distance_from_center, 273)
+ floor_loc.atmos_spawn_air(GAS_OXYGEN, o2_gas_amount/distance_from_center, 273)
qdel(src)
/obj/item/grenade/gas_crystal/nitrous_oxide_crystal
diff --git a/code/game/objects/items/secret_documents.dm b/code/game/objects/items/secret_documents.dm
index 8c5780b1785..3c42f9c9396 100644
--- a/code/game/objects/items/secret_documents.dm
+++ b/code/game/objects/items/secret_documents.dm
@@ -18,7 +18,7 @@
throw_range = 1
throw_speed = 1
layer = MOB_LAYER
- pressure_resistance = 2
+ //pressure_resistance = 2
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
///Nanotrasen documents
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 3e3eb90e583..14fafa34062 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -41,8 +41,7 @@
/obj/item/tank/jetpack/populate_gas()
if(gas_type)
var/datum/gas_mixture/our_mix = return_air()
- our_mix.assert_gas(gas_type)
- our_mix.gases[gas_type][MOLES] = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
+ our_mix.adjust_gas(gas_type, (6*ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
/obj/item/tank/jetpack/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/toggle_jetpack))
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 093048267da..f2bab55a201 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -17,7 +17,7 @@
slot_flags = ITEM_SLOT_BACK
worn_icon = 'icons/mob/clothing/back.dmi' //since these can also get thrown into suit storage slots. if something goes on the belt, set this to null.
hitsound = 'sound/weapons/smash.ogg'
- pressure_resistance = ONE_ATMOSPHERE * 5
+ //pressure_resistance = ONE_ATMOSPHERE * 5
force = 5
throwforce = 10
throw_speed = 1
@@ -89,7 +89,7 @@
AddComponent(/datum/component/atmos_reaction_recorder, reset_criteria = list(COMSIG_GASMIX_MERGING = air_contents, COMSIG_GASMIX_REMOVING = air_contents), target_list = reaction_info)
- // This is separate from the reaction recorder.
+ // This is separate from the reaction recorder.
// In this case we are only listening to determine if the tank is overpressurized but not destroyed.
RegisterSignal(air_contents, COMSIG_GASMIX_MERGED, .proc/merging_information)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 08773b1cf19..a69ef63a050 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -1,7 +1,7 @@
/// Inert structures, such as girders, machine frames, and crates/lockers.
/obj/structure
icon = 'icons/obj/structures.dmi'
- pressure_resistance = 8
+ //pressure_resistance = 8
max_integrity = 300
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
layer = BELOW_OBJ_LAYER
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index a59bfebb0be..d025218944f 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -68,10 +68,10 @@
/obj/structure/alien/resin/Initialize(mapload)
. = ..()
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/alien/resin/Destroy()
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
. = ..()
/obj/structure/alien/resin/Move()
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 2cac5b155ae..971e5b2bd6c 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -31,7 +31,7 @@
var/obj/item/stack/initialized_mineral = new mineral // Okay this kinda sucks.
set_custom_materials(initialized_mineral.mats_per_unit, mineral_amount)
qdel(initialized_mineral)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/falsewall/attack_hand(mob/user, list/modifiers)
if(opening)
@@ -55,7 +55,7 @@
set_opacity(density)
opening = FALSE
update_appearance()
- air_update_turf(TRUE, !density)
+ //air_update_turf(TRUE, !density)
/obj/structure/falsewall/update_icon(updates=ALL)//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
. = ..()
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 8274b934286..fe236a97e8a 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -11,7 +11,7 @@
anchored = TRUE
pass_flags_self = PASSGRILLE
flags_1 = CONDUCT_1
- pressure_resistance = 5*ONE_ATMOSPHERE
+ //pressure_resistance = 5*ONE_ATMOSPHERE
armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 100, BOMB = 10, BIO = 100, FIRE = 0, ACID = 0)
max_integrity = 50
integrity_failure = 0.4
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 0e8c5023747..c0f1886ee61 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -106,7 +106,7 @@
. = ..()
var/turf/local = get_turf(loc)
ADD_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/holosign/barrier/atmos/block_superconductivity() //Didn't used to do this, but it's "normal", and will help ease heat flow transitions with the players.
return TRUE
@@ -114,7 +114,7 @@
/obj/structure/holosign/barrier/atmos/Destroy()
var/turf/local = get_turf(loc)
REMOVE_TRAIT(local, TRAIT_FIREDOOR_STOP, TRAIT_GENERIC)
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
return ..()
/obj/structure/holosign/barrier/cyborg
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 0f709dcd547..1f49ac6602a 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -33,11 +33,11 @@
var/obj/item/stack/initialized_mineral = new sheetType // Okay this kinda sucks.
set_custom_materials(initialized_mineral.mats_per_unit, sheetAmount)
qdel(initialized_mineral)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/mineral_door/Destroy()
if(!door_opened)
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
. = ..()
/obj/structure/mineral_door/Move()
@@ -104,7 +104,7 @@
set_density(FALSE)
door_opened = TRUE
layer = OPEN_DOOR_LAYER
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
update_appearance()
isSwitchingStates = FALSE
@@ -125,7 +125,7 @@
set_opacity(TRUE)
door_opened = FALSE
layer = initial(layer)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
update_appearance()
isSwitchingStates = FALSE
@@ -144,7 +144,7 @@
/obj/structure/mineral_door/set_anchored(anchorvalue) //called in default_unfasten_wrench() chain
. = ..()
set_opacity(anchored ? !door_opened : FALSE)
- air_update_turf(TRUE, anchorvalue)
+ //air_update_turf(TRUE, anchorvalue)
/obj/structure/mineral_door/wrench_act(mob/living/user, obj/item/tool)
. = ..()
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 8604fd64825..7de6274d8e1 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -35,7 +35,7 @@
return TRUE
set_anchored(!anchored)
update_atmos_behaviour()
- air_update_turf(TRUE)
+ //air_update_turf(TRUE)
to_chat(user, span_notice("You [uraction] the floor."))
return TRUE
@@ -113,10 +113,10 @@
/obj/structure/plasticflaps/Initialize(mapload)
. = ..()
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/plasticflaps/Destroy()
var/atom/oldloc = loc
. = ..()
if (oldloc)
- oldloc.air_update_turf(TRUE, FALSE)
+ oldloc.//air_update_turf(TRUE, FALSE)
diff --git a/code/game/objects/structures/tram_walls.dm b/code/game/objects/structures/tram_walls.dm
index bb077f16bac..cfbbec9591f 100644
--- a/code/game/objects/structures/tram_walls.dm
+++ b/code/game/objects/structures/tram_walls.dm
@@ -30,7 +30,7 @@
var/obj/item/stack/initialized_mineral = new mineral
set_custom_materials(initialized_mineral.mats_per_unit, mineral_amount)
qdel(initialized_mineral)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/tramwall/attackby(obj/item/welder, mob/user, params)
if(welder.tool_behaviour == TOOL_WELDER)
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 951e1acbee2..64eaf8362c0 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -170,7 +170,7 @@
return
var/datum/gas_mixture/floor_mixture = loc.return_air()
if(pod.air_contents.equalize(floor_mixture)) //equalize the pod's mix with the tile it's on
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
/obj/structure/transit_tube/station/init_tube_dirs()
switch(dir)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 3852bc3267f..ef5b5541cd5 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -33,7 +33,7 @@
. = ..()
if(set_dir)
setDir(set_dir)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
var/static/list/loc_connections = list(
COMSIG_ATOM_EXIT = .proc/on_exit,
@@ -44,7 +44,7 @@
/obj/structure/windoor_assembly/Destroy()
set_density(FALSE)
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
return ..()
/obj/structure/windoor_assembly/Move()
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 4e4e0a2a010..6a787119060 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -4,7 +4,7 @@
icon_state = "window"
density = TRUE
layer = ABOVE_OBJ_LAYER //Just above doors
- pressure_resistance = 4*ONE_ATMOSPHERE
+ //pressure_resistance = 4*ONE_ATMOSPHERE
anchored = TRUE //initially is 0 for tile smoothing
flags_1 = ON_BORDER_1
max_integrity = 25
@@ -58,7 +58,7 @@
if(reinf && anchored)
state = RWINDOW_SECURE
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
if(fulltile)
setDir()
@@ -248,7 +248,7 @@
/obj/structure/window/set_anchored(anchorvalue)
..()
- air_update_turf(TRUE, anchorvalue)
+ //air_update_turf(TRUE, anchorvalue)
update_nearby_icons()
/obj/structure/window/proc/check_state(checked_state)
@@ -313,7 +313,7 @@
. += new /obj/item/shard(location)
/obj/structure/window/proc/AfterRotation(mob/user, degrees)
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
/obj/structure/window/proc/on_painted(obj/structure/window/source, is_dark_color)
SIGNAL_HANDLER
@@ -324,7 +324,7 @@
/obj/structure/window/Destroy()
set_density(FALSE)
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
update_nearby_icons()
return ..()
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 5e93cc1cf66..32ee69b0d81 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -183,7 +183,7 @@
/turf/open/TakeTemperature(temp)
air.temperature += temp
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
/turf/open/proc/freeze_turf()
for(var/obj/I in contents)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 36d5d42f270..e4f54355ada 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -127,8 +127,10 @@ GLOBAL_LIST_EMPTY(station_turfs)
if(our_area.area_has_base_lighting && always_lit) //Only provide your own lighting if the area doesn't for you
add_overlay(GLOB.fullbright_overlay)
+ /*
if(requires_activation)
CALCULATE_ADJACENT_TURFS(src, KILL_EXCITED)
+ */
if (light_power && light_range)
update_light()
@@ -158,9 +160,10 @@ GLOBAL_LIST_EMPTY(station_turfs)
return INITIALIZE_HINT_NORMAL
+/*
/turf/proc/Initalize_Atmos(times_fired)
CALCULATE_ADJACENT_TURFS(src, NORMAL_TURF)
-
+*/
/turf/Destroy(force)
. = QDEL_HINT_IWILLGC
if(!changing_turf)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 3c7d27283ac..7055901b8d3 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -604,7 +604,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
set category = "Debug"
if(!check_rights(R_DEBUG))
return
- SSair.ui_interact(mob)
+ //SSair.ui_interact(mob)
/client/proc/reload_cards()
set name = "Reload Cards"
diff --git a/code/modules/antagonists/abductor/equipment/glands/plasma.dm b/code/modules/antagonists/abductor/equipment/glands/plasma.dm
index 9dc1cc0f9c7..07bfd96d02e 100644
--- a/code/modules/antagonists/abductor/equipment/glands/plasma.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/plasma.dm
@@ -16,7 +16,7 @@
if(!owner)
return
owner.visible_message(span_danger("[owner] vomits a cloud of plasma!"))
- var/turf/open/T = get_turf(owner)
+ var/turf/simulated/open/T = get_turf(owner)
if(istype(T))
- T.atmos_spawn_air("plasma=50;TEMP=[T20C]")
+ T.atmos_spawn_air(GAS_PLASMA, 20, T20C)
owner.vomit()
diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm
index 4a6aaecda03..66c27170f30 100644
--- a/code/modules/antagonists/blob/blob_mobs.dm
+++ b/code/modules/antagonists/blob/blob_mobs.dm
@@ -282,7 +282,7 @@
verb_exclaim = "roars"
verb_yell = "bellows"
force_threshold = 10
- pressure_resistance = 50
+ //pressure_resistance = 50
mob_size = MOB_SIZE_LARGE
hud_type = /datum/hud/living/blobbernaut
diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm
index 818d0261a40..7734c3c363d 100644
--- a/code/modules/antagonists/blob/structures/_blob.dm
+++ b/code/modules/antagonists/blob/structures/_blob.dm
@@ -42,7 +42,7 @@
setDir(pick(GLOB.cardinals))
update_appearance()
if(atmosblock)
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
ConsumeTile()
if(!QDELETED(src)) //Consuming our tile can in rare cases cause us to del
AddElement(/datum/element/swabable, CELL_LINE_TABLE_BLOB, CELL_VIRUS_TABLE_GENERIC, 2, 2)
@@ -69,7 +69,7 @@
/obj/structure/blob/Destroy()
if(atmosblock)
atmosblock = FALSE
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
if(overmind)
overmind.all_blobs -= src
overmind.blobs_legit -= src //if it was in the legit blobs list, it isn't now
diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm
index d086050210c..a329a247081 100644
--- a/code/modules/antagonists/blob/structures/shield.dm
+++ b/code/modules/antagonists/blob/structures/shield.dm
@@ -32,7 +32,7 @@
. = ..()
if(. && atom_integrity > 0)
atmosblock = atom_integrity < (max_integrity * 0.5)
- air_update_turf(TRUE, atmosblock)
+ //air_update_turf(TRUE, atmosblock)
/obj/structure/blob/shield/update_icon_state()
icon_state = "[initial(icon_state)][(atom_integrity < (max_integrity * 0.5)) ? "_damaged" : null]"
diff --git a/code/modules/atmospherics/ZAS/Airflow.dm b/code/modules/atmospherics/ZAS/Airflow.dm
index 49020e27a64..35fb5c34620 100644
--- a/code/modules/atmospherics/ZAS/Airflow.dm
+++ b/code/modules/atmospherics/ZAS/Airflow.dm
@@ -2,67 +2,91 @@
Contains helper procs for airflow, handled in /connection_group.
*/
-mob/var/tmp/last_airflow_stun = 0
-mob/proc/airflow_stun()
+/mob/var/tmp/last_airflow_stun = 0
+/mob/proc/airflow_stun()
+ return
+/mob/living/airflow_stun()
if(stat == 2)
return 0
- if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
+ if(last_airflow_stun > world.time - SSzas.settings.airflow_stun_cooldown) return 0
- if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
+ if(!(status_flags & CANSTUN) && !(status_flags & CANKNOCKDOWN))
to_chat(src, "You stay upright as the air rushes past you.")
return 0
if(buckled)
to_chat(src, "Air suddenly rushes past you!")
return 0
- if(!lying)
+ if(!body_position == LYING_DOWN)
to_chat(src, "The sudden rush of air knocks you over!")
- Weaken(5)
+
+ slip(5, null, GALOSHES_DONT_HELP|SLIDE, 0, TRUE)
last_airflow_stun = world.time
-mob/living/silicon/airflow_stun()
+/mob/living/silicon/airflow_stun()
return
-mob/living/carbon/slime/airflow_stun()
+/mob/living/carbon/slime/airflow_stun()
return
-mob/living/carbon/human/airflow_stun()
+/mob/living/carbon/human/airflow_stun()
if(!slip_chance())
to_chat(src, "Air suddenly rushes past you!")
return 0
..()
-atom/movable/proc/check_airflow_movable(n)
+/mob/proc/slip_chance()
+ return
+
+/mob/living/carbon/human/slip_chance(prob_slip = 10)
+ if(stat)
+ return FALSE
+ if(buckled)
+ return FALSE
+ if(shoes)
+ var/obj/item/clothing/shoes = shoes
+ if(shoes.clothing_flags & NOSLIP|NOSLIP_ICE)
+ return FALSE
+
+ if(m_intent == MOVE_INTENT_RUN) //No running in the halls!
+ prob_slip *= 2
+
+ if(HAS_TRAIT(src, TRAIT_NOSLIPALL))
+ return
+ return prob_slip
+
+/atom/movable/proc/check_airflow_movable(n)
if(anchored && !ismob(src)) return 0
- if(!isobj(src) && n < vsc.airflow_dense_pressure) return 0
+ if(!isobj(src) && n < SSzas.settings.airflow_dense_pressure) return 0
return 1
-mob/check_airflow_movable(n)
- if(n < vsc.airflow_heavy_pressure)
+/mob/check_airflow_movable(n)
+ if(n < SSzas.settings.airflow_heavy_pressure)
return 0
return 1
-mob/living/silicon/check_airflow_movable()
+/mob/living/silicon/check_airflow_movable()
return 0
+/obj/check_airflow_movable(n)
+ if(n < SSzas.settings.airflow_dense_pressure) return 0
-obj/check_airflow_movable(n)
- if(isnull(w_class))
- if(n < vsc.airflow_dense_pressure) return 0 //most non-item objs don't have a w_class yet
- else
- switch(w_class)
- if(1,2)
- if(n < vsc.airflow_lightest_pressure) return 0
- if(3)
- if(n < vsc.airflow_light_pressure) return 0
- if(4,5)
- if(n < vsc.airflow_medium_pressure) return 0
- if(6)
- if(n < vsc.airflow_heavy_pressure) return 0
- if(7 to INFINITY)
- if(n < vsc.airflow_dense_pressure) return 0
+ return ..()
+
+/obj/item/check_airflow_movable(n)
+ switch(w_class)
+ if(1,2)
+ if(n < SSzas.settings.airflow_lightest_pressure) return 0
+ if(3)
+ if(n < SSzas.settings.airflow_light_pressure) return 0
+ if(4,5)
+ if(n < SSzas.settings.airflow_medium_pressure) return 0
+ if(6)
+ if(n < SSzas.settings.airflow_heavy_pressure) return 0
+ if(7 to INFINITY)
+ if(n < SSzas.settings.airflow_dense_pressure) return 0
return ..()
@@ -80,8 +104,8 @@ obj/check_airflow_movable(n)
return 0
if(buckled)
return 0
- var/obj/item/shoes = get_equipped_item(slot_shoes)
- if(istype(shoes) && (shoes.item_flags & ITEM_FLAG_NOSLIP))
+ var/obj/item/clothing/shoes = get_item_by_slot(ITEM_SLOT_FEET)
+ if(istype(shoes) && (shoes.clothing_flags & NOSLIP))
return 0
return 1
@@ -98,52 +122,55 @@ obj/check_airflow_movable(n)
airborne_acceleration = 0
. = ..()
-atom/movable/proc/airflow_hit(atom/A)
+/atom/movable/proc/airflow_hit(atom/A)
airflow_speed = 0
airflow_dest = null
airborne_acceleration = 0
-mob/airflow_hit(atom/A)
+/mob/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
- Weaken(weak_amt)
. = ..()
-obj/airflow_hit(atom/A)
+/mob/living/airflow_hit(atom/A)
+ var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
+ Knockdown(weak_amt)
+ return ..()
+
+/obj/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
. = ..()
-obj/item/airflow_hit(atom/A)
+/obj/item/airflow_hit(atom/A)
airflow_speed = 0
airflow_dest = null
-mob/living/carbon/human/airflow_hit(atom/A)
-// for(var/mob/M in hearers(src))
-// M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2)
+/mob/living/carbon/human/airflow_hit(atom/A)
+ for(var/mob/M in hearers(src))
+ M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2)
playsound(src.loc, "punch", 25, 1, -1)
if (prob(33))
- loc:add_blood(src)
- bloody_body(src)
- var/b_loss = min(airflow_speed, (airborne_acceleration*2)) * vsc.airflow_damage
+ var/obj/effect/decal/cleanable/blood/new_splatter = new(loc)
+
+ var/b_loss = min(airflow_speed, (airborne_acceleration*2)) * SSzas.settings.airflow_damage
- apply_damage(b_loss/3, BRUTE, BP_HEAD, used_weapon = "Airflow")
+ apply_damage(b_loss/3, BRUTE, BODY_ZONE_HEAD)
- apply_damage(b_loss/3, BRUTE, BP_CHEST, used_weapon = "Airflow")
+ apply_damage(b_loss/3, BRUTE, BODY_ZONE_CHEST)
- apply_damage(b_loss/3, BRUTE, BP_GROIN, used_weapon = "Airflow")
if(airflow_speed > 10)
- Paralyse(round(airflow_speed * vsc.airflow_stun))
- Stun(paralysis + 3)
+ Paralyze(round(airflow_speed * SSzas.settings.airflow_stun))
+ Stun(round(airflow_speed * SSzas.settings.airflow_stun) + 3)
else
- Stun(round(airflow_speed * vsc.airflow_stun/2))
- . = ..()
+ Stun(round(airflow_speed * SSzas.settings.airflow_stun/2))
+ return ..()
-zone/proc/movables()
+/zone/proc/movables()
. = list()
for(var/turf/T in contents)
for(var/atom/movable/A in T)
diff --git a/code/modules/atmospherics/ZAS/Atom.dm b/code/modules/atmospherics/ZAS/Atom.dm
index fdf263052e7..1f4b9cf7beb 100644
--- a/code/modules/atmospherics/ZAS/Atom.dm
+++ b/code/modules/atmospherics/ZAS/Atom.dm
@@ -1,36 +1,21 @@
-
-/atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
- //Purpose: Determines if the object (or airflow) can pass this atom.
- //Called by: Movement, airflow.
- //Inputs: The moving atom (optional), target turf, "height" and air group
- //Outputs: Boolean if can pass.
-
- return (!density || !height || air_group)
-
/turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
- if(!target) return 0
+ if(target.blocks_air||blocks_air)
+ return 0
- if(istype(mover)) // turf/Enter(...) will perform more advanced checks
- return !density
-
- else // Now, doing more detailed checks for air movement and air group formation
- if(target.blocks_air||blocks_air)
+ for(var/obj/obstacle in src)
+ if(!obstacle.CanPass(mover, target, height, air_group))
return 0
-
- for(var/obj/obstacle in src)
- if(!obstacle.CanPass(mover, target, height, air_group))
+ if(target != src)
+ for(var/obj/obstacle in target)
+ if(!obstacle.CanPass(mover, src, height, air_group))
return 0
- if(target != src)
- for(var/obj/obstacle in target)
- if(!obstacle.CanPass(mover, src, height, air_group))
- return 0
- return 1
+ return ..()
//Convenience function for atoms to update turfs they occupy
/atom/movable/proc/update_nearby_tiles(need_rebuild)
for(var/turf/simulated/turf in locs)
- SSair.mark_for_update(turf)
+ SSzas.mark_for_update(turf)
return 1
@@ -40,14 +25,14 @@
// AIR_BLOCKED - Blocked
// ZONE_BLOCKED - Not blocked, but zone boundaries will not cross.
// BLOCKED - Blocked, zone boundaries will not cross even if opened.
-atom/proc/c_airblock(turf/other)
+/atom/proc/c_airblock(turf/other)
#ifdef ZASDBG
ASSERT(isturf(other))
#endif
return (AIR_BLOCKED*!CanPass(null, other, 0, 0))|(ZONE_BLOCKED*!CanPass(null, other, 1.5, 1))
// This is a legacy proc only here for compatibility - you probably should just use ATMOS_CANPASS_TURF directly.
-turf/c_airblock(turf/other)
+/turf/c_airblock(turf/other)
#ifdef ZASDBG
ASSERT(isturf(other))
#endif
@@ -55,5 +40,12 @@ turf/c_airblock(turf/other)
. = 0
ATMOS_CANPASS_TURF(., src, other)
-/atom/movable
- var/atmos_canpass = CANPASS_ALWAYS
+/atom/proc/zas_mark_update()
+ var/turf/local_turf = get_turf(loc)
+ if(!local_turf)
+ return
+ SSzas.mark_for_update(local_turf)
+
+/atom
+ var/simulated = TRUE
+ var/can_atmos_pass = ATMOS_PASS_YES
diff --git a/code/modules/atmospherics/ZAS/Connection.dm b/code/modules/atmospherics/ZAS/Connection.dm
index 17c8ea16281..c7f33a0aaaf 100644
--- a/code/modules/atmospherics/ZAS/Connection.dm
+++ b/code/modules/atmospherics/ZAS/Connection.dm
@@ -5,7 +5,7 @@
/*
Overview:
- Connections are made between turfs by SSair.connect(). They represent a single point where two zones converge.
+ Connections are made between turfs by SSzas.connect(). They represent a single point where two zones converge.
Class Vars:
A - Always a simulated turf.
@@ -60,19 +60,19 @@ Class Procs:
/connection/New(turf/simulated/A, turf/simulated/B)
#ifdef ZASDBG
- ASSERT(SSair.has_valid_zone(A))
- //ASSERT(SSair.has_valid_zone(B))
+ ASSERT(SSzas.has_valid_zone(A))
+ //ASSERT(SSzas.has_valid_zone(B))
#endif
src.A = A
src.B = B
zoneA = A.zone
if(!istype(B))
mark_space()
- edge = SSair.get_edge(A.zone,B)
+ edge = SSzas.get_edge(A.zone,B)
edge.add_connection(src)
else
zoneB = B.zone
- edge = SSair.get_edge(A.zone,B.zone)
+ edge = SSzas.get_edge(A.zone,B.zone)
edge.add_connection(src)
/connection/proc/mark_direct()
@@ -108,7 +108,7 @@ Class Procs:
erase()
return
- var/block_status = SSair.air_blocked(A,B)
+ var/block_status = SSzas.air_blocked(A,B)
if(block_status & AIR_BLOCKED)
// log_debug("Blocked connection.")
erase()
@@ -133,7 +133,7 @@ Class Procs:
return
else
edge.remove_connection(src)
- edge = SSair.get_edge(A.zone, B)
+ edge = SSzas.get_edge(A.zone, B)
edge.add_connection(src)
zoneA = A.zone
@@ -155,7 +155,7 @@ Class Procs:
// log_debug("Zones changed, \...")
if(A.zone && B.zone)
edge.remove_connection(src)
- edge = SSair.get_edge(A.zone, B.zone)
+ edge = SSzas.get_edge(A.zone, B.zone)
edge.add_connection(src)
zoneA = A.zone
zoneB = B.zone
@@ -165,4 +165,4 @@ Class Procs:
return
-// log_debug("valid.")
\ No newline at end of file
+// log_debug("valid.")
diff --git a/code/modules/atmospherics/ZAS/ConnectionGroup.dm b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
index 17249aae155..caafd283649 100644
--- a/code/modules/atmospherics/ZAS/ConnectionGroup.dm
+++ b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
@@ -2,7 +2,7 @@
Overview:
These are what handle gas transfers between zones and into space.
- They are found in a zone's edges list and in SSair.edges.
+ They are found in a zone's edges list and in SSzas.edges.
Each edge updates every air tick due to their role in gas transfer.
They come in two flavors, /connection_edge/zone and /connection_edge/unsimulated.
As the type names might suggest, they handle inter-zone and spacelike connections respectively.
@@ -49,7 +49,7 @@ Class Procs:
flow(list/movable, differential, repelled)
Airflow proc causing all objects in movable to be checked against a pressure differential.
If repelled is true, the objects move away from any turf in connecting_turfs, otherwise they approach.
- A check against vsc.lightest_airflow_pressure should generally be performed before calling this.
+ A check against SSzas.settings.lightest_airflow_pressure should generally be performed before calling this.
get_connected_zone(zone/from)
Helper proc that allows getting the other zone of an edge given one of them.
@@ -86,7 +86,7 @@ Class Procs:
/connection_edge/proc/contains_zone(zone/Z)
/connection_edge/proc/erase()
- SSair.remove_edge(src)
+ SSzas.remove_edge(src)
// log_debug("[type] Erased.")
@@ -99,11 +99,11 @@ Class Procs:
var/atom/movable/M = movable[i]
//If they're already being tossed, don't do it again.
- if(M.last_airflow > world.time - vsc.airflow_delay) continue
+ if(M.last_airflow > world.time - SSzas.settings.airflow_delay) continue
if(M.airflow_speed) continue
//Check for knocking people over
- if(ismob(M) && differential > vsc.airflow_stun_pressure)
+ if(ismob(M) && differential > SSzas.settings.airflow_stun_pressure)
if(M:status_flags & GODMODE) continue
M:airflow_stun()
@@ -158,7 +158,7 @@ Class Procs:
var/equiv = A.air.share_ratio(B.air, coefficient)
var/differential = A.air.return_pressure() - B.air.return_pressure()
- if(abs(differential) >= vsc.airflow_lightest_pressure)
+ if(abs(differential) >= SSzas.settings.airflow_lightest_pressure)
var/list/attracted
var/list/repelled
if(differential > 0)
@@ -174,19 +174,19 @@ Class Procs:
if(equiv)
if(direct)
erase()
- SSair.merge(A, B)
+ SSzas.merge(A, B)
return
else
A.air.equalize(B.air)
- SSair.mark_edge_sleeping(src)
+ SSzas.mark_edge_sleeping(src)
- SSair.mark_zone_update(A)
- SSair.mark_zone_update(B)
+ SSzas.mark_zone_update(A)
+ SSzas.mark_zone_update(B)
/connection_edge/zone/recheck()
if(!A.air.compare(B.air, vacuum_exception = 1))
// Edges with only one side being vacuum need processing no matter how close.
- SSair.mark_edge_active(src)
+ SSzas.mark_edge_active(src)
//Helper proc to get connections for a zone.
/connection_edge/zone/proc/get_connected_zone(zone/from)
@@ -230,24 +230,24 @@ Class Procs:
var/equiv = A.air.share_space(air)
var/differential = A.air.return_pressure() - air.return_pressure()
- if(abs(differential) >= vsc.airflow_lightest_pressure)
+ if(abs(differential) >= SSzas.settings.airflow_lightest_pressure)
var/list/attracted = A.movables()
flow(attracted, abs(differential), differential < 0)
if(equiv)
A.air.copy_from(air)
- SSair.mark_edge_sleeping(src)
+ SSzas.mark_edge_sleeping(src)
- SSair.mark_zone_update(A)
+ SSzas.mark_zone_update(A)
/connection_edge/unsimulated/recheck()
// Edges with only one side being vacuum need processing no matter how close.
// Note: This handles the glaring flaw of a room holding pressure while exposed to space, but
// does not specially handle the less common case of a simulated room exposed to an unsimulated pressurized turf.
if(!A.air.compare(air, vacuum_exception = 1))
- SSair.mark_edge_active(src)
+ SSzas.mark_edge_active(src)
-proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
+/proc/ShareHeat(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
//This implements a simplistic version of the Stefan-Boltzmann law.
var/energy_delta = ((A.temperature - B.temperature) ** 4) * STEFAN_BOLTZMANN_CONSTANT * connecting_tiles * 2.5
var/maximum_energy_delta = max(0, min(A.temperature * A.heat_capacity() * A.group_multiplier, B.temperature * B.heat_capacity() * B.group_multiplier))
diff --git a/code/modules/atmospherics/ZAS/Debug.dm b/code/modules/atmospherics/ZAS/Debug.dm
index 6f0a67fd3eb..0022e12c3ed 100644
--- a/code/modules/atmospherics/ZAS/Debug.dm
+++ b/code/modules/atmospherics/ZAS/Debug.dm
@@ -16,5 +16,5 @@ var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark")
overlays += img
dbg_img = img
-proc/soft_assert(thing,fail)
- if(!thing) message_admins(fail)
\ No newline at end of file
+/proc/soft_assert(thing,fail)
+ if(!thing) message_admins(fail)
diff --git a/code/modules/atmospherics/ZAS/Diagnostic.dm b/code/modules/atmospherics/ZAS/Diagnostic.dm
index 4433dfefdd8..40e89108b7d 100644
--- a/code/modules/atmospherics/ZAS/Diagnostic.dm
+++ b/code/modules/atmospherics/ZAS/Diagnostic.dm
@@ -1,4 +1,4 @@
-client/proc/Zone_Info(turf/T as null|turf)
+/client/proc/Zone_Info(turf/T as null|turf)
set category = "Debug"
if(T)
if(istype(T,/turf/simulated) && T:zone)
@@ -15,9 +15,9 @@ client/proc/Zone_Info(turf/T as null|turf)
images -= zone_debug_images[zone]
zone_debug_images = null
-client/var/list/zone_debug_images
+/client/var/list/zone_debug_images
-client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf)
+/client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf)
set category = "Debug"
if(!istype(T))
return
@@ -76,7 +76,9 @@ client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf)
else
to_chat(mob, "both turfs can merge.")
-client/proc/ZASSettings()
+/*
+/client/proc/ZASSettings()
set category = "Debug"
- vsc.SetDefault(mob)
+ SSzas.settings.SetDefault(mob)
+*/
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
index 477714c2c76..5f539ba0d12 100644
--- a/code/modules/atmospherics/ZAS/Fire.dm
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -11,7 +11,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/turf/var/obj/fire/fire = null
//Some legacy definitions so fires can be started.
-atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return null
/atom/movable/proc/is_burnable()
@@ -20,7 +20,7 @@ atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed
/mob/is_burnable()
return simulated
-turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
+/turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
/turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
@@ -42,7 +42,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
return igniting
/zone/proc/process_fire()
- var/datum/gas_mixture/burn_gas = air.remove_ratio(vsc.fire_consuption_rate, fire_tiles.len)
+ var/datum/gas_mixture/burn_gas = air.remove_ratio(SSzas.settings.fire_consuption_rate, fire_tiles.len)
var/firelevel = burn_gas.react(src, fire_tiles, force_burn = 1, no_check = 1)
@@ -64,7 +64,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
fuel_objs.Cut()
if(!fire_tiles.len)
- SSair.active_fire_zones.Remove(src)
+ SSzas.active_fire_zones.Remove(src)
/zone/proc/remove_liquidfuel(var/used_liquid_fuel, var/remove_fire=0)
if(!fuel_objs.len)
@@ -105,7 +105,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
return 1
fire = new(src, fl)
- SSair.active_fire_zones |= zone
+ SSzas.active_fire_zones |= zone
var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in src
zone.fire_tiles |= src
@@ -158,7 +158,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
A.fire_act(air_contents, air_contents.temperature, air_contents.volume)
//spread
- for(var/direction in GLOB.cardinal)
+ for(var/direction in GLOB.cardinals)
var/turf/simulated/enemy_tile = get_step(my_tile, direction)
if(istype(enemy_tile))
@@ -179,7 +179,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
continue
//Spread the fire.
- if(prob( 50 + 50 * (firelevel/vsc.fire_firelevel_multiplier) ) && my_tile.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, my_tile, 0,0))
+ if(prob( 50 + 50 * (firelevel/SSzas.settings.fire_firelevel_multiplier) ) && my_tile.CanPass(null, enemy_tile, 0,0) && enemy_tile.CanPass(null, my_tile, 0,0))
enemy_tile.create_fire(firelevel)
else
@@ -195,17 +195,17 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
qdel(src)
return
- set_dir(pick(GLOB.cardinal))
+ setDir(pick(GLOB.cardinal))
var/datum/gas_mixture/air_contents = loc.return_air()
color = fire_color(air_contents.temperature)
set_light(0.5, 1, 3, l_color = color)
firelevel = fl
- SSair.active_hotspots.Add(src)
+ SSzas.active_hotspots.Add(src)
/obj/fire/proc/fire_color(var/env_temperature)
- var/temperature = max(4000*sqrt(firelevel/vsc.fire_firelevel_multiplier), env_temperature)
+ var/temperature = max(4000*sqrt(firelevel/SSzas.settings.fire_firelevel_multiplier), env_temperature)
return heat2color(temperature)
/obj/fire/Destroy()
@@ -213,7 +213,7 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
if (istype(T))
set_light(0)
T.fire = null
- SSair.active_hotspots.Remove(src)
+ SSzas.active_hotspots.Remove(src)
. = ..()
/turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again.
@@ -238,9 +238,9 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
//*** Get the fuel and oxidizer amounts
for(var/g in gas)
- if(gas_data.flags[g] & XGM_GAS_FUEL)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_FUEL)
gas_fuel += gas[g]
- if(gas_data.flags[g] & XGM_GAS_OXIDIZER)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_OXIDIZER)
total_oxidizers += gas[g]
gas_fuel *= group_multiplier
total_oxidizers *= group_multiplier
@@ -266,12 +266,12 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
var/reaction_limit = min(total_oxidizers*(FIRE_REACTION_FUEL_AMOUNT/FIRE_REACTION_OXIDIZER_AMOUNT), total_fuel) //stoichiometric limit
//vapour fuels are extremely volatile! The reaction progress is a percentage of the total fuel (similar to old zburn).)
- var/gas_firelevel = calculate_firelevel(gas_fuel, total_oxidizers, reaction_limit, volume*group_multiplier) / vsc.fire_firelevel_multiplier
+ var/gas_firelevel = calculate_firelevel(gas_fuel, total_oxidizers, reaction_limit, volume*group_multiplier) / SSzas.settings.fire_firelevel_multiplier
var/min_burn = 0.30*volume*group_multiplier/CELL_VOLUME //in moles - so that fires with very small gas concentrations burn out fast
var/gas_reaction_progress = min(max(min_burn, gas_firelevel*gas_fuel)*FIRE_GAS_BURNRATE_MULT, gas_fuel)
//liquid fuels are not as volatile, and the reaction progress depends on the size of the area that is burning. Limit the burn rate to a certain amount per area.
- var/liquid_firelevel = calculate_firelevel(liquid_fuel, total_oxidizers, reaction_limit, 0) / vsc.fire_firelevel_multiplier
+ var/liquid_firelevel = calculate_firelevel(liquid_fuel, total_oxidizers, reaction_limit, 0) / SSzas.settings.fire_firelevel_multiplier
var/liquid_reaction_progress = min((liquid_firelevel*0.2 + 0.05)*fuel_area*FIRE_LIQUID_BURNRATE_MULT, liquid_fuel)
var/firelevel = (gas_fuel*gas_firelevel + liquid_fuel*liquid_firelevel)/total_fuel
@@ -306,13 +306,13 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
remove_by_flag(XGM_GAS_OXIDIZER, used_oxidizers)
var/datum/gas_mixture/burned_fuel = remove_by_flag(XGM_GAS_FUEL, used_gas_fuel)
for(var/g in burned_fuel.gas)
- adjust_gas(gas_data.burn_product[g], burned_fuel.gas[g])
+ adjust_gas(SSzas.gas_data.burn_product[g], burned_fuel.gas[g])
if(zone)
zone.remove_liquidfuel(used_liquid_fuel, !check_combustability())
//calculate the energy produced by the reaction and then set the new temperature of the mix
- temperature = (starting_energy + vsc.fire_fuel_energy_release * (used_gas_fuel + used_liquid_fuel)) / heat_capacity()
+ temperature = (starting_energy + SSzas.settings.fire_fuel_energy_release * (used_gas_fuel + used_liquid_fuel)) / heat_capacity()
update_values()
#ifdef FIREDBG
@@ -325,10 +325,10 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
return firelevel
-datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
+/datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
. = 0
for(var/g in gas)
- if(gas_data.flags[g] & XGM_GAS_OXIDIZER && gas[g] >= 0.1)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_OXIDIZER && gas[g] >= 0.1)
. = 1
break
@@ -340,14 +340,14 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
. = 0
for(var/g in gas)
- if(gas_data.flags[g] & XGM_GAS_FUEL && gas[g] >= 0.1)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_FUEL && gas[g] >= 0.1)
. = 1
break
/datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fuel/liquid=null)
. = 0
for(var/g in gas)
- if(gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * vsc.fire_consuption_rate) >= 0.1)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * SSzas.settings.fire_consuption_rate) >= 0.1)
. = 1
break
@@ -359,11 +359,11 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
. = 0
for(var/g in gas)
- if(gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * vsc.fire_consuption_rate) >= 0.1)
+ if(SSzas.gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * SSzas.settings.fire_consuption_rate) >= 0.1)
. = 1
break
-//returns a value between 0 and vsc.fire_firelevel_multiplier
+//returns a value between 0 and SSzas.settings.fire_firelevel_multiplier
/datum/gas_mixture/proc/calculate_firelevel(total_fuel, total_oxidizers, reaction_limit, gas_volume)
//Calculates the firelevel based on one equation instead of having to do this multiple times in different areas.
var/firelevel = 0
@@ -388,13 +388,13 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
#endif
//toss everything together -- should produce a value between 0 and fire_firelevel_multiplier
- firelevel = vsc.fire_firelevel_multiplier * mix_multiplier * damping_multiplier
+ firelevel = SSzas.settings.fire_firelevel_multiplier * mix_multiplier * damping_multiplier
return max( 0, firelevel)
/mob/living/proc/FireBurn(var/firelevel, var/last_temperature, var/pressure)
- var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+ var/mx = 5 * firelevel/SSzas.settings.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
apply_damage(2.5*mx, BURN)
return mx
@@ -411,33 +411,27 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
//Get heat transfer coefficients for clothing.
- for(var/obj/item/clothing/C in src)
- if(l_hand == C || r_hand == C)
- continue
-
+ for(var/obj/item/clothing/C in get_equipped_items())
if( C.max_heat_protection_temperature >= last_temperature )
if(C.body_parts_covered & HEAD)
head_exposure = 0
- if(C.body_parts_covered & UPPER_TORSO)
+ if(C.body_parts_covered & CHEST)
chest_exposure = 0
- if(C.body_parts_covered & LOWER_TORSO)
- groin_exposure = 0
if(C.body_parts_covered & LEGS)
legs_exposure = 0
if(C.body_parts_covered & ARMS)
arms_exposure = 0
//minimize this for low-pressure environments
- var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
+ var/mx = 5 * firelevel/SSzas.settings.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1)
//Always check these damage procs first if fire damage isn't working. They're probably what's wrong.
- apply_damage(0.9*mx*head_exposure, BURN, BP_HEAD, used_weapon = "Fire")
- apply_damage(2.5*mx*chest_exposure, BURN, BP_CHEST, used_weapon = "Fire")
- apply_damage(2.0*mx*groin_exposure, BURN, BP_GROIN, used_weapon = "Fire")
- apply_damage(0.6*mx*legs_exposure, BURN, BP_L_LEG, used_weapon = "Fire")
- apply_damage(0.6*mx*legs_exposure, BURN, BP_R_LEG, used_weapon = "Fire")
- apply_damage(0.4*mx*arms_exposure, BURN, BP_L_ARM, used_weapon = "Fire")
- apply_damage(0.4*mx*arms_exposure, BURN, BP_R_ARM, used_weapon = "Fire")
+ apply_damage(0.9*mx*head_exposure, BURN, BODY_ZONE_HEAD, used_weapon = "Fire")
+ apply_damage(2.5*mx*chest_exposure, BURN, BODY_ZONE_CHEST, used_weapon = "Fire")
+ apply_damage(0.6*mx*legs_exposure, BURN, BODY_ZONE_L_LEG, used_weapon = "Fire")
+ apply_damage(0.6*mx*legs_exposure, BURN, BODY_ZONE_R_LEG, used_weapon = "Fire")
+ apply_damage(0.4*mx*arms_exposure, BURN, BODY_ZONE_L_ARM, used_weapon = "Fire")
+ apply_damage(0.4*mx*arms_exposure, BURN, BODY_ZONE_R_ARM, used_weapon = "Fire")
//return a truthy value of whether burning actually happened
return mx * (head_exposure + chest_exposure + groin_exposure + legs_exposure + arms_exposure)
diff --git a/code/modules/atmospherics/ZAS/Plasma.dm b/code/modules/atmospherics/ZAS/Plasma.dm
index e9543deb18d..a12977966c0 100644
--- a/code/modules/atmospherics/ZAS/Plasma.dm
+++ b/code/modules/atmospherics/ZAS/Plasma.dm
@@ -1,6 +1,6 @@
GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contamination.dmi'))
-/pl_control
+/datum/pl_control
var/plasma_dmg = 3
var/plasma_dmg_name = "Plasma Damage Amount"
var/plasma_dmg_desc = "Self Descriptive"
@@ -91,7 +91,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat
//Burn skin if exposed.
if(SSzas.settings.plc.skin_burns)
if(!pl_head_protected() || !pl_suit_protected())
- burn_skin(0.75)
+ //burn_skin(0.75)
if(prob(20))
to_chat(src, "Your skin burns!")
updatehealth()
@@ -126,7 +126,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat
//Checks if the head is adequately sealed.
if(head)
if(SSzas.settings.plc.plasmaguard_only)
- if(head.item_flags & PLASMAGUARD)
+ if(head.obj_flags & PLASMAGUARD)
return TRUE
else if(is_eyes_covered())
return TRUE
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index 7166223f43c..a1229d928c8 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -1,8 +1,12 @@
-/turf/simulated/var/zone/zone
-/turf/simulated/var/open_directions
+/turf/simulated
+ var/zone/zone
+ var/open_directions
-/turf/var/needs_air_update = 0
-/turf/var/datum/gas_mixture/air
+/turf
+ var/needs_air_update = 0
+ var/datum/gas_mixture/air
+ var/list/initial_gas
+ var/heat_capacity = 1
/turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null)
if(graphic_add && graphic_add.len)
@@ -43,7 +47,7 @@
var/turf/simulated/sim = unsim
if(TURF_HAS_VALID_ZONE(sim))
- SSair.connect(sim, src)
+ SSzas.connect(sim, src)
// Helper for can_safely_remove_from_zone().
#define GET_ZONE_NEIGHBOURS(T, ret) \
@@ -199,7 +203,7 @@
if(verbose) log_debug("Connecting to [sim.zone]")
#endif
- SSair.connect(src, sim)
+ SSzas.connect(src, sim)
#ifdef ZASDBG
@@ -227,7 +231,7 @@
//At this point, a zone should have happened. If it hasn't, don't add more checks, fix the bug.
for(var/turf/T in postponed)
- SSair.connect(src, T)
+ SSzas.connect(src, T)
/turf/proc/post_update_air_properties()
if(connections) connections.update_all()
@@ -270,7 +274,7 @@
/turf/simulated/return_air()
if(zone)
if(!zone.invalid)
- SSair.mark_zone_update(zone)
+ SSzas.mark_zone_update(zone)
return zone.air
else
if(!air)
@@ -293,3 +297,27 @@
if(!air) air = new/datum/gas_mixture
air.copy_from(zone.air)
air.group_multiplier = 1
+
+/turf/simulated/atmos_spawn_air(gas_id, amount, initial_temperature)
+ var/datum/gas_mixture/new_gas = new
+ var/datum/gas_mixture/existing_gas = return_air()
+
+ new_gas.adjust_gas_temp(gas_id, amount, initial_temperature)
+ existing_gas.merge(new_gas)
+
+/proc/turf_contains_dense_objects(var/turf/T)
+ return T.contains_dense_objects()
+
+/turf/proc/contains_dense_objects()
+ if(density)
+ return 1
+ for(var/atom/movable/A as anything in src)
+ if(A.density && !(A.atom_flags & ON_BORDER_1))
+ return 1
+ return 0
+
+/turf/proc/TryGetNonDenseNeighbour()
+ for(var/d in GLOB.cardinals)
+ var/turf/T = get_step(src, d)
+ if (T && !turf_contains_dense_objects(T))
+ return T
diff --git a/code/modules/atmospherics/ZAS/XGM/gas_data.dm b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
index dc504b2f7dd..508cec715f6 100644
--- a/code/modules/atmospherics/ZAS/XGM/gas_data.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
@@ -74,8 +74,8 @@
SSzas.gas_data.condensation_points[gas.id] = gas.condensation_point
SSzas.gas_data.condensation_products[gas.id] = gas.condensation_product
- gas_data.breathed_product[gas.id] = gas.breathed_product
- gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
+ SSzas.gas_data.breathed_product[gas.id] = gas.breathed_product
+ SSzas.gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
return 1
@@ -85,7 +85,7 @@
icon = 'icons/effects/tile_effects.dmi'
icon_state = "generic"
layer = FIRE_LAYER
- appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
+ appearance_flags = RESET_COLOR|PIXEL_SCALE|TILE_BOUND
mouse_opacity = 0
var/gas_id
diff --git a/code/modules/atmospherics/ZAS/XGM/gases.dm b/code/modules/atmospherics/ZAS/XGM/gases.dm
new file mode 100644
index 00000000000..af3a25a5f84
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/XGM/gases.dm
@@ -0,0 +1,241 @@
+/datum/xgm_gas/oxygen
+ id = GAS_OXYGEN
+ name = "Oxygen"
+ specific_heat = 20 // J/(mol*K)
+ molar_mass = 0.032 // kg/mol
+ flags = XGM_GAS_OXIDIZER | XGM_GAS_FUSION_FUEL
+ breathed_product = /datum/reagent/oxygen
+ symbol_html = "O2"
+ symbol = "O2"
+
+
+/datum/xgm_gas/nitrogen
+ id = GAS_NITROGEN
+ name = "Nitrogen"
+ specific_heat = 20 // J/(mol*K)
+ molar_mass = 0.028 // kg/mol
+ symbol_html = "N2"
+ symbol = "N2"
+
+/datum/xgm_gas/carbon_dioxide
+ id = GAS_CO2
+ name = "Carbon Dioxide"
+ specific_heat = 30 // J/(mol*K)
+ molar_mass = 0.044 // kg/mol
+ symbol_html = "CO2"
+ symbol = "CO2"
+
+/datum/xgm_gas/methyl_bromide
+ id = GAS_METHYL_BROMIDE
+ name = "Methyl Bromide"
+ specific_heat = 42.59 // J/(mol*K)
+ molar_mass = 0.095 // kg/mol
+ breathed_product = /datum/reagent/toxin/methyl_bromide
+ symbol_html = "CH3Br"
+ symbol = "CH3Br"
+
+/datum/xgm_gas/phoron
+ id = GAS_PLASMA
+ name = "Phoron"
+
+ //Note that this has a significant impact on TTV yield.
+ //Because it is so high, any leftover phoron soaks up a lot of heat and drops the yield pressure.
+ specific_heat = 200 // J/(mol*K)
+
+ //Hypothetical group 14 (same as carbon), period 8 element.
+ //Using multiplicity rule, it's atomic number is 162
+ //and following a N/Z ratio of 1.5, the molar mass of a monatomic gas is:
+ molar_mass = 0.405 // kg/mol
+
+ tile_color = "#ff9940"
+ overlay_limit = 0.7
+ flags = XGM_GAS_FUEL | XGM_GAS_CONTAMINANT | XGM_GAS_FUSION_FUEL
+ breathed_product = /datum/reagent/toxin/phoron
+ symbol_html = "Ph"
+ symbol = "Ph"
+
+/datum/xgm_gas/sleeping_agent
+ id = GAS_N2O
+ name = "Nitrous Oxide"
+ specific_heat = 40 // J/(mol*K)
+ molar_mass = 0.044 // kg/mol. N2O
+ flags = XGM_GAS_OXIDIZER //N2O is a powerful oxidizer
+ breathed_product = /datum/reagent/nitrous_oxide
+ symbol_html = "N2O"
+ symbol = "N2O"
+
+/datum/xgm_gas/methane
+ id = GAS_METHANE
+ name = "Methane"
+ specific_heat = 30 // J/(mol*K)
+ molar_mass = 0.016 // kg/mol
+ flags = XGM_GAS_FUEL
+ symbol_html = "CH4"
+ symbol = "CH4"
+
+/datum/xgm_gas/alium
+ id = GAS_ALIEN
+ name = "Aliether"
+ hidden_from_codex = TRUE
+ symbol_html = "X"
+ symbol = "X"
+
+/datum/xgm_gas/alium/New()
+ var/num = rand(100,999)
+ name = "Compound #[num]"
+ specific_heat = rand(1, 400) // J/(mol*K)
+ molar_mass = rand(20,800)/1000 // kg/mol
+ if(prob(40))
+ flags |= XGM_GAS_FUEL
+ else if(prob(40)) //it's prooobably a bad idea for gas being oxidizer to itself.
+ flags |= XGM_GAS_OXIDIZER
+ if(prob(40))
+ flags |= XGM_GAS_CONTAMINANT
+ if(prob(40))
+ flags |= XGM_GAS_FUSION_FUEL
+
+ symbol_html = "X[num]"
+ symbol = "X-[num]"
+ if(prob(50))
+ tile_color = RANDOM_RGB
+ overlay_limit = 0.5
+
+/datum/xgm_gas/hydrogen
+ id = GAS_HYDROGEN
+ name = "Hydrogen"
+ specific_heat = 100 // J/(mol*K)
+ molar_mass = 0.002 // kg/mol
+ flags = XGM_GAS_FUEL|XGM_GAS_FUSION_FUEL
+ burn_product = GAS_STEAM
+ symbol_html = "H2"
+ symbol = "H2"
+
+/datum/xgm_gas/hydrogen/deuterium
+ id = GAS_DEUTERIUM
+ name = "Deuterium"
+ symbol_html = "D"
+ symbol = "D"
+
+/datum/xgm_gas/hydrogen/tritium
+ id = GAS_TRITIUM
+ name = "Tritium"
+ symbol_html = "T"
+ symbol = "T"
+
+/datum/xgm_gas/helium
+ id = GAS_HELIUM
+ name = "Helium"
+ specific_heat = 80 // J/(mol*K)
+ molar_mass = 0.004 // kg/mol
+ flags = XGM_GAS_FUSION_FUEL
+ breathed_product = /datum/reagent/helium
+ symbol_html = "He"
+ symbol = "He"
+
+/datum/xgm_gas/argon
+ id = GAS_ARGON
+ name = "Argon"
+ specific_heat = 10 // J/(mol*K)
+ molar_mass = 0.018 // kg/mol
+ symbol_html = "Ar"
+ symbol = "Ar"
+
+// If narcosis is ever simulated, krypton has a narcotic potency seven times greater than regular airmix.
+/datum/xgm_gas/krypton
+ id = GAS_KRYPTON
+ name = "Krypton"
+ specific_heat = 5 // J/(mol*K)
+ molar_mass = 0.036 // kg/mol
+ symbol_html = "Kr"
+ symbol = "Kr"
+
+/datum/xgm_gas/neon
+ id = GAS_NEON
+ name = "Neon"
+ specific_heat = 20 // J/(mol*K)
+ molar_mass = 0.01 // kg/mol
+ symbol_html = "Ne"
+ symbol = "Ne"
+
+/datum/xgm_gas/xenon
+ id = GAS_XENON
+ name = "Xenon"
+ specific_heat = 3 // J/(mol*K)
+ molar_mass = 0.054 // kg/mol
+ breathed_product = /datum/reagent/nitrous_oxide/xenon
+ symbol_html = "Xe"
+ symbol = "Xe"
+
+/datum/xgm_gas/nitrodioxide
+ id = GAS_NO2
+ name = "Nitrogen Dioxide"
+ tile_color = "#ca6409"
+ specific_heat = 37 // J/(mol*K)
+ molar_mass = 0.054 // kg/mol
+ flags = XGM_GAS_OXIDIZER
+ breathed_product = /datum/reagent/toxin
+ symbol_html = "NO2"
+ symbol = "NO2"
+
+/datum/xgm_gas/nitricoxide
+ id = GAS_NO
+ name = "Nitric Oxide"
+
+ specific_heat = 10 // J/(mol*K)
+ molar_mass = 0.030 // kg/mol
+ flags = XGM_GAS_OXIDIZER
+ symbol_html = "NO"
+ symbol = "NO"
+
+/datum/xgm_gas/chlorine
+ id = GAS_CHLORINE
+ name = "Chlorine"
+ tile_color = "#c5f72d"
+ overlay_limit = 0.5
+ specific_heat = 5 // J/(mol*K)
+ molar_mass = 0.017 // kg/mol
+ flags = XGM_GAS_CONTAMINANT
+ breathed_product = /datum/reagent/toxin/chlorine
+ symbol_html = "Cl"
+ symbol = "Cl"
+
+/datum/xgm_gas/vapor
+ id = GAS_STEAM
+ name = "Steam"
+ tile_overlay = "generic"
+ overlay_limit = 0.5
+ specific_heat = 30 // J/(mol*K)
+ molar_mass = 0.020 // kg/mol
+ breathed_product = /datum/reagent/water
+ condensation_product = /datum/reagent/water
+ condensation_point = 308.15 // 35C. Dew point is ~20C but this is better for gameplay considerations.
+ symbol_html = "H2O"
+ symbol = "H2O"
+
+/datum/xgm_gas/sulfurdioxide
+ id = GAS_SULFUR
+ name = "Sulfur Dioxide"
+
+ specific_heat = 30 // J/(mol*K)
+ molar_mass = 0.044 // kg/mol
+ symbol_html = "SO2"
+ symbol = "SO2"
+
+/datum/xgm_gas/ammonia
+ id = GAS_AMMONIA
+ name = "Ammonia"
+
+ specific_heat = 20 // J/(mol*K)
+ molar_mass = 0.017 // kg/mol
+ breathed_product = /datum/reagent/ammonia
+ symbol_html = "NH3"
+ symbol = "NH3"
+
+/datum/xgm_gas/carbon_monoxide
+ id = GAS_CO
+ name = "Carbon Monoxide"
+ specific_heat = 30 // J/(mol*K)
+ molar_mass = 0.028 // kg/mol
+ breathed_product = /datum/reagent/carbon_monoxide
+ symbol_html = "CO"
+ symbol = "CO"
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
new file mode 100644
index 00000000000..331194c445c
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
@@ -0,0 +1,553 @@
+/datum/gas_mixture
+ //Associative list of gas moles.
+ //Gases with 0 moles are not tracked and are pruned by update_values()
+ var/list/gas = list()
+ //Temperature in Kelvin of this gas mix.
+ var/temperature = 0
+
+ //Sum of all the gas moles in this mix. Updated by update_values()
+ var/total_moles = 0
+ //Volume of this mix.
+ var/volume = CELL_VOLUME
+ //Size of the group this gas_mixture is representing. 1 for singletons.
+ var/group_multiplier = 1
+
+ //List of active tile overlays for this gas_mixture. Updated by check_tile_graphic()
+ var/list/graphic = list()
+ //Cache of gas overlay objects
+ var/list/tile_overlay_cache
+
+/datum/gas_mixture/New(_volume = CELL_VOLUME, _temperature = 0, _group_multiplier = 1)
+ volume = _volume
+ temperature = _temperature
+ group_multiplier = _group_multiplier
+
+/datum/gas_mixture/proc/get_gas(gasid)
+ if(!gas.len)
+ return 0 //if the list is empty BYOND treats it as a non-associative list, which runtimes
+ return gas[gasid] * group_multiplier
+
+/datum/gas_mixture/proc/get_total_moles()
+ return total_moles * group_multiplier
+
+//Takes a gas string and the amount of moles to adjust by. Calls update_values() if update isn't 0.
+/datum/gas_mixture/proc/adjust_gas(gasid, moles, update = 1)
+ if(moles == 0)
+ return
+
+ if (group_multiplier != 1)
+ gas[gasid] += moles/group_multiplier
+ else
+ gas[gasid] += moles
+
+ if(update)
+ update_values()
+
+
+//Same as adjust_gas(), but takes a temperature which is mixed in with the gas.
+/datum/gas_mixture/proc/adjust_gas_temp(gasid, moles, temp, update = 1)
+ if(moles == 0)
+ return
+
+ if(moles > 0 && abs(temperature - temp) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ var/self_heat_capacity = heat_capacity()
+ var/giver_heat_capacity = SSzas.gas_data.specific_heat[gasid] * moles
+ var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
+ if(combined_heat_capacity != 0)
+ temperature = (temp * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity
+
+ if (group_multiplier != 1)
+ gas[gasid] += moles/group_multiplier
+ else
+ gas[gasid] += moles
+
+ if(update)
+ update_values()
+
+
+//Variadic version of adjust_gas(). Takes any number of gas and mole pairs and applies them.
+/datum/gas_mixture/proc/adjust_multi()
+ ASSERT(!(args.len % 2))
+
+ for(var/i = 1; i < args.len; i += 2)
+ adjust_gas(args[i], args[i+1], update = 0)
+
+ update_values()
+
+
+//Variadic version of adjust_gas_temp(). Takes any number of gas, mole and temperature associations and applies them.
+/datum/gas_mixture/proc/adjust_multi_temp()
+ ASSERT(!(args.len % 3))
+
+ for(var/i = 1; i < args.len; i += 3)
+ adjust_gas_temp(args[i], args[i + 1], args[i + 2], update = 0)
+
+ update_values()
+
+
+//Merges all the gas from another mixture into this one. Respects group_multipliers and adjusts temperature correctly.
+//Does not modify giver in any way.
+/datum/gas_mixture/proc/merge(const/datum/gas_mixture/giver)
+ if(!giver)
+ return
+
+ if(abs(temperature-giver.temperature)>MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
+ var/self_heat_capacity = heat_capacity()
+ var/giver_heat_capacity = giver.heat_capacity()
+ var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
+ if(combined_heat_capacity != 0)
+ temperature = (giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity
+
+ if((group_multiplier != 1)||(giver.group_multiplier != 1))
+ for(var/g in giver.gas)
+ gas[g] += giver.gas[g] * giver.group_multiplier / group_multiplier
+ else
+ for(var/g in giver.gas)
+ gas[g] += giver.gas[g]
+
+ update_values()
+
+// Used to equalize the mixture between two zones before sleeping an edge.
+/datum/gas_mixture/proc/equalize(datum/gas_mixture/sharer)
+ var/our_heatcap = heat_capacity()
+ var/share_heatcap = sharer.heat_capacity()
+
+ // Special exception: there isn't enough air around to be worth processing this edge next tick, zap both to zero.
+ if(total_moles + sharer.total_moles <= MINIMUM_AIR_TO_SUSPEND)
+ gas.Cut()
+ sharer.gas.Cut()
+
+ for(var/g in gas|sharer.gas)
+ var/comb = gas[g] + sharer.gas[g]
+ comb /= volume + sharer.volume
+ gas[g] = comb * volume
+ sharer.gas[g] = comb * sharer.volume
+
+ if(our_heatcap + share_heatcap)
+ temperature = ((temperature * our_heatcap) + (sharer.temperature * share_heatcap)) / (our_heatcap + share_heatcap)
+ sharer.temperature = temperature
+
+ update_values()
+ sharer.update_values()
+
+ return 1
+
+
+//Returns the heat capacity of the gas mix based on the specific heat of the gases.
+/datum/gas_mixture/proc/heat_capacity()
+ . = 0
+ for(var/g in gas)
+ . += SSzas.gas_data.specific_heat[g] * gas[g]
+ . *= group_multiplier
+
+
+//Adds or removes thermal energy. Returns the actual thermal energy change, as in the case of removing energy we can't go below TCMB.
+/datum/gas_mixture/proc/add_thermal_energy(var/thermal_energy)
+
+ if (total_moles == 0)
+ return 0
+
+ var/heat_capacity = heat_capacity()
+ if (thermal_energy < 0)
+ if (temperature < TCMB)
+ return 0
+ var/thermal_energy_limit = -(temperature - TCMB)*heat_capacity //ensure temperature does not go below TCMB
+ thermal_energy = max( thermal_energy, thermal_energy_limit ) //thermal_energy and thermal_energy_limit are negative here.
+ temperature += thermal_energy/heat_capacity
+ return thermal_energy
+
+//Returns the thermal energy change required to get to a new temperature
+/datum/gas_mixture/proc/get_thermal_energy_change(var/new_temperature)
+ return heat_capacity()*(max(new_temperature, 0) - temperature)
+
+
+//Technically vacuum doesn't have a specific entropy. Just use a really big number (infinity would be ideal) here so that it's easy to add gas to vacuum and hard to take gas out.
+#define SPECIFIC_ENTROPY_VACUUM 150000
+
+
+//Returns the ideal gas specific entropy of the whole mix. This is the entropy per mole of /mixed/ gas.
+/datum/gas_mixture/proc/specific_entropy()
+ if (!gas.len || total_moles == 0)
+ return SPECIFIC_ENTROPY_VACUUM
+
+ . = 0
+ for(var/g in gas)
+ . += gas[g] * specific_entropy_gas(g)
+ . /= total_moles
+
+
+/*
+ It's arguable whether this should even be called entropy anymore. It's more "based on" entropy than actually entropy now.
+
+ Returns the ideal gas specific entropy of a specific gas in the mix. This is the entropy due to that gas per mole of /that/ gas in the mixture, not the entropy due to that gas per mole of gas mixture.
+
+ For the purposes of SS13, the specific entropy is just a number that tells you how hard it is to move gas. You can replace this with whatever you want.
+ Just remember that returning a SMALL number == adding gas to this gas mix is HARD, taking gas away is EASY, and that returning a LARGE number means the opposite (so a vacuum should approach infinity).
+
+ So returning a constant/(partial pressure) would probably do what most players expect. Although the version I have implemented below is a bit more nuanced than simply 1/P in that it scales in a way
+ which is bit more realistic (natural log), and returns a fairly accurate entropy around room temperatures and pressures.
+*/
+/datum/gas_mixture/proc/specific_entropy_gas(var/gasid)
+ if (!(gasid in gas) || gas[gasid] == 0)
+ return SPECIFIC_ENTROPY_VACUUM //that gas isn't here
+
+ //group_multiplier gets divided out in volume/gas[gasid] - also, V/(m*T) = R/(partial pressure)
+ var/molar_mass = SSzas.gas_data.molar_mass[gasid]
+ var/specific_heat = SSzas.gas_data.specific_heat[gasid]
+ var/safe_temp = max(temperature, TCMB) // We're about to divide by this.
+ return R_IDEAL_GAS_EQUATION * ( log( (IDEAL_GAS_ENTROPY_CONSTANT*volume/(gas[gasid] * safe_temp)) * (molar_mass*specific_heat*safe_temp)**(2/3) + 1 ) + 15 )
+
+ //alternative, simpler equation
+ //var/partial_pressure = gas[gasid] * R_IDEAL_GAS_EQUATION * temperature / volume
+ //return R_IDEAL_GAS_EQUATION * ( log (1 + IDEAL_GAS_ENTROPY_CONSTANT/partial_pressure) + 20 )
+
+
+//Updates the total_moles count and trims any empty gases.
+/datum/gas_mixture/proc/update_values()
+ total_moles = 0
+ for(var/g in gas)
+ if(gas[g] <= 0)
+ gas -= g
+ else
+ total_moles += gas[g]
+
+
+//Returns the pressure of the gas mix. Only accurate if there have been no gas modifications since update_values() has been called.
+/datum/gas_mixture/proc/return_pressure()
+ if(volume)
+ return total_moles * R_IDEAL_GAS_EQUATION * temperature / volume
+ return 0
+
+
+//Removes moles from the gas mixture and returns a gas_mixture containing the removed air.
+/datum/gas_mixture/proc/remove(amount)
+ amount = min(amount, total_moles * group_multiplier) //Can not take more air than the gas mixture has!
+ if(amount <= 0)
+ return null
+
+ var/datum/gas_mixture/removed = new
+
+ for(var/g in gas)
+ removed.gas[g] = QUANTIZE((gas[g] / total_moles) * amount)
+ gas[g] -= removed.gas[g] / group_multiplier
+
+ removed.temperature = temperature
+ update_values()
+ removed.update_values()
+
+ return removed
+
+
+//Removes a ratio of gas from the mixture and returns a gas_mixture containing the removed air.
+/datum/gas_mixture/proc/remove_ratio(ratio, out_group_multiplier = 1)
+ if(ratio <= 0)
+ return null
+ out_group_multiplier = clamp(out_group_multiplier, 1, group_multiplier)
+
+ ratio = min(ratio, 1)
+
+ var/datum/gas_mixture/removed = new
+ removed.group_multiplier = out_group_multiplier
+
+ for(var/g in gas)
+ removed.gas[g] = (gas[g] * ratio * group_multiplier / out_group_multiplier)
+ gas[g] = gas[g] * (1 - ratio)
+
+ removed.temperature = temperature
+ removed.volume = volume * group_multiplier / out_group_multiplier
+ update_values()
+ removed.update_values()
+
+ return removed
+
+//Removes a volume of gas from the mixture and returns a gas_mixture containing the removed air with the given volume
+/datum/gas_mixture/proc/remove_volume(removed_volume)
+ var/datum/gas_mixture/removed = remove_ratio(removed_volume/(volume*group_multiplier), 1)
+ removed.volume = removed_volume
+ return removed
+
+//Removes moles from the gas mixture, limited by a given flag. Returns a gax_mixture containing the removed air.
+/datum/gas_mixture/proc/remove_by_flag(flag, amount)
+ var/datum/gas_mixture/removed = new
+
+ if(!flag || amount <= 0)
+ return removed
+
+ var/sum = 0
+ for(var/g in gas)
+ if(SSzas.gas_data.flags[g] & flag)
+ sum += gas[g]
+
+ for(var/g in gas)
+ if(SSzas.gas_data.flags[g] & flag)
+ removed.gas[g] = QUANTIZE((gas[g] / sum) * amount)
+ gas[g] -= removed.gas[g] / group_multiplier
+
+ removed.temperature = temperature
+ update_values()
+ removed.update_values()
+
+ return removed
+
+//Returns the amount of gas that has the given flag, in moles
+/datum/gas_mixture/proc/get_by_flag(flag)
+ . = 0
+ for(var/g in gas)
+ if(SSzas.gas_data.flags[g] & flag)
+ . += gas[g]
+
+//Copies gas and temperature from another gas_mixture.
+/datum/gas_mixture/proc/copy_from(const/datum/gas_mixture/sample)
+ gas = sample.gas.Copy()
+ temperature = sample.temperature
+
+ update_values()
+
+ return 1
+
+
+//Checks if we are within acceptable range of another gas_mixture to suspend processing or merge.
+/datum/gas_mixture/proc/compare(const/datum/gas_mixture/sample, var/vacuum_exception = 0)
+ if(!sample) return 0
+
+ if(vacuum_exception)
+ // Special case - If one of the two is zero pressure, the other must also be zero.
+ // This prevents suspending processing when an air-filled room is next to a vacuum,
+ // an edge case which is particually obviously wrong to players
+ if(total_moles == 0 && sample.total_moles != 0 || sample.total_moles == 0 && total_moles != 0)
+ return 0
+
+ var/list/marked = list()
+ for(var/g in gas)
+ if((abs(gas[g] - sample.gas[g]) > MINIMUM_AIR_TO_SUSPEND) && \
+ ((gas[g] < (1 - MINIMUM_AIR_RATIO_TO_SUSPEND) * sample.gas[g]) || \
+ (gas[g] > (1 + MINIMUM_AIR_RATIO_TO_SUSPEND) * sample.gas[g])))
+ return 0
+ marked[g] = 1
+
+ if(abs(return_pressure() - sample.return_pressure()) > MINIMUM_PRESSURE_DIFFERENCE_TO_SUSPEND)
+ return 0
+
+ for(var/g in sample.gas)
+ if(!marked[g])
+ if((abs(gas[g] - sample.gas[g]) > MINIMUM_AIR_TO_SUSPEND) && \
+ ((gas[g] < (1 - MINIMUM_AIR_RATIO_TO_SUSPEND) * sample.gas[g]) || \
+ (gas[g] > (1 + MINIMUM_AIR_RATIO_TO_SUSPEND) * sample.gas[g])))
+ return 0
+
+ if(total_moles > MINIMUM_AIR_TO_SUSPEND)
+ if((abs(temperature - sample.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && \
+ ((temperature < (1 - MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND)*sample.temperature) || \
+ (temperature > (1 + MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND)*sample.temperature)))
+ return 0
+
+ return 1
+
+//Rechecks the gas_mixture and adjusts the graphic list if needed.
+//Two lists can be passed by reference if you need know specifically which graphics were added and removed.
+/datum/gas_mixture/proc/check_tile_graphic(list/graphic_add = null, list/graphic_remove = null)
+ for(var/obj/effect/gas_overlay/O in graphic)
+ if(gas[O.gas_id] <= SSzas.gas_data.overlay_limit[O.gas_id])
+ LAZYADD(graphic_remove, O)
+ for(var/g in SSzas.gas_data.overlay_limit)
+ //Overlay isn't applied for this gas, check if it's valid and needs to be added.
+ if(gas[g] > SSzas.gas_data.overlay_limit[g])
+ var/tile_overlay = get_tile_overlay(g)
+ if(!(tile_overlay in graphic))
+ LAZYADD(graphic_add, tile_overlay)
+ . = 0
+ //Apply changes
+ if(graphic_add && graphic_add.len)
+ graphic |= graphic_add
+ . = 1
+ if(graphic_remove && graphic_remove.len)
+ graphic -= graphic_remove
+ . = 1
+ if(graphic.len)
+ var/pressure_mod = clamp(return_pressure() / ONE_ATMOSPHERE, 0, 2)
+ for(var/obj/effect/gas_overlay/O in graphic)
+ var/concentration_mod = clamp(gas[O.gas_id] / total_moles, 0.1, 1)
+ var/new_alpha = min(230, round(pressure_mod * concentration_mod * 180, 5))
+ if(new_alpha != O.alpha)
+ O.update_alpha_animation(new_alpha)
+
+/datum/gas_mixture/proc/get_tile_overlay(gas_id)
+ if(!LAZYACCESS(tile_overlay_cache, gas_id))
+ LAZYSET(tile_overlay_cache, gas_id, new/obj/effect/gas_overlay(null, gas_id))
+ return tile_overlay_cache[gas_id]
+
+//Simpler version of merge(), adjusts gas amounts directly and doesn't account for temperature or group_multiplier.
+/datum/gas_mixture/proc/add(datum/gas_mixture/right_side)
+ for(var/g in right_side.gas)
+ gas[g] += right_side.gas[g]
+
+ update_values()
+ return 1
+
+
+//Simpler version of remove(), adjusts gas amounts directly and doesn't account for group_multiplier.
+/datum/gas_mixture/proc/subtract(datum/gas_mixture/right_side)
+ for(var/g in right_side.gas)
+ gas[g] -= right_side.gas[g]
+
+ update_values()
+ return 1
+
+
+//Multiply all gas amounts by a factor.
+/datum/gas_mixture/proc/multiply(factor)
+ for(var/g in gas)
+ gas[g] *= factor
+
+ update_values()
+ return 1
+
+
+//Divide all gas amounts by a factor.
+/datum/gas_mixture/proc/divide(factor)
+ for(var/g in gas)
+ gas[g] /= factor
+
+ update_values()
+ return 1
+
+
+//Shares gas with another gas_mixture based on the amount of connecting tiles and a fixed lookup table.
+/datum/gas_mixture/proc/share_ratio(datum/gas_mixture/other, connecting_tiles, share_size = null, one_way = 0)
+ var/static/list/sharing_lookup_table = list(0.30, 0.40, 0.48, 0.54, 0.60, 0.66)
+ //Shares a specific ratio of gas between mixtures using simple weighted averages.
+ var/ratio = sharing_lookup_table[6]
+
+ var/size = max(1, group_multiplier)
+ if(isnull(share_size)) share_size = max(1, other.group_multiplier)
+
+ var/full_heat_capacity = heat_capacity()
+ var/s_full_heat_capacity = other.heat_capacity()
+
+ var/list/avg_gas = list()
+
+ for(var/g in gas)
+ avg_gas[g] += gas[g] * size
+
+ for(var/g in other.gas)
+ avg_gas[g] += other.gas[g] * share_size
+
+ for(var/g in avg_gas)
+ avg_gas[g] /= (size + share_size)
+
+ var/temp_avg = 0
+ if(full_heat_capacity + s_full_heat_capacity)
+ temp_avg = (temperature * full_heat_capacity + other.temperature * s_full_heat_capacity) / (full_heat_capacity + s_full_heat_capacity)
+
+ //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD.
+ if(sharing_lookup_table.len >= connecting_tiles) //6 or more interconnecting tiles will max at 42% of air moved per tick.
+ ratio = sharing_lookup_table[connecting_tiles]
+ //WOOT WOOT TOUCH THIS AND YOU ARE A RETARD
+
+ for(var/g in avg_gas)
+ gas[g] = max(0, (gas[g] - avg_gas[g]) * (1 - ratio) + avg_gas[g])
+ if(!one_way)
+ other.gas[g] = max(0, (other.gas[g] - avg_gas[g]) * (1 - ratio) + avg_gas[g])
+
+ temperature = max(0, (temperature - temp_avg) * (1-ratio) + temp_avg)
+ if(!one_way)
+ other.temperature = max(0, (other.temperature - temp_avg) * (1-ratio) + temp_avg)
+
+ update_values()
+ other.update_values()
+
+ return compare(other)
+
+
+//A wrapper around share_ratio for spacing gas at the same rate as if it were going into a large airless room.
+/datum/gas_mixture/proc/share_space(datum/gas_mixture/unsim_air)
+ return share_ratio(unsim_air, unsim_air.group_multiplier, max(1, max(group_multiplier + 3, 1) + unsim_air.group_multiplier), one_way = 1)
+
+//Equalizes a list of gas mixtures. Used for pipe networks.
+/proc/equalize_gases(list/datum/gas_mixture/gases)
+ //Calculate totals from individual components
+ var/total_volume = 0
+ var/total_thermal_energy = 0
+ var/total_heat_capacity = 0
+
+ var/list/total_gas = list()
+ for(var/datum/gas_mixture/gasmix in gases)
+ total_volume += gasmix.volume
+ var/temp_heatcap = gasmix.heat_capacity()
+ total_thermal_energy += gasmix.temperature * temp_heatcap
+ total_heat_capacity += temp_heatcap
+ for(var/g in gasmix.gas)
+ total_gas[g] += gasmix.gas[g]
+
+ if(total_volume > 0)
+ var/datum/gas_mixture/combined = new(total_volume)
+ combined.gas = total_gas
+
+ //Calculate temperature
+ if(total_heat_capacity > 0)
+ combined.temperature = total_thermal_energy / total_heat_capacity
+ combined.update_values()
+
+ //Allow for reactions
+ combined.react()
+
+ //Average out the gases
+ for(var/g in combined.gas)
+ combined.gas[g] /= total_volume
+
+ //Update individual gas_mixtures
+ for(var/datum/gas_mixture/gasmix in gases)
+ gasmix.gas = combined.gas.Copy()
+ gasmix.temperature = combined.temperature
+ gasmix.multiply(gasmix.volume)
+
+ return 1
+
+/datum/gas_mixture/proc/get_mass()
+ for(var/g in gas)
+ . += gas[g] * SSzas.gas_data.molar_mass[g] * group_multiplier
+
+/datum/gas_mixture/proc/specific_mass()
+ var/M = get_total_moles()
+ if(M)
+ return get_mass()/M
+
+////LINDA COMPATABILITY PROCS////
+/datum/gas_mixture/proc/return_volume()
+ return max(0, volume)
+
+/datum/gas_mixture/proc/return_temperature()
+ return temperature
+
+/datum/gas_mixture/proc/total_moles()
+ return total_moles
+
+/datum/gas_mixture/proc/has_gas(gas_id, required_amount)
+ var/amt = get_gas(gas_id)
+ return (amt >= required_amount)
+
+///THIS PROBABLY WILL NOT BE USED BUUUUT-
+/datum/gas_mixture/proc/mingle_with_turf(turf/simulated/target, mingle_volume)
+ var/datum/gas_mixture/air_sample = remove_ratio(mingle_volume/volume)
+ air_sample.volume = mingle_volume
+
+ if(istype(target) && target.zone)
+ //Have to consider preservation of group statuses
+ var/datum/gas_mixture/turf_copy = new
+
+ turf_copy.copy_from(target.zone.air)
+ turf_copy.volume = target.zone.air.volume //Copy a good representation of the turf from parent group
+
+ equalize_gases(list(air_sample, turf_copy))
+ merge(air_sample)
+
+ turf_copy.subtract(target.zone.air)
+
+ target.zone.air.merge(turf_copy)
+
+ else
+ var/datum/gas_mixture/turf_air = target.return_air()
+
+ equalize_gases(list(air_sample, turf_air))
+ merge(air_sample)
+ //turf_air already modified by equalize_gases()
diff --git a/code/modules/atmospherics/ZAS/ZAS_Settings.dm b/code/modules/atmospherics/ZAS/ZAS_Settings.dm
new file mode 100644
index 00000000000..1cf3d2fbee8
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/ZAS_Settings.dm
@@ -0,0 +1,78 @@
+/datum/zas_controller
+ var/datum/pl_control/plc
+
+ var/fire_consuption_rate = 0.25
+ var/fire_consuption_rate_NAME = "Fire - Air Consumption Ratio"
+ var/fire_consuption_rate_DESC = "Ratio of air removed and combusted per tick."
+
+ var/fire_firelevel_multiplier = 25
+ var/fire_firelevel_multiplier_NAME = "Fire - Firelevel Constant"
+ var/fire_firelevel_multiplier_DESC = "Multiplied by the equation for firelevel, affects mainly the extingiushing of fires."
+
+ //Note that this parameter and the phoron heat capacity have a significant impact on TTV yield.
+ var/fire_fuel_energy_release = 866000 //J/mol. Adjusted to compensate for fire energy release being fixed, was 397000
+ var/fire_fuel_energy_release_NAME = "Fire - Fuel energy release"
+ var/fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance"
+
+
+ var/IgnitionLevel = 0.5
+ var/IgnitionLevel_DESC = "Determines point at which fire can ignite"
+
+ var/airflow_lightest_pressure = 20
+ var/airflow_lightest_pressure_NAME = "Airflow - Small Movement Threshold %"
+ var/airflow_lightest_pressure_DESC = "Percent of 1 Atm. at which items with the small weight classes will move."
+
+ var/airflow_light_pressure = 35
+ var/airflow_light_pressure_NAME = "Airflow - Medium Movement Threshold %"
+ var/airflow_light_pressure_DESC = "Percent of 1 Atm. at which items with the medium weight classes will move."
+
+ var/airflow_medium_pressure = 50
+ var/airflow_medium_pressure_NAME = "Airflow - Heavy Movement Threshold %"
+ var/airflow_medium_pressure_DESC = "Percent of 1 Atm. at which items with the largest weight classes will move."
+
+ var/airflow_heavy_pressure = 65
+ var/airflow_heavy_pressure_NAME = "Airflow - Mob Movement Threshold %"
+ var/airflow_heavy_pressure_DESC = "Percent of 1 Atm. at which mobs will move."
+
+ var/airflow_dense_pressure = 85
+ var/airflow_dense_pressure_NAME = "Airflow - Dense Movement Threshold %"
+ var/airflow_dense_pressure_DESC = "Percent of 1 Atm. at which items with canisters and closets will move."
+
+ var/airflow_stun_pressure = 60
+ var/airflow_stun_pressure_NAME = "Airflow - Mob Stunning Threshold %"
+ var/airflow_stun_pressure_DESC = "Percent of 1 Atm. at which mobs will be stunned by airflow."
+
+ var/airflow_stun_cooldown = 60
+ var/airflow_stun_cooldown_NAME = "Aiflow Stunning - Cooldown"
+ var/airflow_stun_cooldown_DESC = "How long, in tenths of a second, to wait before stunning them again."
+
+ var/airflow_stun = 1
+ var/airflow_stun_NAME = "Airflow Impact - Stunning"
+ var/airflow_stun_DESC = "How much a mob is stunned when hit by an object."
+
+ var/airflow_damage = 3
+ var/airflow_damage_NAME = "Airflow Impact - Damage"
+ var/airflow_damage_DESC = "Damage from airflow impacts."
+
+ var/airflow_speed_decay = 1.5
+ var/airflow_speed_decay_NAME = "Airflow Speed Decay"
+ var/airflow_speed_decay_DESC = "How rapidly the speed gained from airflow decays."
+
+ var/airflow_delay = 30
+ var/airflow_delay_NAME = "Airflow Retrigger Delay"
+ var/airflow_delay_DESC = "Time in deciseconds before things can be moved by airflow again."
+
+ var/airflow_mob_slowdown = 1
+ var/airflow_mob_slowdown_NAME = "Airflow Slowdown"
+ var/airflow_mob_slowdown_DESC = "Time in tenths of a second to add as a delay to each movement by a mob if they are fighting the pull of the airflow."
+
+ var/connection_insulation = 1
+ var/connection_insulation_NAME = "Connections - Insulation"
+ var/connection_insulation_DESC = "Boolean, should doors forbid heat transfer?"
+
+ var/connection_temperature_delta = 10
+ var/connection_temperature_delta_NAME = "Connections - Temperature Difference"
+ var/connection_temperature_delta_DESC = "The smallest temperature difference which will cause heat to travel through doors."
+
+/datum/zas_controller/Initalize()
+ plc = new
diff --git a/code/modules/atmospherics/ZAS/Zone.dm b/code/modules/atmospherics/ZAS/Zone.dm
index aff8d23d929..9d20a386d9e 100644
--- a/code/modules/atmospherics/ZAS/Zone.dm
+++ b/code/modules/atmospherics/ZAS/Zone.dm
@@ -54,7 +54,7 @@ Class Procs:
var/last_air_temperature = TCMB
/zone/New()
- SSair.add_zone(src)
+ SSzas.add_zone(src)
air.temperature = TCMB
air.group_multiplier = 1
air.volume = CELL_VOLUME
@@ -63,7 +63,7 @@ Class Procs:
#ifdef ZASDBG
ASSERT(!invalid)
ASSERT(istype(T))
- ASSERT(!SSair.has_valid_zone(T))
+ ASSERT(!SSzas.has_valid_zone(T))
#endif
var/datum/gas_mixture/turf_air = T.return_air()
@@ -73,7 +73,7 @@ Class Procs:
if(T.fire)
var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
fire_tiles.Add(T)
- SSair.active_fire_zones |= src
+ SSzas.active_fire_zones |= src
if(fuel) fuel_objs += fuel
T.update_graphic(air.graphic)
@@ -116,11 +116,11 @@ Class Procs:
if(E.contains_zone(into))
continue //don't need to rebuild this edge
for(var/turf/T in E.connecting_turfs)
- SSair.mark_for_update(T)
+ SSzas.mark_for_update(T)
/zone/proc/c_invalidate()
invalid = 1
- SSair.remove_zone(src)
+ SSzas.remove_zone(src)
#ifdef ZASDBG
for(var/turf/simulated/T in contents)
T.dbg(invalid_zone)
@@ -133,7 +133,7 @@ Class Procs:
T.update_graphic(graphic_remove = air.graphic) //we need to remove the overlays so they're not doubled when the zone is rebuilt
//T.dbg(invalid_zone)
T.needs_air_update = 0 //Reset the marker so that it will be added to the list.
- SSair.mark_for_update(T)
+ SSzas.mark_for_update(T)
/zone/proc/add_tile_air(datum/gas_mixture/tile_air)
//air.volume += CELL_VOLUME
@@ -146,10 +146,10 @@ Class Procs:
/zone/proc/tick()
// Update fires.
- if(air.temperature >= PHORON_FLASHPOINT && !(src in SSair.active_fire_zones) && air.check_combustability() && contents.len)
+ if(air.temperature >= PHORON_FLASHPOINT && !(src in SSzas.active_fire_zones) && air.check_combustability() && contents.len)
var/turf/T = pick(contents)
if(istype(T))
- T.create_fire(vsc.fire_firelevel_multiplier)
+ T.create_fire(SSzas.settings.fire_firelevel_multiplier)
// Update gas overlays.
if(air.check_tile_graphic(graphic_add, graphic_remove))
@@ -165,8 +165,8 @@ Class Procs:
// Handle condensation from the air.
for(var/g in air.gas)
- var/product = gas_data.condensation_products[g]
- if(product && air.temperature <= gas_data.condensation_points[g])
+ var/product = SSzas.gas_data.condensation_products[g]
+ if(product && air.temperature <= SSzas.gas_data.condensation_points[g])
var/condensation_area = air.group_multiplier
while(condensation_area > 0)
condensation_area--
@@ -190,7 +190,7 @@ Class Procs:
/zone/proc/dbg_data(mob/M)
to_chat(M, name)
for(var/g in air.gas)
- to_chat(M, "[gas_data.name[g]]: [air.gas[g]]")
+ to_chat(M, "[SSzas.gas_data.name[g]]: [air.gas[g]]")
to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)")
to_chat(M, "O2 per N2: [(air.gas[GAS_NITROGEN] ? air.gas[GAS_OXYGEN]/air.gas[GAS_NITROGEN] : "N/A")] Moles: [air.total_moles]")
to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])")
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index 6403b4417aa..269c5722698 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -95,7 +95,7 @@
temperature = starting_temperature
perform_exposure()
setDir(pick(GLOB.cardinals))
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = .proc/on_entered,
)
diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index 28743a43c47..0a1ce419a2c 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -118,7 +118,7 @@
var/turf/local_turf = get_turf(loc)
if(!local_turf)
return
- local_turf.air_update_turf(update, remove)
+ local_turf./air_update_turf(update, remove)
/**
* A helper proc for dealing with atmos changes
@@ -139,8 +139,8 @@
/atom/movable/proc/move_update_air(turf/target_turf)
if(isturf(target_turf))
- target_turf.air_update_turf(TRUE, FALSE) //You're empty now
- air_update_turf(TRUE, TRUE) //You aren't
+ target_turf.//air_update_turf(TRUE, FALSE) //You're empty now
+ //air_update_turf(TRUE, TRUE) //You aren't
/atom/proc/atmos_spawn_air(text) //because a lot of people loves to copy paste awful code lets just make an easy proc to spawn your plasma fires
var/turf/open/local_turf = get_turf(src)
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 7627bf7c48e..6887aa8ca32 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -80,14 +80,14 @@
return FALSE
air.merge(giver)
update_visuals()
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
return TRUE
/turf/open/remove_air(amount)
var/datum/gas_mixture/ours = return_air()
var/datum/gas_mixture/removed = ours.remove(amount)
update_visuals()
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
return removed
/turf/open/proc/copy_air_with_tile(turf/open/target_turf)
@@ -374,7 +374,7 @@
/atom/movable
///How much delta pressure is needed for us to move
- var/pressure_resistance = 10
+ var///pressure_resistance = 10
var/last_high_pressure_movement_air_cycle = 0
/atom/movable/proc/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0)
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index acc3b5714f5..5c62143e0a6 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -217,10 +217,10 @@
continue
cur_tlv = TLV[gas_id]
data["environment_data"] += list(list(
- "name" = environment.gases[gas_id][GAS_META][META_GAS_NAME],
- "value" = environment.gases[gas_id][MOLES] / total_moles * 100,
+ "name" = environment.gas[gas_id],
+ "value" = environment.get_gas(gas_id) / total_moles * 100,
"unit" = "%",
- "danger_level" = cur_tlv.get_danger_level(environment.gases[gas_id][MOLES] * partial_pressure)
+ "danger_level" = cur_tlv.get_danger_level(environment.get_gas(gas_id)* partial_pressure)
))
if(!locked || user.has_unlimited_silicon_privilege)
@@ -451,26 +451,7 @@
for(var/device_id in my_area.air_scrub_info)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = list(
- /datum/gas/carbon_dioxide,
- /datum/gas/miasma,
- /datum/gas/plasma,
- /datum/gas/water_vapor,
- /datum/gas/hypernoblium,
- /datum/gas/nitrous_oxide,
- /datum/gas/nitrium,
- /datum/gas/tritium,
- /datum/gas/bz,
- /datum/gas/pluoxium,
- /datum/gas/freon,
- /datum/gas/hydrogen,
- /datum/gas/healium,
- /datum/gas/proto_nitrate,
- /datum/gas/zauker,
- /datum/gas/helium,
- /datum/gas/antinoblium,
- /datum/gas/halon,
- ),
+ "set_filters" = ALL_GASES,
"scrubbing" = 1,
"widenet" = 1
), signal_source)
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 10759536c12..a6de2e9fef0 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -52,13 +52,13 @@
///Whether it can be painted
var/paintable = TRUE
- ///Is the thing being rebuilt by SSair or not. Prevents list bloat
+ ///Is the thing being rebuilt by SSzas or not. Prevents list bloat
var/rebuilding = FALSE
///The bitflag that's being checked on ventcrawling. Default is to allow ventcrawling and seeing pipes.
var/vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE
-
- ///keeps the name of the object from being overridden if it's vareditted.
+
+ ///keeps the name of the object from being overridden if it's vareditted.
var/override_naming
/obj/machinery/atmospherics/LateInitialize()
@@ -83,20 +83,20 @@
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, BIO = 100, FIRE = 100, ACID = 70)
..()
if(process)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
set_init_directions(init_dir)
/obj/machinery/atmospherics/Initialize(mapload)
if(mapload && name != initial(name))
override_naming = TRUE
- return ..()
+ return ..()
/obj/machinery/atmospherics/Destroy()
for(var/i in 1 to device_type)
nullify_node(i)
- SSair.stop_processing_machine(src)
- SSair.rebuild_queue -= src
+ SSzas.stop_processing_machine(src)
+ SSzas.rebuild_queue -= src
if(pipe_vision_img)
qdel(pipe_vision_img)
@@ -114,7 +114,7 @@
on = active
SEND_SIGNAL(src, COMSIG_ATMOS_MACHINE_SET_ON, on)
-/// This should only be called by SSair as part of the rebuild queue.
+/// This should only be called by SSzas as part of the rebuild queue.
/// Handles rebuilding pipelines after init or they've been changed.
/obj/machinery/atmospherics/proc/rebuild_pipes()
var/list/targets = get_rebuild_targets()
@@ -470,7 +470,7 @@
for(var/obj/machinery/atmospherics/A in nodes)
A.atmos_init()
A.add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
/obj/machinery/atmospherics/update_name()
if(!override_naming)
diff --git a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
index 65af7ccd181..4b9a7f12843 100644
--- a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
+++ b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
@@ -99,7 +99,7 @@
call_reactions(env)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
if(anchored)
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
index f461cbe8988..a482283b9ba 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
@@ -28,7 +28,7 @@
var/datum/gas_mixture/internal = airs[1]
if(internal.equalize(external))
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
update_parents()
/obj/machinery/atmospherics/components/unary/passive_vent/layer2
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 8692049c791..f25b5df5dc2 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -46,7 +46,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 10, BIO = 100, FIRE = 80, ACID = 50)
max_integrity = 250
integrity_failure = 0.4
- pressure_resistance = 7 * ONE_ATMOSPHERE
+ //pressure_resistance = 7 * ONE_ATMOSPHERE
req_access = list()
var/icon/canister_overlay_file = 'icons/obj/atmospherics/canisters.dmi'
@@ -551,7 +551,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
excited = TRUE
if(air_contents.release_gas_to(target_air, release_pressure) && !holding)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
var/our_pressure = air_contents.return_pressure()
var/our_temperature = air_contents.return_temperature()
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index c7f922c92f5..dcc57b43165 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -22,12 +22,12 @@
air_contents = new
air_contents.volume = volume
air_contents.temperature = T20C
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
/obj/machinery/portable_atmospherics/Destroy()
disconnect()
air_contents = null
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
return ..()
@@ -50,7 +50,7 @@
excited = FALSE
/obj/machinery/portable_atmospherics/return_air()
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
return air_contents
/obj/machinery/portable_atmospherics/return_analyzable_air()
@@ -80,7 +80,7 @@
pixel_x = new_port.pixel_x
pixel_y = new_port.pixel_y
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
update_appearance()
return TRUE
@@ -101,7 +101,7 @@
pixel_x = 0
pixel_y = 0
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
update_appearance()
return TRUE
@@ -139,7 +139,7 @@
holding = new_tank
RegisterSignal(holding, COMSIG_PARENT_QDELETING, .proc/unregister_holding)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
update_appearance()
return TRUE
@@ -193,10 +193,10 @@
add_fingerprint(user)
return ..()
-/// Holding tanks can get to zero integrity and be destroyed without other warnings due to pressure change.
+/// Holding tanks can get to zero integrity and be destroyed without other warnings due to pressure change.
/// This checks for that case and removes our reference to it.
/obj/machinery/portable_atmospherics/proc/unregister_holding()
SIGNAL_HANDLER
-
+
UnregisterSignal(holding, COMSIG_PARENT_QDELETING)
holding = null
diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm
index 7390affc0d1..26dfe3e8651 100644
--- a/code/modules/atmospherics/machinery/portable/pump.dm
+++ b/code/modules/atmospherics/machinery/portable/pump.dm
@@ -68,7 +68,7 @@
receiving = (holding ? holding.return_air() : air_contents)
if(sending.pump_gas_to(receiving, target_pressure) && !holding)
- air_update_turf(FALSE, FALSE) // Update the environment if needed.
+ //air_update_turf(FALSE, FALSE) // Update the environment if needed.
return ..()
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 399a35a083d..bbf6ed311c1 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -99,7 +99,7 @@
air_contents.merge(filtered) // Store filtered out gasses.
mixture.merge(filtering) // Returned the cleaned gas.
if(!holding)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
. = ..()
diff --git a/code/modules/awaymissions/cordon.dm b/code/modules/awaymissions/cordon.dm
index e85a2e346e4..31a4ddc7447 100644
--- a/code/modules/awaymissions/cordon.dm
+++ b/code/modules/awaymissions/cordon.dm
@@ -16,7 +16,6 @@
/turf/cordon/AfterChange()
. = ..()
- SSair.high_pressure_delta -= src
/turf/cordon/attack_ghost(mob/dead/observer/user)
return FALSE
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index 7b523f31606..ffbeb476971 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -5,7 +5,7 @@
icon_state = "barrel"
density = TRUE
anchored = FALSE
- pressure_resistance = 2 * ONE_ATMOSPHERE
+ //pressure_resistance = 2 * ONE_ATMOSPHERE
max_integrity = 300
var/open = FALSE
var/can_open = TRUE
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 7574ddee5fd..e95bb3ecc9e 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -122,7 +122,7 @@
)
)
for(var/turf/affected_turf as anything in template_and_bordering_turfs)
- affected_turf.air_update_turf(TRUE, TRUE)
+ affected_turf.//air_update_turf(TRUE, TRUE)
affected_turf.levelupdate()
/datum/map_template/proc/load_new_z(secret = FALSE)
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index 53f37e45f13..bb6b5163e95 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -335,7 +335,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32)
icon = 'icons/obj/objects.dmi'
icon_state = "miningbeacon"
var/obj/docking_port/stationary/Mport //Linked docking port for the mining shuttle
- pressure_resistance = 200 //So it does not get blown into lava.
+ //pressure_resistance = 200 //So it does not get blown into lava.
var/anti_spam_cd = 0 //The linking process might be a bit intensive, so this here to prevent over use.
var/console_range = 15 //Wifi range of the beacon to find the aux base console
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 0baefc9041b..36ba0ed593c 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -262,10 +262,10 @@
/obj/structure/fans/Initialize(mapload)
. = ..()
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
/obj/structure/fans/Destroy()
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
. = ..()
//Invisible, indestructible fans
/obj/structure/fans/tiny/invisible
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 67cef378df0..b18f588ca86 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -7,7 +7,7 @@
name = "ore box"
desc = "A heavy wooden box, which can be filled with a lot of ores."
density = TRUE
- pressure_resistance = 5*ONE_ATMOSPHERE
+ //pressure_resistance = 5*ONE_ATMOSPHERE
/obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
if (istype(W, /obj/item/stack/ore))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 30f8dbaebf2..b2b031b542b 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -10,7 +10,7 @@
mob_size = MOB_SIZE_LARGE
layer = LARGE_MOB_LAYER //above most mobs, but below speechbubbles
plane = GAME_PLANE_UPPER_FOV_HIDDEN
- pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
+ //pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
butcher_results = list(/obj/item/food/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 6426cdb8f7f..99eb8cbedc4 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -1,7 +1,7 @@
/mob/living/carbon
blood_volume = BLOOD_VOLUME_NORMAL
gender = MALE
- pressure_resistance = 15
+ //pressure_resistance = 15
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,GLAND_HUD)
has_limbs = TRUE
held_items = list(null, null)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 102d3475e36..032d9c6180e 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -7,7 +7,7 @@
appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD,FAN_HUD)
hud_type = /datum/hud/human
- pressure_resistance = 25
+ //pressure_resistance = 25
can_buckle = TRUE
buckle_lying = 0
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 843e37598e8..dc34e8b2802 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -3,7 +3,7 @@
sight = 0
see_in_dark = 2
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD)
- pressure_resistance = 10
+ //pressure_resistance = 10
hud_type = /datum/hud/living
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 7db0ef33636..29dab1be903 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -27,7 +27,7 @@
maxbodytemp = INFINITY
healable = 0
faction = list("cult")
- pressure_resistance = 100
+ //pressure_resistance = 100
unique_name = 1
AIStatus = AI_OFF //normal constructs don't have AI
loot = list(/obj/item/ectoplasm)
diff --git a/code/modules/mob/living/simple_animal/heretic_monsters.dm b/code/modules/mob/living/simple_animal/heretic_monsters.dm
index af19683a97f..83fd0b936a7 100644
--- a/code/modules/mob/living/simple_animal/heretic_monsters.dm
+++ b/code/modules/mob/living/simple_animal/heretic_monsters.dm
@@ -26,7 +26,7 @@
maxbodytemp = INFINITY
healable = FALSE
movement_type = GROUND
- pressure_resistance = 100
+ //pressure_resistance = 100
del_on_death = TRUE
deathmessage = "implodes into itself."
loot = list(/obj/effect/gibspawner/human)
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 839af83ffea..92605a8db3e 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -39,7 +39,7 @@
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
- pressure_resistance = 200
+ //pressure_resistance = 200
gold_core_spawnable = HOSTILE_SPAWN
/// If the carp uses random coloring
var/random_color = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
index 84ae852cee5..23991e03a5a 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
@@ -28,7 +28,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
- pressure_resistance = 300
+ //pressure_resistance = 300
gold_core_spawnable = NO_SPAWN //too spooky for science
light_system = MOVABLE_LIGHT
light_range = 1 // same glowing as visible player ghosts
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index c7d17ea8c37..15e3cd5e87b 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -66,7 +66,7 @@
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
- pressure_resistance = 200
+ //pressure_resistance = 200
/// Current time since the the last rift was activated. If set to -1, does not increment.
var/riftTimer = 0
/// Maximum amount of time which can pass without a rift before Space Dragon despawns.
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 4f171e7cdd9..04515064f8d 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -13,7 +13,7 @@
plane = GAME_PLANE_FOV_HIDDEN
animate_movement = SLIDE_STEPS
hud_possible = list(ANTAG_HUD)
- pressure_resistance = 8
+ //pressure_resistance = 8
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
throwforce = 10
blocks_emissive = EMISSIVE_BLOCK_GENERIC
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index 1c373b4de40..066b0235777 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -129,3 +129,8 @@
/datum/movespeed_modifier/auto_wash
multiplicative_slowdown = 3
+
+/datum/movespeed_modifier/atmos_pressure
+ multiplicative_slowdown = 3
+ id = MOVESPEED_ID_MOB_ATMOS_AFFLICTION
+ variable = TRUE
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index ef22e798c6a..944f8201c2f 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "folder"
w_class = WEIGHT_CLASS_SMALL
- pressure_resistance = 2
+ //pressure_resistance = 2
resistance_flags = FLAMMABLE
/// The background color for tgui in hex (with a `#`)
var/bg_color = "#7f7f7f"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 68b3d5dde5e..a7fe41bd0f6 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -26,7 +26,7 @@
w_class = WEIGHT_CLASS_TINY
throw_range = 1
throw_speed = 1
- pressure_resistance = 0
+ //pressure_resistance = 0
slot_flags = ITEM_SLOT_HEAD
body_parts_covered = HEAD
resistance_flags = FLAMMABLE
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 720c4acd024..aa71b67c941 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -12,7 +12,7 @@
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 3
throw_range = 7
- pressure_resistance = 8
+ //pressure_resistance = 8
var/papertype = /obj/item/paper
var/total_paper = 30
var/list/papers = list()
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 2d9d207ac4f..47f078e3c94 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -23,7 +23,7 @@
throw_speed = 3
throw_range = 7
custom_materials = list(/datum/material/iron=10)
- pressure_resistance = 2
+ //pressure_resistance = 2
grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
var/colour = "#000000" //what colour the ink is!
var/degrees = 0
@@ -309,7 +309,7 @@
force = 3
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/iron=10, /datum/material/diamond=100, /datum/material/titanium = 10)
- pressure_resistance = 2
+ //pressure_resistance = 2
grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
tool_behaviour = TOOL_MINING //For the classic "digging out of prison with a spoon but you're in space so this analogy doesn't work" situation.
toolspeed = 10 //You will never willingly choose to use one of these over a shovel.
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 2d61ca83c19..561aa52bb3d 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -9,7 +9,7 @@
throw_speed = 3
throw_range = 7
custom_materials = list(/datum/material/iron=60)
- pressure_resistance = 2
+ //pressure_resistance = 2
attack_verb_continuous = list("stamps")
attack_verb_simple = list("stamp")
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index fb9abb17a68..98e31b31286 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -21,7 +21,7 @@
/obj/machinery/field/containment/Initialize(mapload)
. = ..()
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity)
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = .proc/on_entered,
@@ -36,7 +36,7 @@
field_gen_2.fields -= src
field_gen_2 = null
can_atmos_pass = ATMOS_PASS_YES
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
return ..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index b37775f6610..15c3d10c2e2 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -200,7 +200,7 @@ no power level overlay is currently in the overlays list.
/obj/machinery/field/generator/proc/turn_off()
active = FG_OFFLINE
can_atmos_pass = ATMOS_PASS_YES
- air_update_turf(TRUE, FALSE)
+ //air_update_turf(TRUE, FALSE)
INVOKE_ASYNC(src, .proc/cleanup)
addtimer(CALLBACK(src, .proc/cool_down), 5 SECONDS)
@@ -276,7 +276,7 @@ no power level overlay is currently in the overlays list.
return
move_resist = INFINITY
can_atmos_pass = ATMOS_PASS_NO
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
addtimer(CALLBACK(src, .proc/setup_field, 1), 1)
addtimer(CALLBACK(src, .proc/setup_field, 2), 2)
addtimer(CALLBACK(src, .proc/setup_field, 4), 3)
diff --git a/code/modules/power/supermatter/supermatter_process.dm b/code/modules/power/supermatter/supermatter_process.dm
index 3dfc5e0027f..e5f7a0e98d1 100644
--- a/code/modules/power/supermatter/supermatter_process.dm
+++ b/code/modules/power/supermatter/supermatter_process.dm
@@ -51,7 +51,7 @@
removed.gases[/datum/gas/oxygen][MOLES] = max(((device_energy + TCMB) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
removed.garbage_collect()
env.merge(removed)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
else
if(takes_damage)
//causing damage
@@ -302,7 +302,7 @@
if(produces_gas)
removed.garbage_collect()
env.merge(removed)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
/obj/machinery/power/supermatter_crystal/proc/psychological_examination()
// Defaults to a value less than 1. Over time the psyCoeff goes to 0 if
diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm
index c1a3ad037fe..1d6e9ced35a 100644
--- a/code/modules/power/turbine/turbine.dm
+++ b/code/modules/power/turbine/turbine.dm
@@ -471,7 +471,7 @@
//the compressor compresses down the gases from 2500 L to 1000 L
//the temperature and pressure rises up, you can regulate this to increase/decrease the amount of gas moved in.
var/compressor_work = do_calculations(input_turf_mixture, compressor.machine_gasmix, regulated = TRUE)
- input_turf.air_update_turf(TRUE)
+ input_turf.//air_update_turf(TRUE)
var/compressor_pressure = max(compressor.machine_gasmix.return_pressure(), 0.01)
//the rotor moves the gases that expands from 1000 L to 3000 L, they cool down and both temperature and pressure lowers
@@ -496,7 +496,7 @@
add_avail(produced_energy)
turbine.machine_gasmix.pump_gas_to(output_turf.air, turbine.machine_gasmix.return_pressure())
- output_turf.air_update_turf(TRUE)
+ output_turf.//air_update_turf(TRUE)
/**
* Handles all the calculations needed for the gases, work done, temperature increase/decrease
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 48d88b4654c..0bc8bc897a0 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -5,7 +5,7 @@
icon_state = "water"
density = TRUE
anchored = FALSE
- pressure_resistance = 2*ONE_ATMOSPHERE
+ //pressure_resistance = 2*ONE_ATMOSPHERE
max_integrity = 300
///In units, how much the dispenser can hold
var/tank_volume = 1000
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index aca55ac9ea2..51ee0c75462 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -444,7 +444,7 @@
//Actually transfer the gas
var/datum/gas_mixture/removed = env.remove(transfer_moles)
air_contents.merge(removed)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
//if full enough, switch to ready mode
if(air_contents.return_pressure() >= SEND_PRESSURE)
diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm
index 5f24bc63241..56a14772878 100644
--- a/code/modules/recycling/disposal/construction.dm
+++ b/code/modules/recycling/disposal/construction.dm
@@ -8,7 +8,7 @@
icon_state = "conpipe"
anchored = FALSE
density = FALSE
- pressure_resistance = 5*ONE_ATMOSPHERE
+ //pressure_resistance = 5*ONE_ATMOSPHERE
max_integrity = 200
var/obj/pipe_type = /obj/structure/disposalpipe/segment
var/pipename
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 111b2911c9e..e576126d4dd 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -375,7 +375,7 @@
heat_capacity = 1
removed.temperature = min((removed.temperature*heat_capacity + 100000)/heat_capacity, 1000)
env.merge(removed)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
investigate_log("Experimentor has released hot air.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
@@ -421,7 +421,7 @@
heat_capacity = 1
removed.temperature = (removed.temperature*heat_capacity - 75000)/heat_capacity
env.merge(removed)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
investigate_log("Experimentor has released cold air.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 78904de857c..bd5f34edbb5 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -106,7 +106,7 @@
removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000)
env.merge(removed)
- air_update_turf(FALSE, FALSE)
+ //air_update_turf(FALSE, FALSE)
/proc/fix_noid_research_servers()
var/list/no_id_servers = list()
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 09c22a92b08..56d2c56a8e9 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -111,7 +111,7 @@ Chilling extracts:
G.gases[/datum/gas/plasma][MOLES] = 0
filtered = TRUE
G.garbage_collect()
- T.air_update_turf(FALSE, FALSE)
+ T.//air_update_turf(FALSE, FALSE)
if(filtered)
user.visible_message(span_notice("Cracks spread throughout [src], and some air is sucked in!"))
else
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 2ddc73e2527..43a0fd57ad8 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -58,9 +58,9 @@ All ShuttleMove procs go here
var/depth = baseturfs.len - shuttle_boundary + 1
newT.CopyOnTop(src, 1, depth, TRUE)
newT.blocks_air = TRUE
- newT.air_update_turf(TRUE, FALSE)
+ newT.//air_update_turf(TRUE, FALSE)
blocks_air = TRUE
- air_update_turf(TRUE, TRUE)
+ //air_update_turf(TRUE, TRUE)
if(isopenturf(newT))
var/turf/open/new_open = newT
new_open.copy_air_with_tile(src)
@@ -86,9 +86,9 @@ All ShuttleMove procs go here
/turf/proc/lateShuttleMove(turf/oldT)
blocks_air = initial(blocks_air)
- air_update_turf(TRUE, blocks_air)
+ //air_update_turf(TRUE, blocks_air)
oldT.blocks_air = initial(oldT.blocks_air)
- oldT.air_update_turf(TRUE, oldT.blocks_air)
+ oldT.//air_update_turf(TRUE, oldT.blocks_air)
/////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 277680b8651..b88e07c23e5 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -468,8 +468,8 @@
var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.return_pressure() - cabin_pressure)/2)
var/transfer_moles = 0
if(pressure_delta > 0) //cabin pressure lower than release pressure
- if(tank_air.return_temperature() > 0)
- transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION)
+ if(tank_air.temperature > 0)
+ transfer_moles = pressure_delta*cabin_air.volume/(cabin_air.temperature * R_IDEAL_GAS_EQUATION)
var/datum/gas_mixture/removed = tank_air.remove(transfer_moles)
cabin_air.merge(removed)
else if(pressure_delta < 0) //cabin pressure higher than release pressure
@@ -478,7 +478,7 @@
if(t_air)
pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta)
if(pressure_delta > 0) //if location pressure is lower than cabin pressure
- transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION)
+ transfer_moles = pressure_delta*cabin_air.volume/(cabin_air.temperature * R_IDEAL_GAS_EQUATION)
var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles)
if(t_air)
t_air.merge(removed)
@@ -1242,7 +1242,7 @@
///fetches temp of the gas mixture we are using
/obj/vehicle/sealed/mecha/return_temperature()
var/datum/gas_mixture/air = return_air()
- return air?.return_temperature()
+ return air?.temperature
diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
index 276138e8b2d..d1b9f463f5f 100644
--- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
@@ -447,7 +447,7 @@
if(!chassis || !chassis.internal_tank)
return FALSE
var/datum/gas_mixture/our_mix = chassis.internal_tank.return_air()
- var/moles = our_mix.total_moles()
+ var/moles = our_mix.total_moles
if(moles < move_cost)
our_mix.remove(moles)
return FALSE
diff --git a/code/modules/wiremod/components/sensors/pressuresensor.dm b/code/modules/wiremod/components/sensors/pressuresensor.dm
index 06e45cc688a..c0509aac6f2 100644
--- a/code/modules/wiremod/components/sensors/pressuresensor.dm
+++ b/code/modules/wiremod/components/sensors/pressuresensor.dm
@@ -24,7 +24,7 @@
return
//Get environment info
var/datum/gas_mixture/environment = location.return_air()
- var/total_moles = environment.total_moles()
+ var/total_moles = environment.total_moles
var/pressure = environment.return_pressure()
if(total_moles)
//If there's atmos, return pressure
diff --git a/code/modules/wiremod/components/sensors/tempsensor.dm b/code/modules/wiremod/components/sensors/tempsensor.dm
index e88d5dea1c3..c84282582cb 100644
--- a/code/modules/wiremod/components/sensors/tempsensor.dm
+++ b/code/modules/wiremod/components/sensors/tempsensor.dm
@@ -24,7 +24,7 @@
return
//Get environment info
var/datum/gas_mixture/environment = location.return_air()
- var/total_moles = environment.total_moles()
+ var/total_moles = environment.total_moles
if(total_moles)
//If there's atmos, return temperature
result.set_output(round(environment.temperature,1))
diff --git a/tgstation.dme b/tgstation.dme
index a0d92e739f5..70c7b2536a0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -194,6 +194,8 @@
#include "code\__DEFINES\atmospherics\atmos_mapping_helpers.dm"
#include "code\__DEFINES\atmospherics\atmos_mob_interaction.dm"
#include "code\__DEFINES\atmospherics\atmos_piping.dm"
+#include "code\__DEFINES\atmospherics\ZAS.dm"
+#include "code\__DEFINES\atmospherics\ZAS_math.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals\signals_action.dm"
@@ -448,6 +450,7 @@
#include "code\controllers\subsystem\achievements.dm"
#include "code\controllers\subsystem\addiction.dm"
#include "code\controllers\subsystem\ai_controllers.dm"
+#include "code\controllers\subsystem\airflow.dm"
//#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\ambience.dm"
#include "code\controllers\subsystem\assets.dm"
@@ -1389,7 +1392,7 @@
#include "code\game\objects\effects\effect_system\effects_smoke.dm"
#include "code\game\objects\effects\effect_system\effects_sparks.dm"
#include "code\game\objects\effects\effect_system\effects_water.dm"
-#include "code\game\objects\effects\spawners\bombspawner.dm"
+//#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\costume.dm"
#include "code\game\objects\effects\spawners\gibspawner.dm"
#include "code\game\objects\effects\spawners\structure.dm"
@@ -2343,16 +2346,19 @@
#include "code\modules\atmospherics\ZAS\Connection.dm"
#include "code\modules\atmospherics\ZAS\ConnectionGroup.dm"
#include "code\modules\atmospherics\ZAS\ConnectionManager.dm"
+#include "code\modules\atmospherics\ZAS\ZAS_Settings.dm"
#include "code\modules\atmospherics\ZAS\Debug.dm"
#include "code\modules\atmospherics\ZAS\Diagnostic.dm"
#include "code\modules\atmospherics\ZAS\Fire.dm"
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\simple.dm"
#include "code\modules\atmospherics\ZAS\Turf.dm"
+#include "code\modules\atmospherics\ZAS\XGM\gases.dm"
#include "code\modules\atmospherics\ZAS\Zone.dm"
#include "code\modules\atmospherics\ZAS\_docs.dm"
#include "code\modules\atmospherics\ZAS\Airflow.dm"
#include "code\modules\atmospherics\ZAS\Atom.dm"
#include "code\modules\atmospherics\ZAS\Plasma.dm"
+#include "code\modules\atmospherics\ZAS\XGM\xgm_gas_mixture.dm"
#include "code\modules\atmospherics\ZAS\XGM\gas_data.dm"
#include "code\modules\atmospherics\machinery\portable\canister.dm"
#include "code\modules\atmospherics\machinery\portable\portable_atmospherics.dm"
From 7a165cb586ef959e1a7c7f430e4a45c6559bdd10 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Thu, 14 Apr 2022 22:19:46 -0400
Subject: [PATCH 003/200] Under 1000 errors
---
tgstation.dme | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tgstation.dme b/tgstation.dme
index 70c7b2536a0..ef7f70abfe1 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2290,7 +2290,7 @@
*/
#include "code\modules\atmospherics\machinery\airalarm.dm"
#include "code\modules\atmospherics\machinery\atmosmachinery.dm"
-#include "code\modules\atmospherics\machinery\bluespace_vendor.dm"
+//#include "code\modules\atmospherics\machinery\bluespace_vendor.dm"
#include "code\modules\atmospherics\machinery\datum_pipeline.dm"
#include "code\modules\atmospherics\machinery\components\components_base.dm"
#include "code\modules\atmospherics\machinery\components\tank.dm"
@@ -2305,8 +2305,10 @@
#include "code\modules\atmospherics\machinery\components\binary_devices\thermomachine.dm"
#include "code\modules\atmospherics\machinery\components\binary_devices\valve.dm"
#include "code\modules\atmospherics\machinery\components\binary_devices\volume_pump.dm"
+/*
#include "code\modules\atmospherics\machinery\components\electrolyzer\electrolyzer.dm"
#include "code\modules\atmospherics\machinery\components\electrolyzer\electrolyzer_reactions.dm"
+*/
/*
#include "code\modules\atmospherics\machinery\components\fusion\hfr_core.dm"
#include "code\modules\atmospherics\machinery\components\fusion\hfr_defines.dm"
@@ -2337,6 +2339,7 @@
#include "code\modules\atmospherics\machinery\pipes\layermanifold.dm"
#include "code\modules\atmospherics\machinery\pipes\mapping.dm"
#include "code\modules\atmospherics\machinery\pipes\multiz.dm"
+#include "code\modules\atmospherics\ZAS\atmos_primitives.dm"
#include "code\modules\atmospherics\machinery\pipes\pipes.dm"
#include "code\modules\atmospherics\machinery\pipes\smart.dm"
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\he_pipes.dm"
From 164fbc39c1a3daa178b8561946164d523bb000d2 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Fri, 15 Apr 2022 16:49:02 -0400
Subject: [PATCH 004/200] Checkpoint!
---
code/__DEFINES/atmospherics/ZAS.dm | 63 +-
code/__DEFINES/atmospherics/atmos_helpers.dm | 4 +-
code/__DEFINES/atmospherics/temperature.dm | 22 +
code/__DEFINES/flags.dm | 8 +-
code/__DEFINES/subsystems.dm | 1 +
code/__HELPERS/_logging.dm | 2 +-
code/__HELPERS/atmospherics.dm | 2 +-
code/__HELPERS/global_lists.dm | 2 +-
.../subsystem/processing/processing.dm | 3 +-
.../subsystem/processing/temperature.dm | 5 +
code/controllers/subsystem/zas.dm | 21 +-
code/datums/components/gas_leaker.dm | 4 +-
code/game/atoms.dm | 3 +
code/game/machinery/computer/arcade/arcade.dm | 2 +-
.../effects/effect_system/effects_foam.dm | 2 +-
.../effects/effect_system/effects_smoke.dm | 6 +-
code/game/objects/effects/glowshroom.dm | 5 +-
code/game/objects/items.dm | 2 +-
code/game/objects/items/flamethrower.dm | 27 +-
code/game/objects/items/tanks/tank_types.dm | 26 +-
code/game/objects/items/tanks/tanks.dm | 1 +
code/game/objects/objs.dm | 3 +
code/game/objects/structures/window.dm | 3 +-
code/modules/admin/verbs/fix_air.dm | 69 ++-
code/modules/assembly/bomb.dm | 6 +-
code/modules/atmospherics/ZAS/Airflow.dm | 3 +-
code/modules/atmospherics/ZAS/Fire.dm | 104 ++--
code/modules/atmospherics/ZAS/Plasma.dm | 8 +-
code/modules/atmospherics/ZAS/Temperature.dm | 58 ++
code/modules/atmospherics/ZAS/Turf.dm | 8 +-
code/modules/atmospherics/ZAS/XGM/gas_data.dm | 48 +-
.../atmospherics/ZAS/XGM/xgm_gas_mixture.dm | 94 +--
code/modules/atmospherics/ZAS/Zone.dm | 15 +-
.../atmospherics/ZAS/atmos_primitives.dm | 537 ++++++++++++++++++
.../atmospherics/machinery/airalarm.dm | 39 +-
.../components/binary_devices/circulator.dm | 2 +-
.../components/binary_devices/passive_gate.dm | 3 +-
.../binary_devices/pressure_valve.dm | 3 +-
.../components/binary_devices/pump.dm | 4 +-
.../binary_devices/temperature_gate.dm | 6 +-
.../binary_devices/thermomachine.dm | 2 +-
.../machinery/components/components_base.dm | 4 +-
.../components/electrolyzer/electrolyzer.dm | 4 +-
.../atmospherics/machinery/components/tank.dm | 8 +-
.../components/trinary_devices/filter.dm | 13 +-
.../components/unary_devices/cryo.dm | 9 +-
.../unary_devices/heat_exchanger.dm | 6 +-
.../components/unary_devices/vent_scrubber.dm | 53 +-
.../atmospherics/machinery/datum_pipeline.dm | 75 +--
.../atmospherics/machinery/other/meter.dm | 8 +-
.../atmospherics/machinery/other/miner.dm | 4 +-
.../machinery/pipes/layermanifold.dm | 2 +-
.../atmospherics/machinery/pipes/pipes.dm | 2 +-
.../atmospherics/machinery/portable/pump.dm | 41 +-
.../machinery/portable/scrubber.dm | 37 +-
code/modules/awaymissions/away_props.dm | 18 -
code/modules/cargo/exports/large_objects.dm | 24 +-
tgstation.dme | 5 +-
58 files changed, 1067 insertions(+), 472 deletions(-)
create mode 100644 code/__DEFINES/atmospherics/temperature.dm
create mode 100644 code/controllers/subsystem/processing/temperature.dm
create mode 100644 code/modules/atmospherics/ZAS/Temperature.dm
create mode 100644 code/modules/atmospherics/ZAS/atmos_primitives.dm
diff --git a/code/__DEFINES/atmospherics/ZAS.dm b/code/__DEFINES/atmospherics/ZAS.dm
index b3e9fbcade6..364158806bf 100644
--- a/code/__DEFINES/atmospherics/ZAS.dm
+++ b/code/__DEFINES/atmospherics/ZAS.dm
@@ -202,8 +202,8 @@ var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
#define ATMOSTANK_NITROGEN 90000 // A lot of N2 is needed to produce air mix, that's why we keep 90MPa of it
#define ATMOSTANK_OXYGEN 50000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it.
#define ATMOSTANK_CO2 60000 // CO2 is used for the GUP, Charon, and Torch as the primary fuel propellant, and we need lots to stick around.
-#define ATMOSTANK_PHORON 25000
-#define ATMOSTANK_PHORON_FUEL 15000
+#define ATMOSTANK_PLASMA 25000
+#define ATMOSTANK_PLASMA_FUEL 15000
#define ATMOSTANK_HYDROGEN 50000
#define ATMOSTANK_HYDROGEN_FUEL 25000
#define ATMOSTANK_NITROUSOXIDE 10000 // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
@@ -235,7 +235,8 @@ var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
#define GAS_STEAM "water"
#define GAS_PLASMA "phoron"
-#define ALL_GASES list(GAS_OXYGEN, GAS_CO2, GAS_CO, GAS_METHYL_BROMIDE, GAS_N2O, GAS_NITROGEN, GAS_NO, GAS_METHANE, GAS_ALIEN, GAS_HYDROGEN, GAS_DEUTERIUM, GAS_TRITIUM, GAS_HELIUM, GAS_ARGON, GAS_KRYPTON, GAS_NEON, GAS_XENON, GAS_AMMONIA, GAS_CHLORINE, GAS_SULFUR, GAS_STEAM, GAS_PLASMA)
+GLOBAL_LIST_INIT(all_gases, list(GAS_OXYGEN, GAS_CO2, GAS_CO, GAS_METHYL_BROMIDE, GAS_N2O, GAS_NITROGEN, GAS_NO, GAS_METHANE, GAS_ALIEN, GAS_HYDROGEN, GAS_DEUTERIUM, GAS_TRITIUM, GAS_HELIUM, GAS_ARGON, GAS_KRYPTON, GAS_NEON, GAS_XENON, GAS_AMMONIA, GAS_CHLORINE, GAS_SULFUR, GAS_STEAM, GAS_PLASMA))
+GLOBAL_LIST_INIT(common_gases, list(GAS_OXYGEN, GAS_CO2, GAS_N2O, GAS_PLASMA, GAS_NITROGEN))
GLOBAL_LIST_INIT(reverse_dir, list( // reverse_dir[dir] = reverse of dir
2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15,
@@ -244,25 +245,37 @@ GLOBAL_LIST_INIT(reverse_dir, list( // reverse_dir[dir] = reverse of dir
48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63
))
-#define ATOM_IS_TEMPERATURE_SENSITIVE(A) (A && !QDELETED(A) && !(A.atom_flags & ATOM_FLAG_NO_TEMP_CHANGE))
-#define ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD 5
-#define ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT 0.25
-
-#define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
- _atom.temperature = _temp; \
- if(_atom.reagents) { \
- HANDLE_REACTIONS(_atom.reagents); \
- } \
- QUEUE_TEMPERATURE_ATOMS(_atom);
-
-#define QUEUE_TEMPERATURE_ATOMS(_atoms) \
- if(islist(_atoms)) { \
- for(var/thing in _atoms) { \
- var/atom/A = thing; \
- if(ATOM_IS_TEMPERATURE_SENSITIVE(A)) { \
- SStemperature.processing[A] = TRUE; \
- } \
- } \
- } else if(ATOM_IS_TEMPERATURE_SENSITIVE(_atoms)) { \
- SStemperature.processing[_atoms] = TRUE; \
- }
+// The flow rate/effectiveness of various atmos devices is limited by their internal volume,
+// so for many atmos devices these will control maximum flow rates in L/s.
+#define ATMOS_DEFAULT_VOLUME_PUMP 200 // Liters.
+#define ATMOS_DEFAULT_VOLUME_FILTER 500 // L.
+#define ATMOS_DEFAULT_VOLUME_MIXER 500 // L.
+#define ATMOS_DEFAULT_VOLUME_PIPE 70 // L.
+
+// heat2color functions. Adapted from: http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
+/proc/heat2color(temp)
+ return rgb(heat2color_r(temp), heat2color_g(temp), heat2color_b(temp))
+
+/proc/heat2color_r(temp)
+ temp /= 100
+ if(temp <= 66)
+ . = 255
+ else
+ . = max(0, min(255, 329.698727446 * (temp - 60) ** -0.1332047592))
+
+/proc/heat2color_g(temp)
+ temp /= 100
+ if(temp <= 66)
+ . = max(0, min(255, 99.4708025861 * log(temp) - 161.1195681661))
+ else
+ . = max(0, min(255, 288.1221695283 * ((temp - 60) ** -0.0755148492)))
+
+/proc/heat2color_b(temp)
+ temp /= 100
+ if(temp >= 66)
+ . = 255
+ else
+ if(temp <= 16)
+ . = 0
+ else
+ . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307))
diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm
index 433ecd3c7f7..20679527175 100644
--- a/code/__DEFINES/atmospherics/atmos_helpers.dm
+++ b/code/__DEFINES/atmospherics/atmos_helpers.dm
@@ -57,7 +57,9 @@ GLOBAL_LIST_INIT(nonoverlaying_gases, typecache_of_gases_with_no_overlays())
var/_GAS_OVERLAY = _GAS_META[META_GAS_OVERLAY];\
out_var += _GAS_OVERLAY[min(TOTAL_VISIBLE_STATES, CEILING(_GAS[MOLES] / MOLES_GAS_VISIBLE_STEP, 1))];\
}
-
+#define GAS_OVERLAYS(gases, outvar)\
+ out_var = list();\
+ for(var/_ID in gases)
#ifdef TESTING
GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
#define CALCULATE_ADJACENT_TURFS(T, state) if (SSair.adjacent_rebuild[T]) { GLOB.atmos_adjacent_savings[1] += 1 } else { GLOB.atmos_adjacent_savings[2] += 1; SSair.adjacent_rebuild[T] = state}
diff --git a/code/__DEFINES/atmospherics/temperature.dm b/code/__DEFINES/atmospherics/temperature.dm
new file mode 100644
index 00000000000..d86e844aab9
--- /dev/null
+++ b/code/__DEFINES/atmospherics/temperature.dm
@@ -0,0 +1,22 @@
+#define ATOM_IS_TEMPERATURE_SENSITIVE(A) (A && !QDELETED(A) && !(A.flags_2 & NO_TEMP_CHANGE_2))
+#define ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD 5
+#define ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT 0.25
+
+#define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
+ _atom.temperature = _temp; \
+ if(_atom.reagents) { \
+ START_PROCESSING(SSreagents, _atom.reagents); \
+ } \
+ QUEUE_TEMPERATURE_ATOMS(_atom);
+
+#define QUEUE_TEMPERATURE_ATOMS(_atoms) \
+ if(islist(_atoms)) { \
+ for(var/thing in _atoms) { \
+ var/atom/A = thing; \
+ if(ATOM_IS_TEMPERATURE_SENSITIVE(A)) { \
+ START_PROCESSING(SStemperature, A); \
+ } \
+ } \
+ } else if(ATOM_IS_TEMPERATURE_SENSITIVE(_atoms)) { \
+ START_PROCESSING(SStemperature, _atoms); \
+ }
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 389a4f2681b..b1139fcf476 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -58,8 +58,14 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define IS_PLAYER_COLORABLE_1 (1<<21)
/// Whether or not this atom has contextual screentips when hovered OVER
#define HAS_CONTEXTUAL_SCREENTIPS_1 (1<<22)
+
+
+//OH YEAH BABY FLAGS_2 HERE WE GO
///Plasma Contamination
-#define CONTAMINATED_1 (1<<23)
+#define CONTAMINATED_2 (1<<0)
+///Temperature does no change
+#define NO_TEMP_CHANGE_2 (1<<1)
+
// Update flags for [/atom/proc/update_appearance]
/// Update the atom's name
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 44e17d7c122..75bdba976db 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -174,6 +174,7 @@
#define FIRE_PRIORITY_GARBAGE 15
#define FIRE_PRIORITY_DATABASE 16
#define FIRE_PRIORITY_AIRFLOW 17
+#define FIRE_PRIORITY_TEMPERATURE 18
#define FIRE_PRIORITY_WET_FLOORS 20
#define FIRE_PRIORITY_AIR 20
#define FIRE_PRIORITY_NPC 20
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index bb72d342457..5c247ef1fc4 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))
/proc/log_atmos(text, datum/gas_mixture/mix)
var/message = text
message += "TEMP=[mix.return_temperature()],MOL=[mix.total_moles()],VOL=[mix.volume]"
- for(var/key in mix.gas)
+ for(var/key in mix.get_gases())
message += "[key]=[mix.get_gas(key)];"
log_game(message)
diff --git a/code/__HELPERS/atmospherics.dm b/code/__HELPERS/atmospherics.dm
index 2635c68c148..8dc421e33d7 100644
--- a/code/__HELPERS/atmospherics.dm
+++ b/code/__HELPERS/atmospherics.dm
@@ -41,7 +41,7 @@
)
if(!gasmix)
return
- for(var/gas_path in gasmix.gas)
+ for(var/gas_path in gasmix.get_gases())
.["gases"] += list(list(
"[gas_path]",
"[gas_path]",
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 3c3bc0ee86c..02fd62bae6d 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -103,7 +103,7 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list(
/obj/item/radio/intercom,
/obj/item/storage/secure/safe,
/obj/machinery/airalarm,
- /obj/machinery/bluespace_vendor,
+ ///obj/machinery/bluespace_vendor,
/obj/machinery/newscaster,
/obj/machinery/button,
/obj/machinery/computer/security/telescreen,
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 058645da495..8d59e8318ea 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -9,6 +9,7 @@ SUBSYSTEM_DEF(processing)
var/stat_tag = "P" //Used for logging
var/list/processing = list()
var/list/currentrun = list()
+ var/const/process_proc = /datum/proc/Process //Francinum is going to KILL ME
/datum/controller/subsystem/processing/stat_entry(msg)
msg = "[stat_tag]:[length(processing)]"
@@ -25,7 +26,7 @@ SUBSYSTEM_DEF(processing)
current_run.len--
if(QDELETED(thing))
processing -= thing
- else if(thing.process(wait * 0.1) == PROCESS_KILL)
+ else if(call(thing, process_proc)(wait * 0.1) == PROCESS_KILL) //Fran is REALLY going to kill me
// fully stop so that a future START_PROCESSING will work
STOP_PROCESSING(src, thing)
if (MC_TICK_CHECK)
diff --git a/code/controllers/subsystem/processing/temperature.dm b/code/controllers/subsystem/processing/temperature.dm
new file mode 100644
index 00000000000..772a2086a57
--- /dev/null
+++ b/code/controllers/subsystem/processing/temperature.dm
@@ -0,0 +1,5 @@
+PROCESSING_SUBSYSTEM_DEF(temperature)
+ name = "Temperature"
+ priority = FIRE_PRIORITY_TEMPERATURE
+ wait = 5 SECONDS
+ process_proc = /atom/proc/ProcessAtomTemperature
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index 26a3631b8e0..1e22bff9a18 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -69,8 +69,8 @@ SUBSYSTEM_DEF(zas)
//The variable setting controller
var/datum/zas_controller/settings
- //XGM gas data
- var/datum/xgm_gas_data/gas_data
+ //A reference to the global var
+ var/datum/xgm_gas_data/gas_data = xgm_gas_data
//Geometry lists
var/list/zones = list()
@@ -80,6 +80,7 @@ SUBSYSTEM_DEF(zas)
var/list/networks = list()
var/list/rebuild_queue = list()
var/list/expansion_queue = list()
+ var/list/pipe_init_dirs_cache = list()
//Atmos Machines
var/list/atmos_machinery = list()
@@ -170,13 +171,7 @@ SUBSYSTEM_DEF(zas)
CHECK_TICK
- to_chat(world, span_boldannounce(
- {"Total Simulated Turfs: [simulated_turf_count]
- Total Zones: [zones.len]
- Total Edges: [edges.len]
- Total Active Edges: [active_edges.len ? "[active_edges.len]" : "None"]
- Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]"}
- ))
+ to_chat(world, span_boldannounce("Total Simulated Turfs: [simulated_turf_count]\nTotal Zones: [zones.len]\nTotal Edges: [edges.len]\nTotal Active Edges: [active_edges.len ? "[active_edges.len]" : "None"]\nTotal Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_count]"))
to_chat(world, span_boldannounce("Geometry processing completed in [(REALTIMEOFDAY - starttime)/10] seconds!"))
@@ -293,7 +288,7 @@ SUBSYSTEM_DEF(zas)
curr_hotspot = processing_hotspots
if(current_process == SSZAS_HOTSPOTS)
while (curr_hotspot.len)
- var/obj/fire/F = curr_hotspot[curr_hotspot.len]
+ var/obj/effect/hotspot/F = curr_hotspot[curr_hotspot.len]
curr_hotspot.len--
F.Process()
@@ -372,6 +367,12 @@ SUBSYSTEM_DEF(zas)
new_packet[SSZAS_REBUILD_QUEUE] = list(starting_point)
expansion_queue += list(new_packet)
+/datum/controller/subsystem/zas/proc/remove_from_expansion(datum/pipeline/line)
+ for(var/list/packet in expansion_queue)
+ if(packet[SSZAS_REBUILD_PIPELINE] == line)
+ expansion_queue -= packet
+ return
+
/datum/controller/subsystem/zas/proc/add_zone(zone/z)
zones += z
z.name = "Zone [next_id++]"
diff --git a/code/datums/components/gas_leaker.dm b/code/datums/components/gas_leaker.dm
index b5977d93bd5..f18a8cdd0d8 100644
--- a/code/datums/components/gas_leaker.dm
+++ b/code/datums/components/gas_leaker.dm
@@ -76,9 +76,11 @@
if(current_integrity > master.max_integrity * integrity_leak_percent)
return PROCESS_KILL
var/turf/location = get_turf(master)
+ var/datum/gas_mixture/open_air = location.return_air()
var/true_rate = (1 - (current_integrity / master.max_integrity)) * leak_rate
for(var/datum/gas_mixture/mix as anything in airs)
- mix.mingle_with_turf(get_turf(parent), true_rate)//Not sure this is the best way to do this buuuuuut, ZASSED!
+ mix.leak_to_enviroment(open_air)
+
#undef PROCESS_OBJ
#undef PROCESS_MACHINE
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 8c5ba744de4..6fb8041ed77 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -17,6 +17,9 @@
///First atom flags var
var/flags_1 = NONE
+ ///Second atom flags var
+ var/flags_2 = NONE
+
///Intearaction flags
var/interaction_flags_atom = NONE
diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm
index 1f6e3ecb07d..49695564831 100644
--- a/code/game/machinery/computer/arcade/arcade.dm
+++ b/code/game/machinery/computer/arcade/arcade.dm
@@ -550,7 +550,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
playsound(loc, 'sound/arcade/win.ogg', 50, TRUE)
if(obj_flags & EMAGGED)
- new /obj/effect/spawner/newbomb/plasma(loc, /obj/item/assembly/timer)
+ //new /obj/effect/spawner/newbomb/plasma(loc, /obj/item/assembly/timer)
new /obj/item/clothing/head/collectable/petehat(loc)
message_admins("[ADMIN_LOOKUPFLW(usr)] has outbombed Cuban Pete and been awarded a bomb.")
log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.")
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 80a9ab9b5ba..b4a27778235 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -47,7 +47,7 @@
var/datum/gas_mixture/G = T.air
if(G.get_gas(GAS_PLASMA))
var/plas_amt = min(30, G.get_gas(GAS_PLASMA)) //Absorb some plasma
- G.remove_gas(GAS_PLASMA, plas_amt)
+ G.adjust_gas(GAS_PLASMA, -plas_amt)
absorbed_plasma += plas_amt
if(G.temperature > T20C)
G.temperature = max(G.temperature/2,T20C)
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 75308cce91a..5eb1ba1b59f 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -77,7 +77,7 @@
if(!t_loc)
return
var/list/newsmokes = list()
- for(var/turf/T in t_loc.get_atmos_adjacent_turfs())
+ for(var/turf/T in t_loc.get_adjacent_open_turfs())
var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
if(foundsmoke)
continue
@@ -177,8 +177,8 @@
for(var/obj/effect/hotspot/H in T)
qdel(H)
if(G.get_gas(GAS_PLASMA))
- G.add_gas(GAS_NITROGEN, G.get_gas(GAS_PLASMA))
- G.remove_gas(GAS_PLASMA, G.gas[GAS_PLASMA])
+ G.adjust_gas(GAS_NITROGEN, G.get_gas(GAS_PLASMA))
+ G.adjust_gas(GAS_PLASMA, -G.gas[GAS_PLASMA])
if (weldvents)
for(var/obj/machinery/atmospherics/components/unary/U in T)
if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 505caab018b..91d64c25c76 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -136,7 +136,8 @@ GLOBAL_VAR_INIT(glowshrooms, 0)
/obj/structure/glowshroom/proc/Spread()
var/turf/ownturf = get_turf(src)
- if(!TURF_SHARES(ownturf)) //If we are in a 1x1 room
+ var/list/turf/shares = ownturf.get_adjacent_open_turfs()
+ if(!length(shares)) //If we are in a 1x1 room
return //Deal with it not now
var/list/possible_locs = list()
@@ -146,7 +147,7 @@ GLOBAL_VAR_INIT(glowshrooms, 0)
for(var/turf/open/floor/earth in oview(2,src))
if(is_type_in_typecache(earth, blacklisted_glowshroom_turfs))
continue
- if(!TURF_SHARES(earth))
+ if(!length(earth.get_adjacent_open_turfs()))
continue
possible_locs += earth
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index d32d35ae8dd..d7945bc10a6 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -82,7 +82,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
var/stealthy_audio = FALSE
///How large is the object, used for stuff like whether it can fit in backpacks or not
- var/w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_NORMAL
///This is used to determine on which slots an item can fit.
var/slot_flags = 0
pass_flags = PASSTABLE
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index c1234098dfd..7fb83064e08 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -205,10 +205,7 @@
/*var/list/turfs_sharing_with_prev = previousturf.TryGetNonDenseNeighbour()
if(!(T in turfs_sharing_with_prev))
break*/
- if(igniter)
- igniter.ignite_turf(src,T)
- else
- default_ignite(T)
+ ignite_turf(src,T)
sleep(1)
previousturf = T
operating = FALSE
@@ -217,17 +214,17 @@
attack_self(M)
-/obj/item/flamethrower/proc/default_ignite(turf/target, release_amount = 0.05)
+/obj/item/flamethrower/proc/ignite_turf(turf/target, release_amount = 5)
//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
//Transfer 5% of current tank air contents to turf
- var/datum/gas_mixture/tank_mix = ptank.return_air()
- var/datum/gas_mixture/air_transfer = tank_mix.remove_ratio(release_amount)
-
- if(air_transfer.gases[/datum/gas/plasma])
- air_transfer.gases[/datum/gas/plasma][MOLES] *= 5 //Suffering
+ var/datum/gas_mixture/air_transfer = ptank.return_air().remove_ratio(release_amount)
+ //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE
+ new/obj/effect/decal/cleanable/oil(target,air_transfer.get_by_flag(XGM_GAS_FUEL),get_dir(loc,target))
+ air_transfer.remove_by_flag(XGM_GAS_FUEL, 0)
target.assume_air(air_transfer)
//Burn it based on transfered gas
- target.hotspot_expose((tank_mix.temperature*2) + 380,500)
+ //target.hotspot_expose(part4.air_contents.temperature*2,300)
+ target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500) // -- More of my "how do I shot fire?" dickery. -- TLE
//location.hotspot_expose(1000,500,1)
/obj/item/flamethrower/Initialize(mapload)
@@ -257,7 +254,7 @@
owner.visible_message(span_danger("\The [attack_text] hits the fuel tank on [owner]'s [name], rupturing it! What a shot!"))
var/turf/target_turf = get_turf(owner)
log_game("A projectile ([hitby]) detonated a flamethrower tank held by [key_name(owner)] at [COORD(target_turf)]")
- igniter.ignite_turf(src,target_turf, release_amount = 100)
+ ignite_turf(src,target_turf, release_amount = 100)
qdel(ptank)
return 1 //It hit the flamethrower, not them
@@ -265,15 +262,11 @@
/obj/item/assembly/igniter/proc/flamethrower_process(turf/open/location)
location.hotspot_expose(heat,2)
-/obj/item/assembly/igniter/proc/ignite_turf(obj/item/flamethrower/F,turf/open/location,release_amount = 0.05)
- F.default_ignite(location,release_amount)
-
/obj/item/flamethrower/proc/instant_refill()
SIGNAL_HANDLER
if(ptank)
var/datum/gas_mixture/tank_mix = ptank.return_air()
- tank_mix.assert_gas(/datum/gas/plasma)
- tank_mix.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*ptank.volume/(R_IDEAL_GAS_EQUATION*T20C)
+ tank_mix.gas[GAS_PLASMA] = (10*ONE_ATMOSPHERE)*ptank.volume/(R_IDEAL_GAS_EQUATION*T20C)
else
ptank = new /obj/item/tank/internals/plasma/full(src)
update_appearance()
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index cd9eb15add2..4e3a3eab4ed 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -22,8 +22,7 @@
/obj/item/tank/internals/oxygen/populate_gas()
- air_contents.assert_gas(/datum/gas/oxygen)
- air_contents.gases[/datum/gas/oxygen][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_OXYGEN,(6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/oxygen/yellow
@@ -53,9 +52,8 @@
force = 10
/obj/item/tank/internals/anesthetic/populate_gas()
- air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide)
- air_contents.gases[/datum/gas/oxygen][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ air_contents.adjust_gas(GAS_OXYGEN,(3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD)
+ air_contents.adjust_gas(GAS_NITROGEN, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
/*
* Plasma
@@ -72,8 +70,7 @@
/obj/item/tank/internals/plasma/populate_gas()
- air_contents.assert_gas(/datum/gas/plasma)
- air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_PLASMA, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/flamethrower))
@@ -89,8 +86,7 @@
return ..()
/obj/item/tank/internals/plasma/full/populate_gas()
- air_contents.assert_gas(/datum/gas/plasma)
- air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_PLASMA, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/plasma/empty/populate_gas()
return
@@ -109,12 +105,10 @@
distribute_pressure = TANK_PLASMAMAN_RELEASE_PRESSURE
/obj/item/tank/internals/plasmaman/populate_gas()
- air_contents.assert_gas(/datum/gas/plasma)
- air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_PLASMA, (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/plasmaman/full/populate_gas()
- air_contents.assert_gas(/datum/gas/plasma)
- air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_PLASMA, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/plasmaman/belt
@@ -129,8 +123,7 @@
w_class = WEIGHT_CLASS_SMALL //thanks i forgot this
/obj/item/tank/internals/plasmaman/belt/full/populate_gas()
- air_contents.assert_gas(/datum/gas/plasma)
- air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_PLASMA, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
return
@@ -156,8 +149,7 @@
/obj/item/tank/internals/emergency_oxygen/populate_gas()
- air_contents.assert_gas(/datum/gas/oxygen)
- air_contents.gases[/datum/gas/oxygen][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.adjust_gas(GAS_OXYGEN, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/tank/internals/emergency_oxygen/empty/populate_gas()
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index f2bab55a201..c69e23ee429 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -222,6 +222,7 @@
return air_contents.remove(amount)
/obj/item/tank/return_air()
+ RETURN_TYPE(/datum/gas_mixture)
START_PROCESSING(SSobj, src)
return air_contents
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 288ec91c7c3..5742bd4febb 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -30,6 +30,9 @@
vis_flags = VIS_INHERIT_PLANE //when this be added to vis_contents of something it inherit something.plane, important for visualisation of obj in openspace.
+ ///How large is the object, used for stuff like whether it can fit in backpacks or not
+ var/w_class = null
+
/// Map tag for something. Tired of it being used on snowflake items. Moved here for some semblance of a standard.
/// Next pr after the network fix will have me refactor door interactions, so help me god.
var/id_tag = null
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 6a787119060..3fa1b100076 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -331,8 +331,9 @@
/obj/structure/window/Move()
var/turf/T = loc
. = ..()
+ /*
if(anchored)
- move_update_air(T)
+ move_update_air(T)*/
/obj/structure/window/can_atmos_pass(turf/T, vertical = FALSE)
if(!anchored || !density)
diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm
index d1f535cb0f6..67f0f737e03 100644
--- a/code/modules/admin/verbs/fix_air.dm
+++ b/code/modules/admin/verbs/fix_air.dm
@@ -1,21 +1,50 @@
-// Proc taken from yogstation, credit to nichlas0010 for the original
-/client/proc/fix_air(turf/open/T in world)
- set name = "Fix Air"
- set category = "Admin.Game"
- set desc = "Fixes air in specified radius."
-
- if(!holder)
- to_chat(src, "Only administrators may use this command.", confidential = TRUE)
+//Lifted 1:1 from Baystation
+/client/proc/fixatmos()
+ set category = "Admin"
+ set name = "Fix Atmospherics Grief"
+
+ if(!check_rights(R_ADMIN|R_DEBUG)) return
+
+ if(alert("WARNING: Executing this command will perform a full reset of atmosphere. All pipelines will lose any gas that may be in them, and all zones will be reset to contain air mix as on roundstart. The supermatter engine will also be stopped (to prevent overheat due to removal of coolant). Do not use unless the map is suffering serious atmospheric issues due to grief or bug.", "Full Atmosphere Reboot", "No", "Yes") == "No")
return
- if(check_rights(R_ADMIN,1))
- var/range=input("Enter range:","Num",2) as num
- message_admins("[key_name_admin(usr)] fixed air with range [range] in area [T.loc.name]")
- log_game("[key_name_admin(usr)] fixed air with range [range] in area [T.loc.name]")
- var/datum/gas_mixture/GM = new
- for(var/turf/open/F in range(range,T))
- if(F.blocks_air)
- //skip walls
- continue
- GM.parse_gas_string(F.initial_gas_mix)
- F.copy_air(GM)
- F.update_visuals()
+
+ log_admin("Full atmosphere reset initiated by [usr].")
+ to_world("Initiating restart of atmosphere. The server may lag a bit.")
+ sleep(10)
+ var/current_time = world.timeofday
+
+ // Depower the supermatter, as it would quickly blow up once we remove all gases from the pipes.
+ for(var/obj/machinery/power/supermatter/S in SSmachines.machinery)
+ S.power = 0
+ to_chat(usr, "\[1/5\] - Supermatter depowered")
+
+ // Remove all gases from all pipenets
+ for(var/net in SSmachines.pipenets)
+ var/datum/pipe_network/PN = net
+ for(var/datum/gas_mixture/G in PN.gases)
+ G.gas = list()
+ G.update_values()
+
+ to_chat(usr, "\[2/5\] - All pipenets purged of gas.")
+
+ // Delete all zones.
+ for(var/zone/Z in world)
+ Z.c_invalidate()
+
+ to_chat(usr, "\[3/5\] - All ZAS Zones removed.")
+
+ var/list/unsorted_overlays = list()
+ for(var/id in gas_data.tile_overlay)
+ unsorted_overlays |= gas_data.tile_overlay[id]
+
+ for(var/turf/simulated/T in world)
+ T.air = null
+ T.overlays.Remove(unsorted_overlays)
+ T.zone = null
+
+ to_chat(usr, "\[4/5\] - All turfs reset to roundstart values.")
+
+ SSair.reboot()
+
+ to_chat(usr, "\[5/5\] - ZAS Rebooted")
+ to_world("Atmosphere restart completed in [(world.timeofday - current_time)/10] seconds.")
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index d033f862b88..2c01006f9d0 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -151,10 +151,8 @@
START_PROCESSING(SSobj, src)
var/datum/gas_mixture/our_mix = return_air()
- our_mix.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
- var/fuel_moles = our_mix.gases[/datum/gas/plasma][MOLES] + our_mix.gases[/datum/gas/oxygen][MOLES]/6
- our_mix.garbage_collect()
- var/datum/gas_mixture/bomb_mixture = our_mix.copy()
+ var/fuel_moles = our_mix.get_gas(GAS_PLASMA) + our_mix.get_gas(GAS_OXYGEN)/6
+ var/datum/gas_mixture/bomb_mixture = our_mix.copy_from()
var/strength = 1
var/turf/ground_zero = get_turf(loc)
diff --git a/code/modules/atmospherics/ZAS/Airflow.dm b/code/modules/atmospherics/ZAS/Airflow.dm
index 35fb5c34620..06ea7684d26 100644
--- a/code/modules/atmospherics/ZAS/Airflow.dm
+++ b/code/modules/atmospherics/ZAS/Airflow.dm
@@ -131,7 +131,6 @@ Contains helper procs for airflow, handled in /connection_group.
for(var/mob/M in hearers(src))
M.show_message("\The [src] slams into \a [A]!",1,"You hear a loud slam!",2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
- var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(1,5) //Heheheh
. = ..()
/mob/living/airflow_hit(atom/A)
@@ -154,7 +153,7 @@ Contains helper procs for airflow, handled in /connection_group.
M.show_message("[src] slams into [A]!",1,"You hear a loud slam!",2)
playsound(src.loc, "punch", 25, 1, -1)
if (prob(33))
- var/obj/effect/decal/cleanable/blood/new_splatter = new(loc)
+ loc.add_blood_DNA(return_blood_DNA())
var/b_loss = min(airflow_speed, (airborne_acceleration*2)) * SSzas.settings.airflow_damage
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
index 5f539ba0d12..409646fcbd3 100644
--- a/code/modules/atmospherics/ZAS/Fire.dm
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -8,7 +8,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//#define FIREDBG
-/turf/var/obj/fire/fire = null
+/turf/var/obj/effect/hotspot/fire = null
//Some legacy definitions so fires can be started.
/atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -26,14 +26,14 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh)
if(fire_protection > world.time-300)
return 0
- if(locate(/obj/fire) in src)
+ if(locate(/obj/effect/hotspot) in src)
return 1
var/datum/gas_mixture/air_contents = return_air()
if(!air_contents || exposed_temperature < PHORON_MINIMUM_BURN_TEMPERATURE)
return 0
var/igniting = 0
- var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in src
+ var/obj/effect/decal/cleanable/oil/liquid = locate() in src
if(air_contents.check_combustability(liquid))
igniting = 1
@@ -53,7 +53,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
if(T.fire)
T.fire.firelevel = firelevel
else
- var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
+ var/obj/effect/decal/cleanable/oil/fuel = locate() in T
fire_tiles -= T
fuel_objs -= fuel
else
@@ -76,13 +76,13 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
var/fuel_to_remove = used_liquid_fuel/(fuel_objs.len*LIQUIDFUEL_AMOUNT_TO_MOL) //convert back to liquid volume units
for(var/O in fuel_objs)
- var/obj/effect/decal/cleanable/liquid_fuel/fuel = O
+ var/obj/effect/decal/cleanable/oil/fuel = O
if(!istype(fuel))
fuel_objs -= fuel
continue
- fuel.amount -= fuel_to_remove
- if(fuel.amount <= 0)
+ fuel.reagent_amount -= fuel_to_remove
+ if(fuel.reagent_amount <= 0)
fuel_objs -= fuel
if(remove_fire)
var/turf/T = fuel.loc
@@ -93,10 +93,6 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
return 0
/turf/simulated/create_fire(fl)
-
- if(submerged())
- return 1
-
if(fire)
fire.firelevel = max(fl, fire.firelevel)
return 1
@@ -107,32 +103,32 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
fire = new(src, fl)
SSzas.active_fire_zones |= zone
- var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in src
+ var/obj/effect/decal/cleanable/oil/fuel = locate() in src
zone.fire_tiles |= src
if(fuel) zone.fuel_objs += fuel
return 0
-/obj/fire
- //Icon for fire on turfs.
-
+/obj/effect/hotspot
anchored = TRUE
- mouse_opacity = 0
-
- blend_mode = BLEND_ADD
-
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'icons/effects/fire.dmi'
icon_state = "1"
- light_color = "#ed9200"
- layer = FIRE_LAYER
+ layer = GASFIRE_LAYER
+ plane = ABOVE_GAME_PLANE
+ blend_mode = BLEND_ADD
+ light_system = MOVABLE_LIGHT
+ light_range = LIGHT_RANGE_FIRE
+ light_power = 1
+ light_color = LIGHT_COLOR_FIRE
var/firelevel = 1 //Calculated by gas_mixture.calculate_firelevel()
-/obj/fire/Process()
+/obj/effect/hotspot/Process()
. = 1
var/turf/simulated/my_tile = loc
- if(!istype(my_tile) || !my_tile.zone || my_tile.submerged())
+ if(!istype(my_tile) || !my_tile.zone)
if(my_tile && my_tile.fire == src)
my_tile.fire = null
qdel(src)
@@ -168,7 +164,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//if(!enemy_tile.zone.fire_tiles.len) TODO - optimize
var/datum/gas_mixture/acs = enemy_tile.return_air()
- var/obj/effect/decal/cleanable/liquid_fuel/liquid = locate() in enemy_tile
+ var/obj/effect/decal/cleanable/oil/liquid = locate() in enemy_tile
if(!acs || !acs.check_combustability(liquid))
continue
@@ -188,14 +184,14 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
animate(src, color = fire_color(air_contents.temperature), 5)
set_light(l_color = color)
-/obj/fire/New(newLoc,fl)
+/obj/effect/hotspot/New(newLoc,fl)
..()
if(!istype(loc, /turf))
qdel(src)
return
- setDir(pick(GLOB.cardinal))
+ setDir(pick(GLOB.cardinals))
var/datum/gas_mixture/air_contents = loc.return_air()
color = fire_color(air_contents.temperature)
@@ -204,11 +200,11 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
firelevel = fl
SSzas.active_hotspots.Add(src)
-/obj/fire/proc/fire_color(var/env_temperature)
+/obj/effect/hotspot/proc/fire_color(var/env_temperature)
var/temperature = max(4000*sqrt(firelevel/SSzas.settings.fire_firelevel_multiplier), env_temperature)
return heat2color(temperature)
-/obj/fire/Destroy()
+/obj/effect/hotspot/Destroy()
var/turf/T = loc
if (istype(T))
set_light(0)
@@ -238,9 +234,9 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//*** Get the fuel and oxidizer amounts
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & XGM_GAS_FUEL)
+ if(xgm_gas_data.flags[g] & XGM_GAS_FUEL)
gas_fuel += gas[g]
- if(SSzas.gas_data.flags[g] & XGM_GAS_OXIDIZER)
+ if(xgm_gas_data.flags[g] & XGM_GAS_OXIDIZER)
total_oxidizers += gas[g]
gas_fuel *= group_multiplier
total_oxidizers *= group_multiplier
@@ -248,8 +244,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//Liquid Fuel
var/fuel_area = 0
if(zone)
- for(var/obj/effect/decal/cleanable/liquid_fuel/fuel in zone.fuel_objs)
- liquid_fuel += fuel.amount*LIQUIDFUEL_AMOUNT_TO_MOL
+ for(var/obj/effect/decal/cleanable/oil/fuel in zone.fuel_objs)
+ liquid_fuel += fuel.reagent_amount*LIQUIDFUEL_AMOUNT_TO_MOL
fuel_area++
total_fuel = gas_fuel + liquid_fuel
@@ -306,7 +302,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
remove_by_flag(XGM_GAS_OXIDIZER, used_oxidizers)
var/datum/gas_mixture/burned_fuel = remove_by_flag(XGM_GAS_FUEL, used_gas_fuel)
for(var/g in burned_fuel.gas)
- adjust_gas(SSzas.gas_data.burn_product[g], burned_fuel.gas[g])
+ adjust_gas(xgm_gas_data.burn_product[g], burned_fuel.gas[g])
if(zone)
zone.remove_liquidfuel(used_liquid_fuel, !check_combustability())
@@ -328,7 +324,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
. = 0
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & XGM_GAS_OXIDIZER && gas[g] >= 0.1)
+ if(xgm_gas_data.flags[g] & XGM_GAS_OXIDIZER && gas[g] >= 0.1)
. = 1
break
@@ -340,14 +336,14 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
. = 0
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & XGM_GAS_FUEL && gas[g] >= 0.1)
+ if(xgm_gas_data.flags[g] & XGM_GAS_FUEL && gas[g] >= 0.1)
. = 1
break
-/datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/liquid_fuel/liquid=null)
+/datum/gas_mixture/proc/check_combustability(obj/effect/decal/cleanable/oil/liquid)
. = 0
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * SSzas.settings.fire_consuption_rate) >= 0.1)
+ if(xgm_gas_data.flags[g] & XGM_GAS_OXIDIZER && QUANTIZE(gas[g] * SSzas.settings.fire_consuption_rate) >= 0.1)
. = 1
break
@@ -359,7 +355,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
. = 0
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * SSzas.settings.fire_consuption_rate) >= 0.1)
+ if(xgm_gas_data.flags[g] & XGM_GAS_FUEL && QUANTIZE(gas[g] * SSzas.settings.fire_consuption_rate) >= 0.1)
. = 1
break
@@ -417,6 +413,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
head_exposure = 0
if(C.body_parts_covered & CHEST)
chest_exposure = 0
+ if(C.body_parts_covered & GROIN)
+ groin_exposure = 0
if(C.body_parts_covered & LEGS)
legs_exposure = 0
if(C.body_parts_covered & ARMS)
@@ -426,12 +424,30 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//Always check these damage procs first if fire damage isn't working. They're probably what's wrong.
- apply_damage(0.9*mx*head_exposure, BURN, BODY_ZONE_HEAD, used_weapon = "Fire")
- apply_damage(2.5*mx*chest_exposure, BURN, BODY_ZONE_CHEST, used_weapon = "Fire")
- apply_damage(0.6*mx*legs_exposure, BURN, BODY_ZONE_L_LEG, used_weapon = "Fire")
- apply_damage(0.6*mx*legs_exposure, BURN, BODY_ZONE_R_LEG, used_weapon = "Fire")
- apply_damage(0.4*mx*arms_exposure, BURN, BODY_ZONE_L_ARM, used_weapon = "Fire")
- apply_damage(0.4*mx*arms_exposure, BURN, BODY_ZONE_R_ARM, used_weapon = "Fire")
+ apply_damage(0.9*mx*head_exposure, BURN, BODY_ZONE_HEAD)
+ apply_damage(2.5*mx*chest_exposure, BURN, BODY_ZONE_CHEST)
+ apply_damage(2,0*mx*groin_exposure, BURN, BODY_ZONE_PRECISE_GROIN)
+ apply_damage(0.6*mx*legs_exposure, BURN, BODY_ZONE_L_LEG)
+ apply_damage(0.6*mx*legs_exposure, BURN, BODY_ZONE_R_LEG)
+ apply_damage(0.4*mx*arms_exposure, BURN, BODY_ZONE_L_ARM)
+ apply_damage(0.4*mx*arms_exposure, BURN, BODY_ZONE_R_ARM)
//return a truthy value of whether burning actually happened
return mx * (head_exposure + chest_exposure + groin_exposure + legs_exposure + arms_exposure)
+
+/turf/proc/adjacent_fire_act(turf/simulated/floor/source, exposed_temperature, exposed_volume)
+ return
+
+/turf/simulated/floor/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
+ var/dir_to = get_dir(src, adj_turf)
+
+ for(var/obj/structure/window/W in src)
+ if(W.dir == dir_to || W.fulltile) //Same direction or diagonal (full tile)
+ W.fire_act(adj_air, adj_temp, adj_volume)
+
+/*/turf/simulated/wall/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
+ burn(adj_temp)
+ if(adj_temp > material.melting_point)
+ take_damage(log(Frand(0.9, 1.1) * (adj_temp - material.melting_point)), BURN)
+
+ return ..()*/
diff --git a/code/modules/atmospherics/ZAS/Plasma.dm b/code/modules/atmospherics/ZAS/Plasma.dm
index a12977966c0..c8eab424a31 100644
--- a/code/modules/atmospherics/ZAS/Plasma.dm
+++ b/code/modules/atmospherics/ZAS/Plasma.dm
@@ -51,12 +51,12 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat
/obj/item/contaminate()
//Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
- if(!(flags_1 & CONTAMINATED_1))
- flags_1 |= CONTAMINATED_1
+ if(!(flags_2 & CONTAMINATED_2))
+ flags_2 |= CONTAMINATED_2
add_overlay(GLOB.contamination_overlay)
/obj/item/decontaminate()
- flags_1 ~= CONTAMINATED_1
+ flags_2 ~= CONTAMINATED_2
cut_overlay(GLOB.contamination_overlay)
@@ -171,6 +171,6 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat
if(!env)
return
for(var/g in env.gas)
- if(SSzas.gas_data.flags[g] & XGM_GAS_CONTAMINANT && env.gas[g] > SSzas.gas_data.overlay_limit[g] + 1)
+ if(xgm_gas_data.flags[g] & XGM_GAS_CONTAMINANT && env.gas[g] > xgm_gas_data.overlay_limit[g] + 1)
I.contaminate()
break
diff --git a/code/modules/atmospherics/ZAS/Temperature.dm b/code/modules/atmospherics/ZAS/Temperature.dm
new file mode 100644
index 00000000000..6aa01691ad6
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/Temperature.dm
@@ -0,0 +1,58 @@
+#define MIN_TEMPERATURE_COEFFICIENT 1
+#define MAX_TEMPERATURE_COEFFICIENT 10
+
+/atom/var/temperature = T20C
+/atom/var/temperature_coefficient = MAX_TEMPERATURE_COEFFICIENT
+
+/atom/movable/Entered(var/atom/movable/atom, var/atom/old_loc)
+ . = ..()
+ QUEUE_TEMPERATURE_ATOMS(atom)
+
+/obj/temperature_coefficient = null
+
+/mob/temperature_coefficient = null
+
+/turf/temperature_coefficient = MIN_TEMPERATURE_COEFFICIENT
+
+/obj/Initialize()
+ . = ..()
+ temperature_coefficient = isnull(temperature_coefficient) ? clamp(MAX_TEMPERATURE_COEFFICIENT - w_class, MIN_TEMPERATURE_COEFFICIENT, MAX_TEMPERATURE_COEFFICIENT) : temperature_coefficient
+
+/obj/proc/HandleObjectHeating(var/obj/item/heated_by, var/mob/user, var/adjust_temp)
+ if(ATOM_IS_TEMPERATURE_SENSITIVE(src))
+ visible_message(span_notice("\The [user] carefully heats \the [src] with \the [heated_by]."))
+ var/diff_temp = (adjust_temp - temperature)
+ if(diff_temp >= 0)
+ var/altered_temp = max(temperature + (ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT * temperature_coefficient * diff_temp), 0)
+ ADJUST_ATOM_TEMPERATURE(src, min(adjust_temp, altered_temp))
+
+/mob/living/Initialize()
+ . = ..()
+ temperature_coefficient = isnull(temperature_coefficient) ? clamp(MAX_TEMPERATURE_COEFFICIENT - FLOOR(mob_size/4, 1), MIN_TEMPERATURE_COEFFICIENT, MAX_TEMPERATURE_COEFFICIENT) : temperature_coefficient
+
+/atom/proc/ProcessAtomTemperature()
+ // Get our location temperature if possible.
+ // Nullspace is room temperature, clearly.
+ var/adjust_temp
+ if(loc)
+ if(!istype(loc, /turf/simulated))
+ adjust_temp = loc.temperature
+ else
+ var/turf/simulated/T = loc
+ if(T.zone && T.zone.air)
+ adjust_temp = T.zone.air.temperature
+ else
+ adjust_temp = T20C
+ else
+ adjust_temp = T20C
+
+ var/diff_temp = adjust_temp - temperature
+ if(abs(diff_temp) >= ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD)
+ var/altered_temp = max(temperature + (ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT * temperature_coefficient * diff_temp), 0)
+ ADJUST_ATOM_TEMPERATURE(src, (diff_temp > 0) ? min(adjust_temp, altered_temp) : max(adjust_temp, altered_temp))
+ else
+ temperature = adjust_temp
+ return PROCESS_KILL
+
+#undef MIN_TEMPERATURE_COEFFICIENT
+#undef MAX_TEMPERATURE_COEFFICIENT
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index a1229d928c8..5ae5dade602 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -301,8 +301,10 @@
/turf/simulated/atmos_spawn_air(gas_id, amount, initial_temperature)
var/datum/gas_mixture/new_gas = new
var/datum/gas_mixture/existing_gas = return_air()
-
- new_gas.adjust_gas_temp(gas_id, amount, initial_temperature)
+ if(isnull(initial_temperature))
+ new_gas.adjust_gas(gas_id, amount)
+ else
+ new_gas.adjust_gas_temp(gas_id, amount, initial_temperature)
existing_gas.merge(new_gas)
/proc/turf_contains_dense_objects(var/turf/T)
@@ -312,7 +314,7 @@
if(density)
return 1
for(var/atom/movable/A as anything in src)
- if(A.density && !(A.atom_flags & ON_BORDER_1))
+ if(A.density && !(A.flags_1 & ON_BORDER_1))
return 1
return 0
diff --git a/code/modules/atmospherics/ZAS/XGM/gas_data.dm b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
index 508cec715f6..0906a8623b8 100644
--- a/code/modules/atmospherics/ZAS/XGM/gas_data.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
@@ -1,3 +1,4 @@
+GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data)
/datum/xgm_gas_data
//Simple list of all the gas IDs.
var/list/gases = list()
@@ -49,33 +50,33 @@
var/symbol_html = "X"
var/symbol = "X"
-/datum/xgm_gas_data/Initialize()
+/datum/xgm_gas_data/New()
for(var/p in subtypesof(/datum/xgm_gas))
var/datum/xgm_gas/gas = new p //avoid initial() because of potential New() actions
- if(gas.id in SSzas.gas_data.gases)
+ if(gas.id in xgm_gas_data.gases)
stack_trace("Duplicate gas id `[gas.id]` in `[p]`")
- SSzas.gas_data.gases += gas.id
- SSzas.gas_data.name[gas.id] = gas.name
- SSzas.gas_data.specific_heat[gas.id] = gas.specific_heat
- SSzas.gas_data.molar_mass[gas.id] = gas.molar_mass
+ xgm_gas_data.gases += gas.id
+ xgm_gas_data.name[gas.id] = gas.name
+ xgm_gas_data.specific_heat[gas.id] = gas.specific_heat
+ xgm_gas_data.molar_mass[gas.id] = gas.molar_mass
if(gas.overlay_limit)
- SSzas.gas_data.overlay_limit[gas.id] = gas.overlay_limit
- SSzas.gas_data.tile_overlay[gas.id] = gas.tile_overlay
- SSzas.gas_data.tile_overlay_color[gas.id] = gas.tile_color
- SSzas.gas_data.flags[gas.id] = gas.flags
- SSzas.gas_data.burn_product[gas.id] = gas.burn_product
+ xgm_gas_data.overlay_limit[gas.id] = gas.overlay_limit
+ xgm_gas_data.tile_overlay[gas.id] = gas.tile_overlay
+ xgm_gas_data.tile_overlay_color[gas.id] = gas.tile_color
+ xgm_gas_data.flags[gas.id] = gas.flags
+ xgm_gas_data.burn_product[gas.id] = gas.burn_product
- SSzas.gas_data.symbol_html[gas.id] = gas.symbol_html
- SSzas.gas_data.symbol[gas.id] = gas.symbol
+ xgm_gas_data.symbol_html[gas.id] = gas.symbol_html
+ xgm_gas_data.symbol[gas.id] = gas.symbol
if(!isnull(gas.condensation_product) && !isnull(gas.condensation_point))
- SSzas.gas_data.condensation_points[gas.id] = gas.condensation_point
- SSzas.gas_data.condensation_products[gas.id] = gas.condensation_product
+ xgm_gas_data.condensation_points[gas.id] = gas.condensation_point
+ xgm_gas_data.condensation_products[gas.id] = gas.condensation_product
- SSzas.gas_data.breathed_product[gas.id] = gas.breathed_product
- SSzas.gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
+ xgm_gas_data.breathed_product[gas.id] = gas.breathed_product
+ xgm_gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
return 1
@@ -98,6 +99,13 @@
/obj/effect/gas_overlay/Initialize(mapload, gas)
. = ..()
gas_id = gas
- if(SSzas.gas_data.tile_overlay[gas_id])
- icon_state = SSzas.gas_data.tile_overlay[gas_id]
- color = SSzas.gas_data.tile_overlay_color[gas_id]
+ if(xgm_gas_data.tile_overlay[gas_id])
+ icon_state = xgm_gas_data.tile_overlay[gas_id]
+ color = xgm_gas_data.tile_overlay_color[gas_id]
+
+/proc/typecache_of_gases_with_no_overlays()
+ . = list()
+ for (var/gastype in subtypesof(/datum/xgm_gas))
+ var/datum/xgm_gas/gasvar = gastype
+ if (!initial(gasvar.tile_overlay))
+ .[gastype] = TRUE
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
index 331194c445c..8dc8599de41 100644
--- a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
@@ -51,7 +51,7 @@
if(moles > 0 && abs(temperature - temp) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
var/self_heat_capacity = heat_capacity()
- var/giver_heat_capacity = SSzas.gas_data.specific_heat[gasid] * moles
+ var/giver_heat_capacity = xgm_gas_data.specific_heat[gasid] * moles
var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity
if(combined_heat_capacity != 0)
temperature = (temp * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity
@@ -137,7 +137,7 @@
/datum/gas_mixture/proc/heat_capacity()
. = 0
for(var/g in gas)
- . += SSzas.gas_data.specific_heat[g] * gas[g]
+ . += xgm_gas_data.specific_heat[g] * gas[g]
. *= group_multiplier
@@ -192,8 +192,8 @@
return SPECIFIC_ENTROPY_VACUUM //that gas isn't here
//group_multiplier gets divided out in volume/gas[gasid] - also, V/(m*T) = R/(partial pressure)
- var/molar_mass = SSzas.gas_data.molar_mass[gasid]
- var/specific_heat = SSzas.gas_data.specific_heat[gasid]
+ var/molar_mass = xgm_gas_data.molar_mass[gasid]
+ var/specific_heat = xgm_gas_data.specific_heat[gasid]
var/safe_temp = max(temperature, TCMB) // We're about to divide by this.
return R_IDEAL_GAS_EQUATION * ( log( (IDEAL_GAS_ENTROPY_CONSTANT*volume/(gas[gasid] * safe_temp)) * (molar_mass*specific_heat*safe_temp)**(2/3) + 1 ) + 15 )
@@ -221,6 +221,8 @@
//Removes moles from the gas mixture and returns a gas_mixture containing the removed air.
/datum/gas_mixture/proc/remove(amount)
+ RETURN_TYPE(/datum/gas_mixture)
+
amount = min(amount, total_moles * group_multiplier) //Can not take more air than the gas mixture has!
if(amount <= 0)
return null
@@ -275,11 +277,11 @@
var/sum = 0
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & flag)
+ if(xgm_gas_data.flags[g] & flag)
sum += gas[g]
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & flag)
+ if(xgm_gas_data.flags[g] & flag)
removed.gas[g] = QUANTIZE((gas[g] / sum) * amount)
gas[g] -= removed.gas[g] / group_multiplier
@@ -293,7 +295,7 @@
/datum/gas_mixture/proc/get_by_flag(flag)
. = 0
for(var/g in gas)
- if(SSzas.gas_data.flags[g] & flag)
+ if(xgm_gas_data.flags[g] & flag)
. += gas[g]
//Copies gas and temperature from another gas_mixture.
@@ -347,11 +349,11 @@
//Two lists can be passed by reference if you need know specifically which graphics were added and removed.
/datum/gas_mixture/proc/check_tile_graphic(list/graphic_add = null, list/graphic_remove = null)
for(var/obj/effect/gas_overlay/O in graphic)
- if(gas[O.gas_id] <= SSzas.gas_data.overlay_limit[O.gas_id])
+ if(gas[O.gas_id] <= xgm_gas_data.overlay_limit[O.gas_id])
LAZYADD(graphic_remove, O)
- for(var/g in SSzas.gas_data.overlay_limit)
+ for(var/g in xgm_gas_data.overlay_limit)
//Overlay isn't applied for this gas, check if it's valid and needs to be added.
- if(gas[g] > SSzas.gas_data.overlay_limit[g])
+ if(gas[g] > xgm_gas_data.overlay_limit[g])
var/tile_overlay = get_tile_overlay(g)
if(!(tile_overlay in graphic))
LAZYADD(graphic_add, tile_overlay)
@@ -463,49 +465,9 @@
/datum/gas_mixture/proc/share_space(datum/gas_mixture/unsim_air)
return share_ratio(unsim_air, unsim_air.group_multiplier, max(1, max(group_multiplier + 3, 1) + unsim_air.group_multiplier), one_way = 1)
-//Equalizes a list of gas mixtures. Used for pipe networks.
-/proc/equalize_gases(list/datum/gas_mixture/gases)
- //Calculate totals from individual components
- var/total_volume = 0
- var/total_thermal_energy = 0
- var/total_heat_capacity = 0
-
- var/list/total_gas = list()
- for(var/datum/gas_mixture/gasmix in gases)
- total_volume += gasmix.volume
- var/temp_heatcap = gasmix.heat_capacity()
- total_thermal_energy += gasmix.temperature * temp_heatcap
- total_heat_capacity += temp_heatcap
- for(var/g in gasmix.gas)
- total_gas[g] += gasmix.gas[g]
-
- if(total_volume > 0)
- var/datum/gas_mixture/combined = new(total_volume)
- combined.gas = total_gas
-
- //Calculate temperature
- if(total_heat_capacity > 0)
- combined.temperature = total_thermal_energy / total_heat_capacity
- combined.update_values()
-
- //Allow for reactions
- combined.react()
-
- //Average out the gases
- for(var/g in combined.gas)
- combined.gas[g] /= total_volume
-
- //Update individual gas_mixtures
- for(var/datum/gas_mixture/gasmix in gases)
- gasmix.gas = combined.gas.Copy()
- gasmix.temperature = combined.temperature
- gasmix.multiply(gasmix.volume)
-
- return 1
-
/datum/gas_mixture/proc/get_mass()
for(var/g in gas)
- . += gas[g] * SSzas.gas_data.molar_mass[g] * group_multiplier
+ . += gas[g] * xgm_gas_data.molar_mass[g] * group_multiplier
/datum/gas_mixture/proc/specific_mass()
var/M = get_total_moles()
@@ -526,28 +488,10 @@
var/amt = get_gas(gas_id)
return (amt >= required_amount)
-///THIS PROBABLY WILL NOT BE USED BUUUUT-
-/datum/gas_mixture/proc/mingle_with_turf(turf/simulated/target, mingle_volume)
- var/datum/gas_mixture/air_sample = remove_ratio(mingle_volume/volume)
- air_sample.volume = mingle_volume
-
- if(istype(target) && target.zone)
- //Have to consider preservation of group statuses
- var/datum/gas_mixture/turf_copy = new
-
- turf_copy.copy_from(target.zone.air)
- turf_copy.volume = target.zone.air.volume //Copy a good representation of the turf from parent group
-
- equalize_gases(list(air_sample, turf_copy))
- merge(air_sample)
-
- turf_copy.subtract(target.zone.air)
-
- target.zone.air.merge(turf_copy)
-
- else
- var/datum/gas_mixture/turf_air = target.return_air()
+/datum/gas_mixture/proc/get_gases()
+ RETURN_TYPE(/list)
+ update_values()
+ return gas
- equalize_gases(list(air_sample, turf_air))
- merge(air_sample)
- //turf_air already modified by equalize_gases()
+/datum/gas_mixture/proc/leak_to_enviroment(datum/gas_mixture/environment)
+ pump_gas_passive(src, environment, calculate_transfer_moles(src, environment, src.return_pressure() - environment.return_pressure()))
diff --git a/code/modules/atmospherics/ZAS/Zone.dm b/code/modules/atmospherics/ZAS/Zone.dm
index 9d20a386d9e..a46df8e036a 100644
--- a/code/modules/atmospherics/ZAS/Zone.dm
+++ b/code/modules/atmospherics/ZAS/Zone.dm
@@ -71,7 +71,7 @@ Class Procs:
T.zone = src
contents.Add(T)
if(T.fire)
- var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
+ var/obj/effect/decal/cleanable/oil/fuel = locate() in T
fire_tiles.Add(T)
SSzas.active_fire_zones |= src
if(fuel) fuel_objs += fuel
@@ -87,7 +87,7 @@ Class Procs:
contents.Remove(T)
fire_tiles.Remove(T)
if(T.fire)
- var/obj/effect/decal/cleanable/liquid_fuel/fuel = locate() in T
+ var/obj/effect/decal/cleanable/oil/fuel = locate() in T
fuel_objs -= fuel
T.zone = null
T.update_graphic(graphic_remove = air.graphic)
@@ -164,9 +164,10 @@ Class Procs:
E.recheck()
// Handle condensation from the air.
+ /*
for(var/g in air.gas)
- var/product = SSzas.gas_data.condensation_products[g]
- if(product && air.temperature <= SSzas.gas_data.condensation_points[g])
+ var/product = xgm_gas_data.condensation_products[g]
+ if(product && air.temperature <= xgm_gas_data.condensation_points[g])
var/condensation_area = air.group_multiplier
while(condensation_area > 0)
condensation_area--
@@ -176,6 +177,7 @@ Class Procs:
break
air.adjust_gas(g, -condense_amt)
flooding.add_fluid(condense_amt, product)
+ */
// Update atom temperature.
if(abs(air.temperature - last_air_temperature) >= ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD)
@@ -190,12 +192,11 @@ Class Procs:
/zone/proc/dbg_data(mob/M)
to_chat(M, name)
for(var/g in air.gas)
- to_chat(M, "[SSzas.gas_data.name[g]]: [air.gas[g]]")
+ to_chat(M, "[xgm_gas_data.name[g]]: [air.gas[g]]")
to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)")
to_chat(M, "O2 per N2: [(air.gas[GAS_NITROGEN] ? air.gas[GAS_OXYGEN]/air.gas[GAS_NITROGEN] : "N/A")] Moles: [air.total_moles]")
to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])")
-// to_chat(M, "Unsimulated: [unsimulated_contents.len]")
-// to_chat(M, "Edges: [edges.len]")
+ to_chat(M, "Edges: [edges.len]")
if(invalid) to_chat(M, "Invalid!")
var/zone_edges = 0
var/space_edges = 0
diff --git a/code/modules/atmospherics/ZAS/atmos_primitives.dm b/code/modules/atmospherics/ZAS/atmos_primitives.dm
new file mode 100644
index 00000000000..a56ff737f08
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/atmos_primitives.dm
@@ -0,0 +1,537 @@
+/*
+ Atmos processes
+
+ These procs generalize various processes used by atmos machinery, such as pumping, filtering, or scrubbing gas, allowing them to be reused elsewhere.
+ If no gas was moved/pumped/filtered/whatever, they return a negative number.
+ Otherwise they return the amount of energy needed to do whatever it is they do (equivalently power if done over 1 second).
+ In the case of free-flowing gas you can do things with gas and still use 0 power, hence the distinction between negative and non-negative return values.
+*/
+
+/*
+/obj/machinery/atmospherics/var/last_flow_rate = 0
+/obj/machinery/atmospherics/var/last_power_draw = 0
+/obj/machinery/portable_atmospherics/var/last_flow_rate = 0
+
+*/
+
+// These balance how easy or hard it is to create huge pressure gradients with pumps and filters.
+// Lower values means it takes longer to create large pressures differences.
+// Has no effect on pumping gasses from high pressure to low, only from low to high.
+#define ATMOS_PUMP_EFFICIENCY 2.5
+#define ATMOS_FILTER_EFFICIENCY 2.5
+
+// Will not bother pumping or filtering if the gas source as fewer than this amount of moles, to help with performance.
+#define MINIMUM_MOLES_TO_PUMP 0.01
+#define MINIMUM_MOLES_TO_FILTER 0.04
+
+
+/obj/machinery/atmospherics/var/debug = 0
+
+/client/proc/atmos_toggle_debug(var/obj/machinery/atmospherics/M in world)
+ set name = "Toggle Debug Messages"
+ set category = "Debug"
+ M.debug = !M.debug
+ to_chat(usr, "[M]: Debug messages toggled [M.debug? "on" : "off"].")
+
+//Generalized gas pumping proc.
+//Moves gas from one gas_mixture to another and returns the amount of power needed (assuming 1 second), or -1 if no gas was pumped.
+//transfer_moles - Limits the amount of moles to transfer. The actual amount of gas moved may also be limited by available_power, if given.
+//available_power - the maximum amount of power that may be used when moving gas. If null then the transfer is not limited by power.
+/proc/pump_gas(var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles = null, var/available_power = null)
+ if (source.total_moles < MINIMUM_MOLES_TO_PUMP) //if we can't transfer enough gas just stop to avoid further processing
+ return -1
+
+ if (isnull(transfer_moles))
+ transfer_moles = source.total_moles
+ else
+ transfer_moles = min(source.total_moles, transfer_moles)
+
+ //Calculate the amount of energy required and limit transfer_moles based on available power
+ var/specific_power = calculate_specific_power(source, sink)/ATMOS_PUMP_EFFICIENCY //this has to be calculated before we modify any gas mixtures
+ if (!isnull(available_power) && specific_power > 0)
+ transfer_moles = min(transfer_moles, available_power / specific_power)
+
+ if (transfer_moles < MINIMUM_MOLES_TO_PUMP) //if we can't transfer enough gas just stop to avoid further processing
+ return -1
+
+ /*
+ //Update flow rate meter
+ if (istype(M, /obj/machinery/atmospherics))
+ var/obj/machinery/atmospherics/A = M
+ A.last_flow_rate = (transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+
+ if (A.debug)
+ A.visible_message("[A]: source entropy: [round(source.specific_entropy(), 0.01)] J/Kmol --> sink entropy: [round(sink.specific_entropy(), 0.01)] J/Kmol")
+ A.visible_message("[A]: specific entropy change = [round(sink.specific_entropy() - source.specific_entropy(), 0.01)] J/Kmol")
+ A.visible_message("[A]: specific power = [round(specific_power, 0.1)] W/mol")
+ A.visible_message("[A]: moles transferred = [transfer_moles] mol")
+
+ if (istype(M, /obj/machinery/portable_atmospherics))
+ var/obj/machinery/portable_atmospherics/P = M
+ P.last_flow_rate = (transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ */
+
+ var/datum/gas_mixture/removed = source.remove(transfer_moles)
+ if (!removed) //Just in case
+ return -1
+
+ var/power_draw = specific_power*transfer_moles
+
+ sink.merge(removed)
+
+ return power_draw
+
+//Gas 'pumping' proc for the case where the gas flow is passive and driven entirely by pressure differences (but still one-way).
+/proc/pump_gas_passive(var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles = null)
+ if (source.total_moles < MINIMUM_MOLES_TO_PUMP) //if we can't transfer enough gas just stop to avoid further processing
+ return -1
+
+ if (isnull(transfer_moles))
+ transfer_moles = source.total_moles
+ else
+ transfer_moles = min(source.total_moles, transfer_moles)
+
+ var/equalize_moles = calculate_equalize_moles(source, sink)
+ transfer_moles = min(transfer_moles, equalize_moles)
+
+ if (transfer_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ /*
+ //Update flow rate meter
+ if (istype(M, /obj/machinery/atmospherics))
+ var/obj/machinery/atmospherics/A = M
+ A.last_flow_rate = (transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ if (A.debug)
+ A.visible_message("[A]: moles transferred = [transfer_moles] mol")
+
+ if (istype(M, /obj/machinery/portable_atmospherics))
+ var/obj/machinery/portable_atmospherics/P = M
+ P.last_flow_rate = (transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ */
+
+ var/datum/gas_mixture/removed = source.remove(transfer_moles)
+ if(!removed) //Just in case
+ return -1
+ sink.merge(removed)
+
+ return 0
+
+//Generalized gas scrubbing proc.
+//Selectively moves specified gasses one gas_mixture to another and returns the amount of power needed (assuming 1 second), or -1 if no gas was filtered.
+//filtering - A list of gasids to be scrubbed from source
+//total_transfer_moles - Limits the amount of moles to scrub. The actual amount of gas scrubbed may also be limited by available_power, if given.
+//available_power - the maximum amount of power that may be used when scrubbing gas. If null then the scrubbing is not limited by power.
+/proc/scrub_gas(var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/total_transfer_moles = null, var/available_power = null)
+ if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &=
+
+ //Determine the specific power of each filterable gas type, and the total amount of filterable gas (gasses selected to be scrubbed)
+ var/total_filterable_moles = 0 //the total amount of filterable gas
+ var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type
+ for (var/g in filtering)
+ if (source.gas[g] < MINIMUM_MOLES_TO_FILTER)
+ continue
+
+ var/specific_power = calculate_specific_power_gas(g, source, sink)/ATMOS_FILTER_EFFICIENCY
+ specific_power_gas[g] = specific_power
+ total_filterable_moles += source.gas[g]
+
+ if (total_filterable_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ //now that we know the total amount of filterable gas, we can calculate the amount of power needed to scrub one mole of gas
+ var/total_specific_power = 0 //the power required to remove one mole of filterable gas
+ for (var/g in filtering)
+ var/ratio = source.gas[g]/total_filterable_moles //this converts the specific power per mole of pure gas to specific power per mole of scrubbed gas
+ total_specific_power += specific_power_gas[g]*ratio
+
+ //Figure out how much of each gas to filter
+ if (isnull(total_transfer_moles))
+ total_transfer_moles = total_filterable_moles
+ else
+ total_transfer_moles = min(total_transfer_moles, total_filterable_moles)
+
+ //limit transfer_moles based on available power
+ if (!isnull(available_power) && total_specific_power > 0)
+ total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
+
+ if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ /*
+ //Update flow rate var
+ if (istype(M, /obj/machinery/atmospherics))
+ var/obj/machinery/atmospherics/A = M
+ A.last_flow_rate = (total_transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ if (istype(M, /obj/machinery/portable_atmospherics))
+ var/obj/machinery/portable_atmospherics/P = M
+ P.last_flow_rate = (total_transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ */
+
+ var/power_draw = 0
+ for (var/g in filtering)
+ var/transfer_moles = source.gas[g]
+ //filter gas in proportion to the mole ratio
+ transfer_moles = min(transfer_moles, total_transfer_moles*(source.gas[g]/total_filterable_moles))
+
+ //use update=0. All the filtered gasses are supposed to be added simultaneously, so we update after the for loop.
+ source.adjust_gas(g, -transfer_moles, update=0)
+ sink.adjust_gas_temp(g, transfer_moles, source.temperature, update=0)
+
+ power_draw += specific_power_gas[g]*transfer_moles
+
+ //Remix the resulting gases
+ sink.update_values()
+ source.update_values()
+
+ return power_draw
+
+//Generalized gas filtering proc.
+//Filtering is a bit different from scrubbing. Instead of selectively moving the targeted gas types from one gas mix to another, filtering splits
+//the input gas into two outputs: one that contains /only/ the targeted gas types, and another that completely clean of the targeted gas types.
+//filtering - A list of gasids to be filtered. These gasses get moved to sink_filtered, while the other gasses get moved to sink_clean.
+//total_transfer_moles - Limits the amount of moles to input. The actual amount of gas filtered may also be limited by available_power, if given.
+//available_power - the maximum amount of power that may be used when filtering gas. If null then the filtering is not limited by power.
+/proc/filter_gas(var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_filtered, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null)
+ if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &=
+
+ var/total_specific_power = 0 //the power required to remove one mole of input gas
+ var/total_filterable_moles = 0 //the total amount of filterable gas
+ var/total_unfilterable_moles = 0 //the total amount of non-filterable gas
+ var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type
+ for (var/g in source.get_gases())
+ if (source.gas[g] < MINIMUM_MOLES_TO_FILTER)
+ continue
+
+ if (g in filtering)
+ specific_power_gas[g] = calculate_specific_power_gas(g, source, sink_filtered)/ATMOS_FILTER_EFFICIENCY
+ total_filterable_moles += source.gas[g]
+ else
+ specific_power_gas[g] = calculate_specific_power_gas(g, source, sink_clean)/ATMOS_FILTER_EFFICIENCY
+ total_unfilterable_moles += source.gas[g]
+
+ var/ratio = source.gas[g]/source.total_moles //converts the specific power per mole of pure gas to specific power per mole of input gas mix
+ total_specific_power += specific_power_gas[g]*ratio
+
+ //Figure out how much of each gas to filter
+ if (isnull(total_transfer_moles))
+ total_transfer_moles = source.total_moles
+ else
+ total_transfer_moles = min(total_transfer_moles, source.total_moles)
+
+ //limit transfer_moles based on available power
+ if (!isnull(available_power) && total_specific_power > 0)
+ total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
+
+ if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ //Update flow rate var
+ /*
+ if (istype(M, /obj/machinery/atmospherics))
+ var/obj/machinery/atmospherics/A = M
+ A.last_flow_rate = (total_transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ */
+
+ var/datum/gas_mixture/removed = source.remove(total_transfer_moles)
+ if (!removed) //Just in case
+ return -1
+
+ var/filtered_power_used = 0 //power used to move filterable gas to sink_filtered
+ var/unfiltered_power_used = 0 //power used to move unfilterable gas to sink_clean
+ for (var/g in removed.gas)
+ var/power_used = specific_power_gas[g]*removed.gas[g]
+
+ if (g in filtering)
+ //use update=0. All the filtered gasses are supposed to be added simultaneously, so we update after the for loop.
+ sink_filtered.adjust_gas_temp(g, removed.gas[g], removed.temperature, update=0)
+ removed.adjust_gas(g, -removed.gas[g], update=0)
+ filtered_power_used += power_used
+ else
+ unfiltered_power_used += power_used
+
+ sink_filtered.update_values()
+ removed.update_values()
+
+ sink_clean.merge(removed)
+
+ return filtered_power_used + unfiltered_power_used
+
+//For omni devices. Instead filtering is an associative list mapping gasids to gas mixtures.
+//I don't like the copypasta, but I decided to keep both versions of gas filtering as filter_gas is slightly faster (doesn't create as many temporary lists, doesn't call update_values() as much)
+//filter_gas can be removed and replaced with this proc if need be.
+/proc/filter_gas_multi(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null)
+ if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &=
+
+ var/total_specific_power = 0 //the power required to remove one mole of input gas
+ var/total_filterable_moles = 0 //the total amount of filterable gas
+ var/total_unfilterable_moles = 0 //the total amount of non-filterable gas
+ var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type
+ for (var/g in source.gas)
+ if (source.gas[g] < MINIMUM_MOLES_TO_FILTER)
+ continue
+
+ if (g in filtering)
+ var/datum/gas_mixture/sink_filtered = filtering[g]
+ specific_power_gas[g] = calculate_specific_power_gas(g, source, sink_filtered)/ATMOS_FILTER_EFFICIENCY
+ total_filterable_moles += source.gas[g]
+ else
+ specific_power_gas[g] = calculate_specific_power_gas(g, source, sink_clean)/ATMOS_FILTER_EFFICIENCY
+ total_unfilterable_moles += source.gas[g]
+
+ var/ratio = source.gas[g]/source.total_moles //converts the specific power per mole of pure gas to specific power per mole of input gas mix
+ total_specific_power += specific_power_gas[g]*ratio
+
+ //Figure out how much of each gas to filter
+ if (isnull(total_transfer_moles))
+ total_transfer_moles = source.total_moles
+ else
+ total_transfer_moles = min(total_transfer_moles, source.total_moles)
+
+ //limit transfer_moles based on available power
+ if (!isnull(available_power) && total_specific_power > 0)
+ total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
+
+ if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ /*
+ //Update Flow Rate var
+ if (istype(M, /obj/machinery/atmospherics))
+ var/obj/machinery/atmospherics/A = M
+ A.last_flow_rate = (total_transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ if (istype(M, /obj/machinery/portable_atmospherics))
+ var/obj/machinery/portable_atmospherics/P = M
+ P.last_flow_rate = (total_transfer_moles/source.total_moles)*source.volume //group_multiplier gets divided out here
+ */
+
+ var/datum/gas_mixture/removed = source.remove(total_transfer_moles)
+ if (!removed) //Just in case
+ return -1
+
+ var/list/filtered_power_used = list() //power used to move filterable gas to the filtered gas mixes
+ var/unfiltered_power_used = 0 //power used to move unfilterable gas to sink_clean
+ for (var/g in removed.gas)
+ var/power_used = specific_power_gas[g]*removed.gas[g]
+
+ if (g in filtering)
+ var/datum/gas_mixture/sink_filtered = filtering[g]
+ //use update=0. All the filtered gasses are supposed to be added simultaneously, so we update after the for loop.
+ sink_filtered.adjust_gas_temp(g, removed.gas[g], removed.temperature, update=1)
+ removed.adjust_gas(g, -removed.gas[g], update=0)
+ if (power_used)
+ filtered_power_used[sink_filtered] = power_used
+ else
+ unfiltered_power_used += power_used
+
+ removed.update_values()
+
+ var/power_draw = unfiltered_power_used
+ for (var/datum/gas_mixture/sink_filtered in filtered_power_used)
+ power_draw += filtered_power_used[sink_filtered]
+
+ sink_clean.merge(removed)
+
+ return power_draw
+
+//Similar deal as the other atmos process procs.
+//mix_sources maps input gas mixtures to mix ratios. The mix ratios MUST add up to 1.
+/proc/mix_gas(var/list/mix_sources, var/datum/gas_mixture/sink, var/total_transfer_moles = null, var/available_power = null)
+ if (!mix_sources.len)
+ return -1
+
+ var/total_specific_power = 0 //the power needed to mix one mole of gas
+ var/total_mixing_moles = null //the total amount of gas that can be mixed, given our mix ratios
+ var/total_input_volume = 0 //for flow rate calculation
+ var/total_input_moles = 0 //for flow rate calculation
+ var/list/source_specific_power = list()
+ for (var/datum/gas_mixture/source in mix_sources)
+ if (source.total_moles < MINIMUM_MOLES_TO_FILTER)
+ return -1 //either mix at the set ratios or mix no gas at all
+
+ var/mix_ratio = mix_sources[source]
+ if (!mix_ratio)
+ continue //this gas is not being mixed in
+
+ //mixing rate is limited by the source with the least amount of available gas
+ var/this_mixing_moles = source.total_moles/mix_ratio
+ if (isnull(total_mixing_moles) || total_mixing_moles > this_mixing_moles)
+ total_mixing_moles = this_mixing_moles
+
+ source_specific_power[source] = calculate_specific_power(source, sink)*mix_ratio/ATMOS_FILTER_EFFICIENCY
+ total_specific_power += source_specific_power[source]
+ total_input_volume += source.volume
+ total_input_moles += source.total_moles
+
+ if (total_mixing_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ if (isnull(total_transfer_moles))
+ total_transfer_moles = total_mixing_moles
+ else
+ total_transfer_moles = min(total_mixing_moles, total_transfer_moles)
+
+ //limit transfer_moles based on available power
+ if (!isnull(available_power) && total_specific_power > 0)
+ total_transfer_moles = min(total_transfer_moles, available_power / total_specific_power)
+
+ if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
+ return -1
+
+ /*
+ //Update flow rate var
+ if (istype(M, /obj/machinery/atmospherics))
+ var/obj/machinery/atmospherics/A = M
+ A.last_flow_rate = (total_transfer_moles/total_input_moles)*total_input_volume //group_multiplier gets divided out here
+ if (istype(M, /obj/machinery/portable_atmospherics))
+ var/obj/machinery/portable_atmospherics/P = M
+ P.last_flow_rate = (total_transfer_moles/total_input_moles)*total_input_volume //group_multiplier gets divided out here
+ */
+
+ var/total_power_draw = 0
+ for (var/datum/gas_mixture/source in mix_sources)
+ var/mix_ratio = mix_sources[source]
+ if (!mix_ratio)
+ continue
+
+ var/transfer_moles = total_transfer_moles * mix_ratio
+
+ var/datum/gas_mixture/removed = source.remove(transfer_moles)
+
+ var/power_draw = transfer_moles * source_specific_power[source]
+ total_power_draw += power_draw
+
+ sink.merge(removed)
+
+ return total_power_draw
+
+/*
+ Helper procs for various things.
+*/
+
+//Calculates the amount of power needed to move one mole from source to sink.
+/proc/calculate_specific_power(datum/gas_mixture/source, datum/gas_mixture/sink)
+ //Calculate the amount of energy required
+ var/air_temperature = (sink.temperature > 0)? sink.temperature : source.temperature
+ var/specific_entropy = sink.specific_entropy() - source.specific_entropy() //sink is gaining moles, source is loosing
+ var/specific_power = 0 // W/mol
+
+ //If specific_entropy is < 0 then power is required to move gas
+ if (specific_entropy < 0)
+ specific_power = -specific_entropy*air_temperature //how much power we need per mole
+
+ return specific_power
+
+//Calculates the amount of power needed to move one mole of a certain gas from source to sink.
+/proc/calculate_specific_power_gas(var/gasid, datum/gas_mixture/source, datum/gas_mixture/sink)
+ //Calculate the amount of energy required
+ var/air_temperature = (sink.temperature > 0)? sink.temperature : source.temperature
+ var/specific_entropy = sink.specific_entropy_gas(gasid) - source.specific_entropy_gas(gasid) //sink is gaining moles, source is loosing
+ var/specific_power = 0 // W/mol
+
+ //If specific_entropy is < 0 then power is required to move gas
+ if (specific_entropy < 0)
+ specific_power = -specific_entropy*air_temperature //how much power we need per mole
+
+ return specific_power
+
+//Calculates the APPROXIMATE amount of moles that would need to be transferred to change the pressure of sink by pressure_delta
+//If set, sink_volume_mod adjusts the effective output volume used in the calculation. This is useful when the output gas_mixture is
+//part of a pipenetwork, and so it's volume isn't representative of the actual volume since the gas will be shared across the pipenetwork when it processes.
+/proc/calculate_transfer_moles(datum/gas_mixture/source, datum/gas_mixture/sink, var/pressure_delta, var/sink_volume_mod=0)
+ if(source.temperature == 0 || source.total_moles == 0) return 0
+
+ var/output_volume = (sink.volume * sink.group_multiplier) + sink_volume_mod
+ var/source_total_moles = source.total_moles * source.group_multiplier
+
+ var/air_temperature = source.temperature
+ if(sink.total_moles > 0 && sink.temperature > 0)
+ //estimate the final temperature of the sink after transfer
+ var/estimate_moles = pressure_delta*output_volume/(sink.temperature * R_IDEAL_GAS_EQUATION)
+ var/sink_heat_capacity = sink.heat_capacity()
+ var/transfer_heat_capacity = source.heat_capacity()*estimate_moles/source_total_moles
+ air_temperature = (sink.temperature*sink_heat_capacity + source.temperature*transfer_heat_capacity) / (sink_heat_capacity + transfer_heat_capacity)
+
+ //get the number of moles that would have to be transfered to bring sink to the target pressure
+ return pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
+
+//Calculates the APPROXIMATE amount of moles that would need to be transferred to bring source and sink to the same pressure
+/proc/calculate_equalize_moles(datum/gas_mixture/source, datum/gas_mixture/sink)
+ if(source.temperature == 0) return 0
+
+ //Make the approximation that the sink temperature is unchanged after transferring gas
+ var/source_volume = source.volume * source.group_multiplier
+ var/sink_volume = sink.volume * sink.group_multiplier
+
+ var/source_pressure = source.return_pressure()
+ var/sink_pressure = sink.return_pressure()
+
+ return (source_pressure - sink_pressure)/(R_IDEAL_GAS_EQUATION * (source.temperature/source_volume + sink.temperature/sink_volume))
+
+//Determines if the atmosphere is safe (for humans). Safe atmosphere:
+// - Is between 80 and 120kPa
+// - Has between 17% and 30% oxygen
+// - Has temperature between -10C and 50C
+// - Has no or only minimal phoron or N2O
+/proc/get_atmosphere_issues(datum/gas_mixture/atmosphere, var/returntext = 0)
+ var/list/status = list()
+ if(!atmosphere)
+ status.Add("No atmosphere present.")
+
+ // Temperature check
+ if((atmosphere.temperature > (T0C + 50)) || (atmosphere.temperature < (T0C - 10)))
+ status.Add("Temperature too [atmosphere.temperature > (T0C + 50) ? "high" : "low"].")
+
+ // Pressure check
+ var/pressure = atmosphere.return_pressure()
+ if((pressure > 120) || (pressure < 80))
+ status.Add("Pressure too [pressure > 120 ? "high" : "low"].")
+
+ // Gas concentration checks
+ var/oxygen = 0
+ var/phoron = 0
+ var/carbondioxide = 0
+ var/nitrousoxide = 0
+ var/hydrogen = 0
+ if(atmosphere.total_moles) // Division by zero prevention
+ oxygen = (atmosphere.gas[GAS_OXYGEN] / atmosphere.total_moles) * 100 // Percentage of the gas
+ phoron = (atmosphere.gas[GAS_PLASMA] / atmosphere.total_moles) * 100
+ carbondioxide = (atmosphere.gas[GAS_CO2] / atmosphere.total_moles) * 100
+ nitrousoxide = (atmosphere.gas[GAS_N2O] / atmosphere.total_moles) * 100
+ hydrogen = (atmosphere.gas[GAS_HYDROGEN] / atmosphere.total_moles) * 100
+
+ if(!oxygen)
+ status.Add("No oxygen.")
+ else if((oxygen > 30) || (oxygen < 17))
+ status.Add("Oxygen too [oxygen > 30 ? "high" : "low"].")
+
+
+
+ if(phoron > 0.1) // Toxic even in small amounts.
+ status.Add("Phoron contamination.")
+ if(nitrousoxide > 0.1) // Probably slightly less dangerous but still.
+ status.Add("N2O contamination.")
+ if(hydrogen > 2.5) // Not too dangerous, but flammable.
+ status.Add("Hydrogen contamination.")
+ if(carbondioxide > 5) // Not as dangerous until very large amount is present.
+ status.Add("CO2 concentration high.")
+
+
+ if(returntext)
+ return jointext(status, " ")
+ else
+ return status.len
+
+#undef MINIMUM_MOLES_TO_PUMP
+#undef MINIMUM_MOLES_TO_FILTER
+#undef ATMOS_PUMP_EFFICIENCY
+#undef ATMOS_FILTER_EFFICIENCY
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 5c62143e0a6..c82ce10a04c 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -96,7 +96,16 @@
var/static/list/atmos_connections = list(COMSIG_TURF_EXPOSE = .proc/check_air_dangerlevel)
- var/list/TLV = list( // Breathable air.
+ var/list/TLV = list(
+ "pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE),
+ "temperature" = new/datum/tlv(BODYTEMP_COLD_WARNING_1, BODYTEMP_COLD_WARNING_1+10, BODYTEMP_HEAT_WARNING_1-27, BODYTEMP_HEAT_WARNING_1),
+ GAS_OXYGEN = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
+ GAS_NITROGEN = new/datum/tlv(-1, -1, 1000, 1000),
+ GAS_CO2 = new/datum/tlv(-1, -1, 5, 10),
+ GAS_PLASMA = new/datum/tlv/dangerous,
+ GAS_N2O = new/datum/tlv/dangerous,
+ )
+ /* // Breathable air.
"pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are hazard_min, warning_min, warning_max, hazard_max
"temperature" = new/datum/tlv(BODYTEMP_COLD_WARNING_1, BODYTEMP_COLD_WARNING_1+10, BODYTEMP_HEAT_WARNING_1-27, BODYTEMP_HEAT_WARNING_1),
/datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
@@ -119,7 +128,7 @@
/datum/gas/helium = new/datum/tlv/dangerous,
/datum/gas/antinoblium = new/datum/tlv/dangerous,
/datum/gas/halon = new/datum/tlv/dangerous
- )
+ )*/
/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild)
. = ..()
@@ -212,7 +221,7 @@
))
var/total_moles = environment.total_moles()
var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.temperature / environment.volume
- for(var/gas_id in environment.gases)
+ for(var/gas_id in environment.get_gases())
if(!(gas_id in TLV)) // We're not interested in this gas, it seems.
continue
cur_tlv = TLV[gas_id]
@@ -287,11 +296,11 @@
thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "warning_max", "selected" = selected.warning_max))
thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "hazard_max", "selected" = selected.hazard_max))
- for(var/gas_id in GLOB.meta_gas_info)
+ for(var/gas_id in GLOB.all_gases)
if(!(gas_id in TLV)) // We're not interested in this gas, it seems.
continue
selected = TLV[gas_id]
- thresholds += list(list("name" = GLOB.meta_gas_info[gas_id][META_GAS_NAME], "settings" = list()))
+ thresholds += list(list("name" = gas_id, "settings" = list()))
thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "hazard_min", "selected" = selected.hazard_min))
thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "warning_min", "selected" = selected.warning_min))
thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "warning_max", "selected" = selected.warning_max))
@@ -437,7 +446,7 @@
for(var/device_id in my_area.air_scrub_info)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = list(/datum/gas/carbon_dioxide),
+ "set_filters" = list(GAS_CO2),
"scrubbing" = 1,
"widenet" = 0
), signal_source)
@@ -451,7 +460,7 @@
for(var/device_id in my_area.air_scrub_info)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = ALL_GASES,
+ "set_filters" = GLOB.all_gases,
"scrubbing" = 1,
"widenet" = 1
), signal_source)
@@ -478,7 +487,7 @@
for(var/device_id in my_area.air_scrub_info)
send_signal(device_id, list(
"power" = 1,
- "set_filters" = list(/datum/gas/carbon_dioxide),
+ "set_filters" = list(GAS_CO2),
"scrubbing" = 1,
"widenet" = 0
), signal_source)
@@ -599,7 +608,7 @@
//cache for sanic speed (lists are references anyways)
var/list/cached_tlv = TLV
- var/list/env_gases = environment.gases
+ var/list/env_gases = environment.get_gases()
var/partial_pressure = R_IDEAL_GAS_EQUATION * exposed_temperature / environment.volume
current_tlv = cached_tlv["pressure"]
@@ -614,9 +623,7 @@
if(!(gas_id in cached_tlv)) // We're not interested in this gas, it seems.
continue
current_tlv = cached_tlv[gas_id]
- gas_dangerlevel = max(gas_dangerlevel, current_tlv.get_danger_level(env_gases[gas_id][MOLES] * partial_pressure))
-
- environment.garbage_collect()
+ gas_dangerlevel = max(gas_dangerlevel, current_tlv.get_danger_level(env_gases[gas_id] * partial_pressure))
var/old_danger_level = danger_level
danger_level = max(pressure_dangerlevel, temperature_dangerlevel, gas_dangerlevel)
@@ -935,9 +942,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
"Temperature" = "temperature"
)
- for(var/gas_id in GLOB.meta_gas_info)
- component_options[GLOB.meta_gas_info[gas_id][META_GAS_NAME]] = gas_id2path(gas_id)
-
+ for(var/gas_id in GLOB.common_gases)
+ //component_options[GLOB.meta_gas_info[gas_id][META_GAS_NAME]] = gas_id2path(gas_id)
+ component_options |= gas_id
air_alarm_options = add_option_port("Air Alarm Options", component_options)
options_map = component_options
@@ -962,7 +969,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
pressure.set_output(round(environment.return_pressure()))
temperature.set_output(round(environment.temperature))
if(ispath(options_map[current_option]))
- gas_amount.set_output(round(environment.gases[options_map[current_option]][MOLES]))
+ gas_amount.set_output(round(environment.get_gases()[options_map[current_option]]))
return
var/datum/tlv/settings = connected_alarm.TLV[options_map[current_option]]
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index af52c1a78a8..01c3dc5e8e7 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -122,7 +122,7 @@
if(node2)
node2.atmos_init()
node2.add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
return TRUE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index 4c82f903a49..ba50629b708 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -56,7 +56,8 @@ Passive gate is similar to the regular pump except:
var/datum/gas_mixture/air1 = airs[1]
var/datum/gas_mixture/air2 = airs[2]
- if(air1.release_gas_to(air2, target_pressure))
+ var/transfer_moles = (target_pressure/air1.volume)*air1.total_moles
+ if(pump_gas_passive(air1, air2, calculate_transfer_moles(air1, air2, transfer_moles)) >= 0)//pump_gas() will return a negative number if no flow occurred
update_parents()
//Radio remote control
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
index c5b3a43dc50..81c1c28c16f 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
@@ -55,7 +55,8 @@
var/datum/gas_mixture/air2 = airs[2]
if(air1.return_pressure() > target_pressure)
- if(air1.release_gas_to(air2, air1.return_pressure()))
+ var/transfer_moles = (target_pressure/air1.volume)*air1.total_moles
+ if(pump_gas_passive(air1, air2, calculate_transfer_moles(air1, air2, transfer_moles)))
update_parents()
is_gas_flowing = TRUE
else
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index 1f372947f6e..c9a98bb535f 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -64,8 +64,8 @@
var/datum/gas_mixture/air1 = airs[1]
var/datum/gas_mixture/air2 = airs[2]
-
- if(air1.pump_gas_to(air2, target_pressure))
+ var/transfer_moles = (target_pressure/air1.volume)*air1.total_moles
+ if(pump_gas(air1, air2, calculate_transfer_moles(air1, air2, transfer_moles)))
update_parents()
/**
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
index b9295a4d2cd..a6de5c17fa4 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
@@ -59,14 +59,16 @@
if(!inverted)
if(air1.temperature < target_temperature)
- if(air1.release_gas_to(air2, air1.return_pressure()))
+ var/transfer_moles = (ATMOS_DEFAULT_VOLUME_PUMP/air1.volume)*air1.total_moles
+ if(pump_gas_passive(air1, air2, calculate_transfer_moles(air1, air2, transfer_moles)))
update_parents()
is_gas_flowing = TRUE
else
is_gas_flowing = FALSE
else
if(air1.temperature > target_temperature)
- if(air1.release_gas_to(air2, air1.return_pressure()))
+ var/transfer_moles = (ATMOS_DEFAULT_VOLUME_PUMP/air1.volume)*air1.total_moles
+ if(pump_gas_passive(air1, air2, calculate_transfer_moles(air1, air2, transfer_moles)))
update_parents()
is_gas_flowing = TRUE
else
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/binary_devices/thermomachine.dm
index 253b8195c72..13c03a29c7d 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/thermomachine.dm
@@ -333,7 +333,7 @@
if(node2)
node2.atmos_init()
node2.add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
/obj/machinery/atmospherics/components/binary/thermomachine/proc/disconnect_pipes()
var/obj/machinery/atmospherics/node1 = nodes[1]
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index bc98e87f3c6..e7fb23f7e9a 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -197,7 +197,7 @@
* This way gases won't get stuck
*/
/obj/machinery/atmospherics/components/proc/update_parents()
- if(!SSair.initialized)
+ if(!SSzas.initialized)
return
if(rebuilding)
update_parents_after_rebuild = TRUE
@@ -206,7 +206,7 @@
var/datum/pipeline/parent = parents[i]
if(!parent)
WARNING("Component is missing a pipenet! Rebuilding...")
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
else
parent.update = TRUE
diff --git a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
index 4b9a7f12843..02ec0bb294c 100644
--- a/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
+++ b/code/modules/atmospherics/machinery/components/electrolyzer/electrolyzer.dm
@@ -32,7 +32,7 @@
. = ..()
if(ispath(cell))
cell = new cell(src)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
update_appearance()
/obj/machinery/electrolyzer/Destroy()
@@ -115,8 +115,6 @@
current_reaction.react(loc, env, working_power)
- env.garbage_collect()
-
/obj/machinery/electrolyzer/RefreshParts()
var/manipulator = 0
var/cap = 0
diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm
index ac3ebde272c..b02041cd51c 100644
--- a/code/modules/atmospherics/machinery/components/tank.dm
+++ b/code/modules/atmospherics/machinery/components/tank.dm
@@ -136,9 +136,7 @@
var/pressure_limit = max_pressure * safety_margin
var/moles_to_add = (pressure_limit * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- air_contents.assert_gas(gastype)
- air_contents.gases[gastype][MOLES] += moles_to_add
- air_contents.archive()
+ air_contents.adjust_gas(gastype, moles_to_add)
/obj/machinery/atmospherics/components/tank/process_atmos()
if(air_contents.react(src))
@@ -365,8 +363,8 @@
/obj/machinery/atmospherics/components/tank/air/Initialize(mapload)
. = ..()
- fill_to_pressure(/datum/gas/oxygen, safety_margin = (O2STANDARD * 0.5))
- fill_to_pressure(/datum/gas/nitrogen, safety_margin = (N2STANDARD * 0.5))
+ fill_to_pressure(GAS_OXYGEN, safety_margin = (O2STANDARD * 0.5))
+ fill_to_pressure(GAS_NITROGEN, safety_margin = (N2STANDARD * 0.5))
/obj/machinery/atmospherics/components/tank/carbon_dioxide
gas_type = /datum/gas/carbon_dioxide
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 6f7af747d85..78fd349b75c 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -99,11 +99,7 @@
// If no filter is set, we just try to forward everything to air3 to avoid gas being outright lost.
if(filtering)
var/datum/gas_mixture/filtered_out = new
-
- for(var/gas in removed.gases & filter_type)
- var/datum/gas_mixture/removing = removed.remove_specific_ratio(gas, 1)
- if(removing)
- filtered_out.merge(removing)
+ filter_gas(filtering, removed, filtered_out, removed, null, INFINITY)
// Send things to the side output if we can, return them to the input if we can't.
// This means that other gases continue to flow to the main output if the side output is blocked.
if (side_output_full)
@@ -111,7 +107,6 @@
else
air2.merge(filtered_out)
// Make sure we don't send any now-empty gas entries to the main output
- removed.garbage_collect()
// Send things to the main output if we can, return them to the input if we can't.
// This lets filtered gases continue to flow to the side output in a manner consistent with the main output behavior.
@@ -134,14 +129,14 @@
/obj/machinery/atmospherics/components/trinary/filter/ui_data()
var/data = list()
+ var/static/all_gases = GLOB.all_gases
data["on"] = on
data["rate"] = round(transfer_rate)
data["max_rate"] = round(MAX_TRANSFER_RATE)
data["filter_types"] = list()
- for(var/path in GLOB.meta_gas_info)
- var/list/gas = GLOB.meta_gas_info[path]
- data["filter_types"] += list(list("name" = gas[META_GAS_NAME], "gas_id" = gas[META_GAS_ID], "enabled" = (path in filter_type)))
+ for(var/gas in GLOB.all_gases)
+ data["filter_types"] += list(list("name" = gas[META_GAS_NAME], "enabled" = (path in filter_type)))
return data
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index c172844d47c..1abfa24475c 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -278,11 +278,13 @@ GLOBAL_VAR_INIT(cryo_overlay_cover_off, mutable_appearance('icons/obj/cryogenics
var/datum/gas_mixture/air1 = airs[1]
- if(!nodes[1] || !airs[1] || !air1.gases.len || air1.total_moles() < CRYO_MIN_GAS_MOLES) // Turn off if the machine won't work.
+ /* PARIAH EDIT REMOVAL - HUGBOX BARGAGE
+ if(!nodes[1] || !airs[1] || !air1.gas.len || air1.total_moles() < CRYO_MIN_GAS_MOLES) // Turn off if the machine won't work.
var/msg = "Insufficient cryogenic gas, shutting down."
radio.talk_into(src, msg, radio_channel)
set_on(FALSE)
return
+ */
if(occupant)
var/mob/living/mob_occupant = occupant
@@ -306,9 +308,6 @@ GLOBAL_VAR_INIT(cryo_overlay_cover_off, mutable_appearance('icons/obj/cryogenics
var/mob/living/carbon/human/humi = mob_occupant
humi.adjust_coretemperature(humi.bodytemperature - humi.coretemperature)
-
- air1.garbage_collect()
-
if(air1.temperature > 2000)
take_damage(clamp((air1.temperature)/200, 10, 20), BURN)
@@ -555,7 +554,7 @@ GLOBAL_VAR_INIT(cryo_overlay_cover_off, mutable_appearance('icons/obj/cryogenics
if(node)
node.atmos_init()
node.add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
#undef MAX_TEMPERATURE
#undef CRYO_MULTIPLY_FACTOR
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
index 5c6cacb5518..887bd167a35 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
@@ -53,11 +53,11 @@
if(!partner)
partner_ref = null
return
- if(SSair.times_fired <= update_cycle)
+ if(SSzas.times_fired <= update_cycle)
return
- update_cycle = SSair.times_fired
- partner.update_cycle = SSair.times_fired
+ update_cycle = SSzas.times_fired
+ partner.update_cycle = SSzas.times_fired
var/datum/gas_mixture/air_contents = airs[1]
var/datum/gas_mixture/partnerair_contents = partner.airs[1]
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index d2b1d4bfee4..b1d46b02494 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -21,7 +21,7 @@
///The mode of the scrubber (SCRUBBING or SIPHONING)
var/scrubbing = SCRUBBING //0 = siphoning, 1 = scrubbing
///The list of gases we are filtering
- var/list/filter_types = list(/datum/gas/carbon_dioxide)
+ var/list/filter_types = list(GAS_CO2)
///Rate of the scrubber to remove gases from the air
var/volume_rate = 200
///is this scrubber acting on the 3x3 area around it.
@@ -47,7 +47,7 @@
for(var/to_filter in filter_types)
if(istext(to_filter))
filter_types -= to_filter
- filter_types += gas_id2path(to_filter)
+ filter_types += to_filter
/obj/machinery/atmospherics/components/unary/vent_scrubber/Initialize(mapload)
. = ..()
@@ -69,13 +69,6 @@
if(!islist(filter_or_filters))
filter_or_filters = list(filter_or_filters)
- for(var/gas_to_filter in filter_or_filters)
- var/translated_gas = istext(gas_to_filter) ? gas_id2path(gas_to_filter) : gas_to_filter
-
- if(ispath(translated_gas, /datum/gas))
- filter_types |= translated_gas
- continue
-
var/turf/open/our_turf = get_turf(src)
if(!isopenturf(our_turf))
@@ -93,12 +86,6 @@
if(!islist(filter_or_filters))
filter_or_filters = list(filter_or_filters)
- for(var/gas_to_filter in filter_or_filters)
- var/translated_gas = istext(gas_to_filter) ? gas_id2path(gas_to_filter) : gas_to_filter
-
- if(ispath(translated_gas, /datum/gas))
- filter_types -= translated_gas
- continue
var/turf/open/our_turf = get_turf(src)
var/datum/gas_mixture/turf_gas
@@ -117,13 +104,6 @@
filter_or_filters = list(filter_or_filters)
for(var/gas_to_filter in filter_or_filters)
- var/translated_gas = istext(gas_to_filter) ? gas_id2path(gas_to_filter) : gas_to_filter
-
- if(ispath(translated_gas, /datum/gas))
- if(translated_gas in filter_types)
- filter_types -= translated_gas
- else
- filter_types |= translated_gas
var/turf/open/our_turf = get_turf(src)
@@ -172,9 +152,8 @@
return FALSE
var/list/f_types = list()
- for(var/path in GLOB.meta_gas_info)
- var/list/gas = GLOB.meta_gas_info[path]
- f_types += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in filter_types)))
+ for(var/gas_id in GLOB.common_gases)
+ f_types += list(list("gas_id" = gas_id, "gas_name" = gas_id, "enabled" = (gas_id in filter_types)))
var/datum/signal/signal = new(list(
"tag" = id_tag,
@@ -223,7 +202,7 @@
on = FALSE
return FALSE
- var/list/changed_gas = air.gases
+ var/list/changed_gas = air.gas
if(!changed_gas)
return FALSE
@@ -260,38 +239,30 @@
return FALSE
var/datum/gas_mixture/environment = tile.return_air()
var/datum/gas_mixture/air_contents = airs[1]
- var/list/env_gases = environment.gases
if(air_contents.return_pressure() >= 50 * ONE_ATMOSPHERE)
return FALSE
if(scrubbing == SCRUBBING)
- if(length(env_gases & filter_types))
+ if(length(environment.gas & filter_types))
///contains all of the gas we're sucking out of the tile, gets put into our parent pipenet
var/datum/gas_mixture/filtered_out = new
- var/list/filtered_gases = filtered_out.gases
filtered_out.temperature = environment.temperature
///maximum percentage of the turfs gas we can filter
var/removal_ratio = min(1, volume_rate / environment.volume)
var/total_moles_to_remove = 0
- for(var/gas in filter_types & env_gases)
- total_moles_to_remove += env_gases[gas][MOLES]
+ for(var/gas in filter_types & environment.get_gases())
+ total_moles_to_remove += environment.get_gas(gas)
if(total_moles_to_remove == 0)//sometimes this gets non gc'd values
- environment.garbage_collect()
return FALSE
- for(var/gas in filter_types & env_gases)
- filtered_out.add_gas(gas)
- //take this gases portion of removal_ratio of the turfs air, or all of that gas if less than or equal to MINIMUM_MOLES_TO_SCRUB
- var/transfered_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MINIMUM_MOLES_TO_SCRUB, env_gases[gas][MOLES]))
-
- filtered_gases[gas][MOLES] = transfered_moles
- env_gases[gas][MOLES] -= transfered_moles
+ //take this gases portion of removal_ratio of the turfs air, or all of that gas if less than or equal to MINIMUM_MOLES_TO_SCRUB
+ var/transfer_moles = min(1, volume_rate/environment.volume)*environment.total_moles
+ scrub_gas(filter_types, environment, filtered_out, transfer_moles, INFINITY)
- environment.garbage_collect()
//Remix the resulting gases
air_contents.merge(filtered_out)
@@ -315,7 +286,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/check_turfs()
adjacent_turfs.Cut()
var/turf/local_turf = get_turf(src)
- adjacent_turfs = local_turf.get_atmos_adjacent_turfs(alldir = TRUE)
+ adjacent_turfs = get_adjacent_open_turfs(local_turf)
/obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal)
if(!is_operational || !signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index dcb96442951..ff2433045ec 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -14,19 +14,19 @@
other_airs = list()
members = list()
other_atmos_machines = list()
- SSair.networks += src
+ SSzas.networks += src
/datum/pipeline/Destroy()
- SSair.networks -= src
+ SSzas.networks -= src
if(building)
- SSair.remove_from_expansion(src)
+ SSzas.remove_from_expansion(src)
if(air?.volume)
temporarily_store_air()
for(var/obj/machinery/atmospherics/pipe/considered_pipe in members)
considered_pipe.parent = null
if(QDELETED(considered_pipe))
continue
- SSair.add_to_rebuild_queue(considered_pipe)
+ SSzas.add_to_rebuild_queue(considered_pipe)
for(var/obj/machinery/atmospherics/components/considered_component in other_atmos_machines)
considered_component.nullify_pipenet(src)
return ..()
@@ -56,7 +56,7 @@
air = new
air.volume = volume
- SSair.add_to_expansion(src, base)
+ SSzas.add_to_expansion(src, base)
///Has the same effect as build_pipeline(), but this doesn't queue its work, so overrun abounds. It's useful for the pregame
/datum/pipeline/proc/build_pipeline_blocking(obj/machinery/atmospherics/base)
@@ -238,33 +238,44 @@
pipeline_list |= atmos_machine.return_pipenets_for_reconcilation(src)
gas_mixture_list |= atmos_machine.return_airs_for_reconcilation(src)
- var/total_thermal_energy = 0
- var/total_heat_capacity = 0
- var/datum/gas_mixture/total_gas_mixture = new(0)
-
- var/list/total_gases = total_gas_mixture.gases
-
- for(var/datum/gas_mixture/gas_mixture as anything in gas_mixture_list)
- total_gas_mixture.volume += gas_mixture.volume
-
- // This is sort of a combined merge + heat_capacity calculation
+ equalize_gases(gas_mixture_list)
- var/list/giver_gases = gas_mixture.gases
- //gas transfer
- for(var/giver_id in giver_gases)
- var/giver_gas_data = giver_gases[giver_id]
- ASSERT_GAS(giver_id, total_gas_mixture)
- total_gases[giver_id][MOLES] += giver_gas_data[MOLES]
- total_heat_capacity += giver_gas_data[MOLES] * giver_gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
- total_thermal_energy += THERMAL_ENERGY(gas_mixture)
-
- total_gas_mixture.temperature = total_heat_capacity ? (total_thermal_energy / total_heat_capacity) : 0
-
- total_gas_mixture.garbage_collect()
+/proc/equalize_gases(list/datum/gas_mixture/gases)
+ //Calculate totals from individual components
+ var/total_volume = 0
+ var/total_thermal_energy = 0
+ var/total_heat_capacity = 0
- if(total_gas_mixture.volume > 0)
- //Update individual gas_mixtures by volume ratio
- for(var/mixture in gas_mixture_list)
- var/datum/gas_mixture/gas_mixture = mixture
- gas_mixture.copy_from(total_gas_mixture, gas_mixture.volume / total_gas_mixture.volume)
+ var/list/total_gas = list()
+ for(var/datum/gas_mixture/gasmix in gases)
+ total_volume += gasmix.volume
+ var/temp_heatcap = gasmix.heat_capacity()
+ total_thermal_energy += gasmix.temperature * temp_heatcap
+ total_heat_capacity += temp_heatcap
+ for(var/g in gasmix.get_gases())
+ total_gas[g] += gasmix.gas[g]
+
+ if(total_volume > 0)
+ var/datum/gas_mixture/combined = new(total_volume)
+ combined.gas = total_gas
+
+ //Calculate temperature
+ if(total_heat_capacity > 0)
+ combined.temperature = total_thermal_energy / total_heat_capacity
+ combined.update_values()
+
+ //Allow for reactions
+ combined.react()
+
+ //Average out the gases
+ for(var/g in combined.get_gases())
+ combined.gas[g] /= total_volume
+
+ //Update individual gas_mixtures
+ for(var/datum/gas_mixture/gasmix in gases)
+ gasmix.gas = combined.gas.Copy()
+ gasmix.temperature = combined.temperature
+ gasmix.multiply(gasmix.volume)
+
+ return 1
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index 192c8ff2458..767fa2534e3 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -18,7 +18,7 @@
var/target_layer = PIPING_LAYER_DEFAULT
/obj/machinery/meter/Destroy()
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
target = null
return ..()
@@ -26,7 +26,7 @@
if(!isnull(new_piping_layer))
target_layer = new_piping_layer
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
if(!target)
reattach_to_layer()
@@ -50,10 +50,10 @@
/obj/machinery/meter/on_set_is_operational(old_value)
if(is_operational)
- SSair.start_processing_machine(src)//dont set icon_state here because it will be reset on next process() if it ever happens
+ SSzas.start_processing_machine(src)//dont set icon_state here because it will be reset on next process() if it ever happens
else
icon_state = "meter"
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
/obj/machinery/meter/process_atmos()
var/datum/gas_mixture/pipe_air = target.return_air()
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index 457352b6ab8..f83b314f5df 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -134,9 +134,7 @@
if(!isopenturf(O))
return FALSE
var/datum/gas_mixture/merger = new
- merger.assert_gas(spawn_id)
- merger.gases[spawn_id][MOLES] = spawn_mol * delta_time
- merger.temperature = spawn_temp
+ merger.adjust_gas_temp(spawn_id, spawn_mol * delta_time, spawn_temp)
O.assume_air(merger)
/obj/machinery/atmospherics/miner/attack_ai(mob/living/silicon/user)
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index 9a3abdb16c5..74cac69ed1b 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -34,7 +34,7 @@
/obj/machinery/atmospherics/pipe/layer_manifold/proc/nullify_all_nodes()
for(var/obj/machinery/atmospherics/node in nodes)
node.disconnect(src)
- SSair.add_to_rebuild_queue(node)
+ SSzas.add_to_rebuild_queue(node)
front_nodes = null
back_nodes = null
nodes = list()
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 2f6d7d45297..f0fe7850ab3 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -33,7 +33,7 @@
var/obj/machinery/atmospherics/old_node = nodes[i]
. = ..()
if(old_node)
- SSair.add_to_rebuild_queue(old_node)
+ SSzas.add_to_rebuild_queue(old_node)
/obj/machinery/atmospherics/pipe/destroy_network()
QDEL_NULL(parent)
diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm
index 26dfe3e8651..72945fca32a 100644
--- a/code/modules/atmospherics/machinery/portable/pump.dm
+++ b/code/modules/atmospherics/machinery/portable/pump.dm
@@ -57,18 +57,33 @@
excited = TRUE
+ var/pressure_delta
+ var/output_volume
+ var/air_temperature
var/turf/local_turf = get_turf(src)
- var/datum/gas_mixture/sending
- var/datum/gas_mixture/receiving
- if(direction == PUMP_OUT) // Hook up the internal pump.
- sending = (holding ? holding.return_air() : air_contents)
- receiving = (holding ? air_contents : local_turf.return_air())
+ var/datum/gas_mixture/environment
+ if(holding)
+ environment = holding.air_contents
+ else
+ environment = loc.return_air()
+
+ if(direction == PUMP_OUT)
+ pressure_delta = target_pressure - environment.return_pressure()
+ output_volume = environment.volume * environment.group_multiplier
+ air_temperature = environment.temperature? environment.temperature : air_contents.temperature
else
- sending = (holding ? air_contents : local_turf.return_air())
- receiving = (holding ? holding.return_air() : air_contents)
+ pressure_delta = environment.return_pressure() - target_pressure
+ output_volume = air_contents.volume * air_contents.group_multiplier
+ air_temperature = air_contents.temperature? air_contents.temperature : environment.temperature
+
+ var/transfer_moles = pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION)
- if(sending.pump_gas_to(receiving, target_pressure) && !holding)
- //air_update_turf(FALSE, FALSE) // Update the environment if needed.
+ if (pressure_delta > 0.01)
+ if (direction == PUMP_OUT)
+ pump_gas(src, air_contents, environment, transfer_moles)
+ else
+ pump_gas(src, environment, air_contents, transfer_moles)
+ //air_update_turf(FALSE, FALSE) // Update the environment if needed.
return ..()
@@ -81,7 +96,7 @@
if(prob(50 / severity))
on = !on
if(on)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
if(prob(100 / severity))
direction = PUMP_OUT
target_pressure = rand(0, 100 * ONE_ATMOSPHERE)
@@ -132,10 +147,10 @@
if("power")
on = !on
if(on)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
if(on && !holding)
- var/plasma = air_contents.gases[/datum/gas/plasma]
- var/n2o = air_contents.gases[/datum/gas/nitrous_oxide]
+ var/plasma = air_contents.get_gas(GAS_PLASMA)
+ var/n2o = air_contents.get_gas(GAS_N2O)
if(n2o || plasma)
message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [ADMIN_VERBOSEJMP(src)]")
log_admin("[key_name(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [AREACOORD(src)]")
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index bbf6ed311c1..049e69d4ce3 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -17,6 +17,7 @@
var/overpressure_m = 80
///Should the machine use overlay in update_overlays() when open/close?
var/use_overlays = TRUE
+ var/power_rating = 7500
///List of gases that can be scrubbed
var/list/scrubbing = list(
/datum/gas/plasma,
@@ -82,24 +83,18 @@
if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE)
return
- var/transfer_moles = min(1, volume_rate / mixture.volume) * mixture.total_moles()
+ var/transfer_moles = min(1, volume_rate/mixture.volume)*mixture.total_moles
- var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
+ var/datum/gas_mixture/gas2scrub = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
var/datum/gas_mixture/filtered = new
- if(!filtering)
+ if(!scrubbing)
return
- filtered.temperature = filtering.temperature
- for(var/gas in filtering.gases & scrubbing)
- filtered.add_gas(gas)
- filtered.gases[gas][MOLES] = filtering.gases[gas][MOLES] // Shuffle the "bad" gasses to the filtered mixture.
- filtering.gases[gas][MOLES] = 0
- filtering.garbage_collect() // Now that the gasses are set to 0, clean up the mixture.
-
- air_contents.merge(filtered) // Store filtered out gasses.
- mixture.merge(filtering) // Returned the cleaned gas.
+ scrub_gas(scrubbing, gas2scrub, air_contents, transfer_moles, power_rating)
+ /*
if(!holding)
- //air_update_turf(FALSE, FALSE)
+ air_update_turf(FALSE, FALSE)
+ */
/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
. = ..()
@@ -109,7 +104,7 @@
if(prob(50 / severity))
on = !on
if(on)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
update_appearance()
/obj/machinery/portable_atmospherics/scrubber/ui_interact(mob/user, datum/tgui/ui)
@@ -126,9 +121,8 @@
data["id_tag"] = -1 //must be defined in order to reuse code between portable and vent scrubbers
data["filter_types"] = list()
- for(var/path in GLOB.meta_gas_info)
- var/list/gas = GLOB.meta_gas_info[path]
- data["filter_types"] += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in scrubbing)))
+ for(var/gas_id in GLOB.common_gases)
+ data["filter_types"] += list(list("gas_id" = gas_id, "gas_name" = gas_id, "enabled" = (gas_id in scrubbing)))
if(holding)
data["holding"] = list()
@@ -158,14 +152,14 @@
if("power")
on = !on
if(on)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
. = TRUE
if("eject")
if(holding)
replace_tank(usr, FALSE)
. = TRUE
if("toggle_filter")
- scrubbing ^= gas_id2path(params["val"])
+ scrubbing ^= params["val"]
. = TRUE
update_appearance()
@@ -179,6 +173,7 @@
anchored = TRUE
active_power_usage = 500
idle_power_usage = 10
+ power_rating = 100000
overpressure_m = 200
volume_rate = 1500
@@ -208,9 +203,7 @@
excited = TRUE
if(!holding)
- var/turf/T = get_turf(src)
- for(var/turf/AT in T.get_atmos_adjacent_turfs(alldir = TRUE))
- scrub(AT.return_air())
+ scrub(get_turf(src).return_air())
return ..()
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index 71d04598086..077f8abd42a 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -10,24 +10,6 @@
. = ..()
return . && (REVERSE_DIR(border_dir) == dir || get_turf(mover) == get_turf(src))
-
-/obj/effect/wind
- name = "wind effect"
- desc = "Creates pressure effect in it's direction. Use sparingly."
- icon = 'icons/effects/mapping_helpers.dmi'
- icon_state = "field_dir"
- invisibility = INVISIBILITY_MAXIMUM
- var/strength = 30
-
-/obj/effect/wind/Initialize(mapload)
- . = ..()
- START_PROCESSING(SSobj,src)
-
-/obj/effect/wind/process()
- var/turf/open/T = get_turf(src)
- if(istype(T))
- T.consider_pressure_difference(get_step(T,dir),strength)
-
//Keep these rare due to cost of doing these checks
/obj/effect/path_blocker
name = "magic barrier"
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index 422082a060f..885aa0b1a12 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -106,30 +106,12 @@
var/obj/machinery/portable_atmospherics/canister/C = O
var/worth = cost
var/datum/gas_mixture/canister_mix = C.return_air()
- var/canister_gas = canister_mix.gases
- var/list/gases_to_check = list(
- /datum/gas/bz,
- /datum/gas/nitrium,
- /datum/gas/hypernoblium,
- /datum/gas/miasma,
- /datum/gas/tritium,
- /datum/gas/pluoxium,
- /datum/gas/freon,
- /datum/gas/hydrogen,
- /datum/gas/healium,
- /datum/gas/proto_nitrate,
- /datum/gas/zauker,
- /datum/gas/helium,
- /datum/gas/antinoblium,
- /datum/gas/halon,
- )
+ var/list/gases_to_check = GLOB.all_gases
for(var/gasID in gases_to_check)
- canister_mix.assert_gas(gasID)
- if(canister_gas[gasID][MOLES] > 0)
- worth += get_gas_value(gasID, canister_gas[gasID][MOLES])
+ if(canister_mix.get_gas(gasID) > 0)
+ worth += get_gas_value(gasID, canister_gas.get_gas(gasID))
- canister_mix.garbage_collect()
return worth
/datum/export/large/gas_canister/proc/get_gas_value(datum/gas/gasType, moles)
diff --git a/tgstation.dme b/tgstation.dme
index ef7f70abfe1..ec89a81aa47 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -194,6 +194,7 @@
#include "code\__DEFINES\atmospherics\atmos_mapping_helpers.dm"
#include "code\__DEFINES\atmospherics\atmos_mob_interaction.dm"
#include "code\__DEFINES\atmospherics\atmos_piping.dm"
+#include "code\__DEFINES\atmospherics\temperature.dm"
#include "code\__DEFINES\atmospherics\ZAS.dm"
#include "code\__DEFINES\atmospherics\ZAS_math.dm"
#include "code\__DEFINES\dcs\flags.dm"
@@ -553,6 +554,7 @@
#include "code\controllers\subsystem\processing\quirks.dm"
#include "code\controllers\subsystem\processing\reagents.dm"
#include "code\controllers\subsystem\processing\singulo.dm"
+#include "code\controllers\subsystem\processing\temperature.dm"
#include "code\controllers\subsystem\processing\station.dm"
#include "code\controllers\subsystem\processing\tramprocess.dm"
#include "code\controllers\subsystem\processing\wet_floors.dm"
@@ -2323,7 +2325,7 @@
#include "code\modules\atmospherics\machinery\components\trinary_devices\filter.dm"
#include "code\modules\atmospherics\machinery\components\trinary_devices\mixer.dm"
#include "code\modules\atmospherics\machinery\components\trinary_devices\trinary_devices.dm"
-#include "code\modules\atmospherics\machinery\components\unary_devices\bluespace_sender.dm"
+//#include "code\modules\atmospherics\machinery\components\unary_devices\bluespace_sender.dm"
#include "code\modules\atmospherics\machinery\components\unary_devices\cryo.dm"
#include "code\modules\atmospherics\machinery\components\unary_devices\heat_exchanger.dm"
#include "code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
@@ -2339,6 +2341,7 @@
#include "code\modules\atmospherics\machinery\pipes\layermanifold.dm"
#include "code\modules\atmospherics\machinery\pipes\mapping.dm"
#include "code\modules\atmospherics\machinery\pipes\multiz.dm"
+#include "code\modules\atmospherics\ZAS\Temperature.dm"
#include "code\modules\atmospherics\ZAS\atmos_primitives.dm"
#include "code\modules\atmospherics\machinery\pipes\pipes.dm"
#include "code\modules\atmospherics\machinery\pipes\smart.dm"
From dd47faf7783d1a92cb3edf06bbaa84c0df649a43 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Fri, 15 Apr 2022 18:13:04 -0400
Subject: [PATCH 005/200] Gonna pull the trigger soon
---
code/__DEFINES/atmospherics/ZAS.dm | 13 ++++
code/datums/mutations/actions.dm | 3 +-
code/game/objects/effects/mines.dm | 4 +-
code/game/objects/items/devices/PDA/PDA.dm | 6 +-
.../items/devices/scanners/gas_analyzer.dm | 2 +-
code/game/objects/structures/aliens.dm | 6 +-
code/game/objects/structures/bonfire.dm | 6 +-
.../crates_lockers/closets/bodybag.dm | 5 +-
code/game/objects/structures/mineral_doors.dm | 2 +
code/game/objects/structures/plasticflaps.dm | 4 +-
.../transit_tubes/transit_tube_pod.dm | 5 +-
.../objects/structures/windoor_assembly.dm | 4 +-
code/game/turfs/change_turf.dm | 66 ++++++++++++++-----
code/game/turfs/closed/_closed.dm | 3 +-
code/game/turfs/closed/wall/mineral_walls.dm | 2 +-
code/game/turfs/closed/walls.dm | 2 +-
code/modules/admin/verbs/fix_air.dm | 17 +++--
code/modules/atmospherics/ZAS/Turf.dm | 2 +
code/modules/atmospherics/ZAS/XGM/gas_data.dm | 10 +++
.../atmospherics/machinery/airalarm.dm | 1 -
code/modules/cargo/bounties/engineering.dm | 4 +-
code/modules/cargo/exports/large_objects.dm | 6 +-
code/modules/cargo/packs.dm | 13 ++--
code/modules/unit_tests/gas_transfer.dm | 13 ++--
24 files changed, 127 insertions(+), 72 deletions(-)
diff --git a/code/__DEFINES/atmospherics/ZAS.dm b/code/__DEFINES/atmospherics/ZAS.dm
index 364158806bf..326f7f63016 100644
--- a/code/__DEFINES/atmospherics/ZAS.dm
+++ b/code/__DEFINES/atmospherics/ZAS.dm
@@ -198,6 +198,19 @@ var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
#define ZONE_ACTIVE 1
#define ZONE_SLEEPING 0
+//OPEN TURF ATMOS
+/// the default air mix that open turfs spawn
+#define OPENTURF_DEFAULT_ATMOS list(GAS_OXYGEN=MOLESO2ATMOS, GAS_NITROGEN=MOLESN2ATMOS)
+//#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15"
+/// -193,15°C telecommunications. also used for xenobiology slime killrooms
+//#define TCOMMS_ATMOS "n2=100;TEMP=80"
+/// space
+#define AIRLESS_ATMOS list()
+/// -93.15°C snow and ice turfs
+//#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180"
+/// -14°C kitchen coldroom, just might loss your tail; higher amount of mol to reach about 101.3 kpA
+//#define KITCHEN_COLDROOM_ATMOS "o2=26;n2=97;TEMP=[COLD_ROOM_TEMP]"
+
// Defines how much of certain gas do the Atmospherics tanks start with. Values are in kpa per tile (assuming 20C)
#define ATMOSTANK_NITROGEN 90000 // A lot of N2 is needed to produce air mix, that's why we keep 90MPa of it
#define ATMOSTANK_OXYGEN 50000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it.
diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm
index 8096870697e..5367666877e 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -41,6 +41,7 @@
/obj/effect/proc_holder/spell/targeted/olfaction/cast(list/targets, mob/living/user = usr)
//can we sniff? is there miasma in the air?
+ /*
var/datum/gas_mixture/air = user.loc.return_air()
var/list/cached_gases = air.gases
@@ -48,7 +49,7 @@
user.adjust_disgust(sensitivity * 45)
to_chat(user, span_warning("With your overly sensitive nose, you get a whiff of stench and feel sick! Try moving to a cleaner area!"))
return
-
+ */.
var/atom/sniffed = user.get_active_held_item()
if(sniffed)
var/old_target = tracking_target
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 0faa180d74f..957717fa2d5 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -113,7 +113,9 @@
var/gas_type = "o2"
/obj/effect/mine/gas/mineEffect(mob/victim)
- atmos_spawn_air("[gas_type]=[gas_amount]")
+ if(isopenturf(loc))
+ var/turf/open/openloc = loc
+ openloc.atmos_spawn_air(gas_type, gas_amount)
/obj/effect/mine/gas/plasma
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index a2ef23449fc..f91cba16e89 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -447,7 +447,7 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += "Unable to obtain a reading.
"
else
var/datum/gas_mixture/environment = T.return_air()
- var/list/env_gases = environment.gases
+ var/list/env_gases = environment.get_gases()
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles()
@@ -456,9 +456,9 @@ GLOBAL_LIST_EMPTY(PDAs)
if (total_moles)
for(var/id in env_gases)
- var/gas_level = env_gases[id][MOLES]/total_moles
+ var/gas_level = environment.get_gas(id)/total_moles
if(gas_level > 0)
- dat += "[env_gases[id][GAS_META][META_GAS_NAME]]: [round(gas_level*100, 0.01)]%
"
+ dat += "[env_gases[id]]: [round(gas_level*100, 0.01)]%
"
dat += "Temperature: [round(environment.temperature-T0C)]°C
"
dat += "
"
diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm
index 997d0da6585..3f2f88e3f6c 100644
--- a/code/game/objects/items/devices/scanners/gas_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm
@@ -160,7 +160,7 @@
var/list/cached_gases = air.gas
for(var/id in cached_gases)
- var/gas_concentration = air.get_total_moles(gas_id)/total_moles
+ var/gas_concentration = air.get_gas(id)/total_moles
message += span_notice("[id]: [round(air.get_gas(id), 0.01)] mol ([round(gas_concentration*100, 0.01)] %)")
message += span_notice("Temperature: [round(temperature - T0C,0.01)] °C ([round(temperature, 0.01)] K)")
message += span_notice("Volume: [volume] L")
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index d025218944f..07c969e0739 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -73,12 +73,12 @@
/obj/structure/alien/resin/Destroy()
//air_update_turf(TRUE, FALSE)
. = ..()
-
+/*
/obj/structure/alien/resin/Move()
var/turf/T = loc
. = ..()
move_update_air(T)
-
+*/
/obj/structure/alien/resin/wall
name = "resin wall"
desc = "Thick resin solidified into a wall."
@@ -202,7 +202,7 @@
qdel(src)
return
//lets try to grow in a direction
- for(var/turf/check_turf in src_turf.get_atmos_adjacent_turfs())
+ for(var/turf/check_turf in src_turf.get_adjacent_open_turfs())
//we cannot grow on blacklisted turfs
if(is_type_in_list(check_turf, blacklisted_turfs))
continue
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 6bfb760817f..916c42c01e8 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -98,9 +98,9 @@
/obj/structure/bonfire/proc/check_oxygen()
if(isopenturf(loc))
var/turf/open/bonfire_turf = loc
- if(bonfire_turf.air)
- var/loc_gases = bonfire_turf.air.gases
- if(loc_gases[/datum/gas/oxygen] && loc_gases[/datum/gas/oxygen][MOLES] >= 5)
+ var/datum/gas_mixture/local_gas = bonfire_turf.return_air()
+ if(local_gas)
+ if(local_gas.has_gas(GAS_OXYGEN, 5))
return TRUE
return FALSE
diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
index 8aa3ce169af..9ee3e118680 100644
--- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm
+++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
@@ -325,9 +325,8 @@
air_contents = new(50) //liters
air_contents.temperature = T20C
- air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide)
- air_contents.gases[/datum/gas/oxygen][MOLES] = (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ air_contents.adjust_gas(GAS_OXYGEN, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD)
+ air_contents.adjust_gas(GAS_N2O, (ONE_ATMOSPHERE*50)/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD)
/obj/structure/closet/body_bag/environmental/prisoner/syndicate/Destroy()
if(air_contents)
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 1f49ac6602a..5b255b11866 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -43,8 +43,10 @@
/obj/structure/mineral_door/Move()
var/turf/T = loc
. = ..()
+ /*
if(!door_opened)
move_update_air(T)
+ */
/obj/structure/mineral_door/Bumped(atom/movable/AM)
..()
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 7de6274d8e1..cab6be77908 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -115,8 +115,10 @@
. = ..()
//air_update_turf(TRUE, TRUE)
+/*
/obj/structure/plasticflaps/Destroy()
var/atom/oldloc = loc
. = ..()
if (oldloc)
- oldloc.//air_update_turf(TRUE, FALSE)
+ oldloc./air_update_turf(TRUE, FALSE)
+*/
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index 1d1d5028d00..d26ff609d11 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -14,9 +14,8 @@
/obj/structure/transit_tube_pod/Initialize(mapload)
. = ..()
- air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
- air_contents.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD
- air_contents.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD
+ air_contents.adjust_gas(GAS_OXYGEN, MOLES_O2STANDARD)
+ air_contents.adjust_gas(GAS_NITROGEN, MOLES_N2STANDARD)
air_contents.temperature = T20C
/obj/structure/transit_tube_pod/Destroy()
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index ef5b5541cd5..7354b182b93 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -46,12 +46,12 @@
set_density(FALSE)
//air_update_turf(TRUE, FALSE)
return ..()
-
+/*
/obj/structure/windoor_assembly/Move()
var/turf/T = loc
. = ..()
move_update_air(T)
-
+*/
/obj/structure/windoor_assembly/update_icon_state()
icon_state = "[facing]_[secure ? "secure_" : ""]windoor_assembly[state]"
return ..()
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index 544ee271a55..1671adb019a 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -15,8 +15,8 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
if(turf_type)
var/turf/newT = ChangeTurf(turf_type, baseturf_type, flags)
- SSair.remove_from_active(newT)
- CALCULATE_ADJACENT_TURFS(newT, KILL_EXCITED)
+ SSzas.mark_for_update(newT)
+ //CALCULATE_ADJACENT_TURFS(newT, KILL_EXCITED)
/turf/proc/copyTurf(turf/T)
if(T.type != type)
@@ -82,6 +82,15 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
var/old_bp = blueprint_data
blueprint_data = null
+ if(connections) connections.erase_all()
+
+ if(istype(src,/turf/simulated))
+ //Yeah, we're just going to rebuild the whole thing.
+ //Despite this being called a bunch during explosions,
+ //the zone will only really do heavy lifting once.
+ var/turf/simulated/S = src
+ if(S.zone) S.zone.rebuild()
+
var/list/old_baseturfs = baseturfs
var/old_type = type
@@ -95,6 +104,8 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
var/list/old_signal_procs = signal_procs?.Copy()
var/turf/W = new path(src)
+ SSzas.mark_for_update(src) //handle the addition of the new turf.
+
// WARNING WARNING
// Turfs DO NOT lose their signals when they get replaced, REMEMBER THIS
// It's possible because turfs are fucked, and if you have one in a list and it's replaced with another one, the list ref points to the new turf
@@ -150,32 +161,22 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
return W
+/*
/turf/open/ChangeTurf(path, list/new_baseturfs, flags) //Resist the temptation to make this default to keeping air.
if ((flags & CHANGETURF_INHERIT_AIR) && ispath(path, /turf/open))
var/datum/gas_mixture/stashed_air = new()
stashed_air.copy_from(air)
- var/stashed_state = excited
- var/datum/excited_group/stashed_group = excited_group
. = ..() //If path == type this will return us, don't bank on making a new type
if (!.) // changeturf failed or didn't do anything
return
var/turf/open/newTurf = .
newTurf.air.copy_from(stashed_air)
- newTurf.excited = stashed_state
- newTurf.excited_group = stashed_group
- #ifdef VISUALIZE_ACTIVE_TURFS
- if(stashed_state)
- newTurf.add_atom_colour(COLOR_VIBRANT_LIME, TEMPORARY_COLOUR_PRIORITY)
- #endif
- if(stashed_group)
- if(stashed_group.should_display || SSair.display_all_groups)
- stashed_group.display_turf(newTurf)
+ SSzas.mark_for_update(newTurf)
else
- SSair.remove_from_active(src) //Clean up wall excitement, and refresh excited groups
if(ispath(path,/turf/closed) || ispath(path,/turf/cordon))
flags |= CHANGETURF_RECALC_ADJACENT
return ..()
-
+*/
/// Take off the top layer turf and replace it with the next baseturf down
/turf/proc/ScrapeAway(amount=1, flags)
if(!amount)
@@ -296,12 +297,12 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
//If you modify this function, ensure it works correctly with lateloaded map templates.
/turf/proc/AfterChange(flags, oldType) //called after a turf has been replaced in ChangeTurf()
levelupdate()
- if(flags & CHANGETURF_RECALC_ADJACENT)
+ /*if(flags & CHANGETURF_RECALC_ADJACENT)
immediate_calculate_adjacent_turfs()
if(ispath(oldType, /turf/closed) && istype(src, /turf/open))
SSair.add_to_active(src)
else //In effect, I want closed turfs to make their tile active when sheered, but we need to queue it since they have no adjacent turfs
- CALCULATE_ADJACENT_TURFS(src, (!(ispath(oldType, /turf/closed) && istype(src, /turf/open)) ? NORMAL_TURF : MAKE_ACTIVE))
+ CALCULATE_ADJACENT_TURFS(src, (!(ispath(oldType, /turf/closed) && istype(src, /turf/open)) ? NORMAL_TURF : MAKE_ACTIVE))*/
//update firedoor adjacency
var/list/turfs_to_check = get_adjacent_open_turfs(src) | src
for(var/I in turfs_to_check)
@@ -318,6 +319,35 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
Assimilate_Air()
//////Assimilate Air//////
+/turf/open/proc/Assimilate_Air()
+ var/list/turf/turf_list = get_adjacent_open_turfs()
+ var/turf_count = LAZYLEN(turf_list)
+ if(blocks_air || !turf_count)
+ return
+ var/datum/gas_mixture/total = new
+ var/list/total_gases = total.gas
+ turf_list += src
+ turf_count += 1
+ var/energy = 0
+ var/heat_cap = 0
+ for(var/turf/T in turf_list)
+ var/datum/gas_mixture/turf_mix = T.air
+ var/capacity = turf_mix.heat_capacity()
+ energy += turf_mix.temperature * capacity
+ heat_cap += capacity
+
+ var/list/giver_gases = turf_mix.gas
+ for(var/giver_id in giver_gases)
+ total_gases[giver_id] = giver_gases[giver_id]
+
+ total.temperature = energy / heat_cap
+ for(var/id in total_gases)
+ total_gases[id] /= turf_count
+
+ for(var/turf/T as anything in turf_list)
+ T.air.copy_from(total)
+ SSzas.mark_for_update(T)
+/*
/turf/open/proc/Assimilate_Air()
var/turf_count = LAZYLEN(atmos_adjacent_turfs)
if(blocks_air || !turf_count) //if there weren't any open turfs, no need to update.
@@ -355,7 +385,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
T.air.copy_from(total)
T.update_visuals()
SSair.add_to_active(T)
-
+*/
/turf/proc/ReplaceWithLattice()
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
new /obj/structure/lattice(locate(x, y, z))
diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm
index 7555793bb0c..ab242277f66 100644
--- a/code/game/turfs/closed/_closed.dm
+++ b/code/game/turfs/closed/_closed.dm
@@ -6,10 +6,11 @@
blocks_air = TRUE
rad_insulation = RAD_MEDIUM_INSULATION
pass_flags_self = PASSCLOSEDTURF
-
+/*
/turf/closed/AfterChange()
. = ..()
SSair.high_pressure_delta -= src
+*/
/turf/closed/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
return FALSE
diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm
index 67fc5685339..cff9015aa77 100644
--- a/code/game/turfs/closed/wall/mineral_walls.dm
+++ b/code/game/turfs/closed/wall/mineral_walls.dm
@@ -128,7 +128,7 @@
icon_state = "plasma_wall-0"
base_icon_state = "plasma_wall"
sheet_type = /obj/item/stack/sheet/mineral/plasma
- thermal_conductivity = 0.04
+ //thermal_conductivity = 0.04
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS)
canSmoothWith = list(SMOOTH_GROUP_PLASMA_WALLS)
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index 956fd09768b..d6cfdd3e1b6 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -10,7 +10,7 @@
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 62500 //a little over 5 cm thick , 62500 for 1 m by 2.5 m by 0.25 m iron wall. also indicates the temperature at wich the wall will melt (currently only able to melt with H/E pipes)
-
+ blocks_air = TRUE
baseturfs = /turf/open/floor/plating
flags_ricochet = RICOCHET_HARD
diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm
index 67f0f737e03..2faf3321614 100644
--- a/code/modules/admin/verbs/fix_air.dm
+++ b/code/modules/admin/verbs/fix_air.dm
@@ -9,19 +9,18 @@
return
log_admin("Full atmosphere reset initiated by [usr].")
- to_world("Initiating restart of atmosphere. The server may lag a bit.")
+ to_chat(world, "Initiating restart of atmosphere. The server may lag a bit.")
sleep(10)
var/current_time = world.timeofday
// Depower the supermatter, as it would quickly blow up once we remove all gases from the pipes.
- for(var/obj/machinery/power/supermatter/S in SSmachines.machinery)
+ for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines)
S.power = 0
to_chat(usr, "\[1/5\] - Supermatter depowered")
// Remove all gases from all pipenets
- for(var/net in SSmachines.pipenets)
- var/datum/pipe_network/PN = net
- for(var/datum/gas_mixture/G in PN.gases)
+ for(var/datum/pipeline/PN as anything in SSzas.networks)
+ for(var/datum/gas_mixture/G in PN.air & PN.other_airs)
G.gas = list()
G.update_values()
@@ -34,8 +33,8 @@
to_chat(usr, "\[3/5\] - All ZAS Zones removed.")
var/list/unsorted_overlays = list()
- for(var/id in gas_data.tile_overlay)
- unsorted_overlays |= gas_data.tile_overlay[id]
+ for(var/id in xgm_gas_data.tile_overlay)
+ unsorted_overlays |= xgm_gas_data.tile_overlay[id]
for(var/turf/simulated/T in world)
T.air = null
@@ -44,7 +43,7 @@
to_chat(usr, "\[4/5\] - All turfs reset to roundstart values.")
- SSair.reboot()
+ SSzas.Reboot()
to_chat(usr, "\[5/5\] - ZAS Rebooted")
- to_world("Atmosphere restart completed in [(world.timeofday - current_time)/10] seconds.")
+ to_chat(world, "Atmosphere restart completed in [(world.timeofday - current_time)/10] seconds.")
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index 5ae5dade602..54c3b091f3c 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -7,6 +7,8 @@
var/datum/gas_mixture/air
var/list/initial_gas
var/heat_capacity = 1
+ var/thermal_conductivity = 0.05
+ var/list/initial_gas_mix
/turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null)
if(graphic_add && graphic_add.len)
diff --git a/code/modules/atmospherics/ZAS/XGM/gas_data.dm b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
index 0906a8623b8..64885c3c810 100644
--- a/code/modules/atmospherics/ZAS/XGM/gas_data.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
@@ -31,6 +31,11 @@ GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data)
var/list/symbol_html = list()
var/list/symbol = list()
+ //Base sell values
+ var/list/base_value = list()
+ //Purchasable?
+ var/list/purchaseable = list()
+
/datum/xgm_gas
var/id = ""
var/name = "Unnamed Gas"
@@ -49,6 +54,8 @@ GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data)
var/hidden_from_codex
var/symbol_html = "X"
var/symbol = "X"
+ var/base_value = 1
+ var/purchaseable = FALSE
/datum/xgm_gas_data/New()
for(var/p in subtypesof(/datum/xgm_gas))
@@ -78,6 +85,9 @@ GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data)
xgm_gas_data.breathed_product[gas.id] = gas.breathed_product
xgm_gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
+ xgm_gas_data.base_value[gas.id] = gas.base_value
+ xgm_gas_data.purchaseable[gas.id] = gas.purchaseable
+
return 1
/obj/effect/gas_overlay
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index c82ce10a04c..61edb735bfd 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -916,7 +916,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
var/datum/port/input/request_data
var/datum/port/output/pressure
- var/datum/port/output/temperature
var/datum/port/output/gas_amount
var/obj/machinery/airalarm/connected_alarm
diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm
index c3216543b63..258133aea57 100644
--- a/code/modules/cargo/bounties/engineering.dm
+++ b/code/modules/cargo/bounties/engineering.dm
@@ -11,9 +11,9 @@
return FALSE
var/obj/item/tank/T = O
var/datum/gas_mixture/our_mix = T.return_air()
- if(!our_mix.gases[gas_type])
+ if(!our_mix.get_gas(gas_type))
return FALSE
- return our_mix.gases[gas_type][MOLES] >= moles_required
+ return our_mix.get_gas(gas_type) >= moles_required
/datum/bounty/item/engineering/gas/nitrium_tank
name = "Full Tank of Nitrium"
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index 885aa0b1a12..e26ec5efd3a 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -110,10 +110,10 @@
for(var/gasID in gases_to_check)
if(canister_mix.get_gas(gasID) > 0)
- worth += get_gas_value(gasID, canister_gas.get_gas(gasID))
+ worth += get_gas_value(gasID, canister_mix.get_gas(gasID))
return worth
-/datum/export/large/gas_canister/proc/get_gas_value(datum/gas/gasType, moles)
- var/baseValue = initial(gasType.base_value)
+/datum/export/large/gas_canister/proc/get_gas_value(gastype, moles)
+ var/baseValue = xgm_gas_data.base_value[gastype]
return round((baseValue/k_elasticity) * (1 - NUM_E**(-1 * k_elasticity * moles)))
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index d7a31b3ace2..7370fbc4fb5 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1111,25 +1111,24 @@
// This is the amount of moles in a default canister
var/moleCount = (initial(fakeCanister.maximum_pressure) * initial(fakeCanister.filled)) * initial(fakeCanister.volume) / (R_IDEAL_GAS_EQUATION * T20C)
- for(var/gasType in GLOB.meta_gas_info)
- var/datum/gas/gas = gasType
- var/name = initial(gas.name)
- if(!initial(gas.purchaseable))
+ for(var/gasType in xgm_gas_data.gases)
+ var/name = xgm_gas_data.name[gasType]
+ if(!xgm_gas_data.purchaseable[gasType])
continue
var/datum/supply_pack/materials/pack = new
pack.name = "[name] Canister"
pack.desc = "Contains a canister of [name]."
- if(initial(gas.dangerous))
+ if(xgm_gas_data.flags[gasType] & XGM_GAS_FUEL)
pack.desc = "[pack.desc] Requires Atmospherics access to open."
pack.access = ACCESS_ATMOSPHERICS
pack.access_view = ACCESS_ATMOSPHERICS
pack.crate_name = "[name] canister crate"
pack.id = "[type]([name])"
- pack.cost = cost + moleCount * initial(gas.base_value) * 1.6
+ pack.cost = cost + moleCount * xgm_gas_data.base_value[gasType] * 1.6
pack.cost = CEILING(pack.cost, 10)
- pack.contains = list(GLOB.gas_id_to_canister[initial(gas.id)])
+ pack.contains = list(GLOB.gas_id_to_canister[gasType])
pack.crate_type = crate_type
diff --git a/code/modules/unit_tests/gas_transfer.dm b/code/modules/unit_tests/gas_transfer.dm
index 32f973d7244..097a9a5efdb 100644
--- a/code/modules/unit_tests/gas_transfer.dm
+++ b/code/modules/unit_tests/gas_transfer.dm
@@ -8,24 +8,21 @@
first_mix.volume = 200
second_mix.volume = 200
-
- ASSERT_GAS(/datum/gas/hypernoblium, first_mix)
- ASSERT_GAS(/datum/gas/tritium, second_mix)
- first_mix.gases[/datum/gas/hypernoblium][MOLES] = tempNmoles
- second_mix.gases[/datum/gas/tritium][MOLES] = 200
+ first_mix.adjust_gas(GAS_OXYGEN, tempNmoles)
+ second_mix.adjust_gas(GAS_NITROGEN, 200)
first_mix.temperature = tempNmoles
second_mix.temperature = T20C
var/initial_pressure = second_mix.return_pressure()
// A constant value would be nicer but there will be cases when even MOLAR_ACCURACY amounts would far exceed the pressure so we need to scale it somewhat.
var/additional_pressure = (tempNmoles / 1000) + 500
-
+
/* ERROR MARGIN CALCULATION
* We calculate how much would the pressure change if MOLAR_ACCURACY amount of hothotgas is imparted on the cold mix.
* This number gets really big for very high temperatures so it's somewhat meaningless, but our main goal is to ensure the code doesn't break.
- */
+ */
var/error_margin = first_mix.gas_pressure_minimum_transfer(second_mix) - initial_pressure
-
+
first_mix.pump_gas_to(second_mix, (initial_pressure + additional_pressure))
var/margin = abs(second_mix.return_pressure() - (initial_pressure+additional_pressure))
From ed898121239309dd976f937be1b8f60ee662d9bb Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Sun, 17 Apr 2022 17:45:33 -0400
Subject: [PATCH 006/200] Co-authored-by: Gallyus
---
code/__DEFINES/atmospherics/ZAS.dm | 49 ++------
code/__DEFINES/atmospherics/atmos_helpers.dm | 5 +-
.../atmospherics/atmos_mapping_helpers.dm | 4 +-
code/__HELPERS/zas.dm | 27 +++++
.../subsystem/processing/processing.dm | 2 +-
code/datums/components/crafting/recipes.dm | 19 +--
.../circuitboards/machine_circuitboards.dm | 109 +++++++++---------
.../objects/items/grenades/atmos_grenades.dm | 7 +-
code/game/turfs/closed/minerals.dm | 16 +--
code/game/turfs/open/_open.dm | 5 +-
code/game/turfs/open/asteroid.dm | 4 +-
code/game/turfs/open/floor/fancy_floor.dm | 2 +-
code/game/turfs/open/floor/iron_floor.dm | 12 +-
code/game/turfs/open/floor/misc_floor.dm | 5 +-
.../turfs/open/floor/plating/misc_plating.dm | 2 +-
code/game/turfs/open/floor/reinf_floor.dm | 23 ++--
code/game/turfs/open/ice.dm | 2 +-
code/game/turfs/open/snow.dm | 2 +-
code/game/turfs/open/space/space.dm | 4 +-
code/game/turfs/turf.dm | 1 -
.../traitor/equipment/Malf_Modules.dm | 12 +-
code/modules/atmospherics/ZAS/Turf.dm | 6 +-
code/modules/atmospherics/ZAS/XGM/gases.dm | 2 +-
.../atmospherics/ZAS/XGM/xgm_gas_mixture.dm | 19 +++
.../environmental/LINDA_system.dm | 2 +-
.../atmospherics/machinery/components/tank.dm | 2 +-
.../machinery/portable/canister.dm | 62 +++++-----
.../machinery/portable/scrubber.dm | 3 +-
.../awaymissions/mission_code/snowdin.dm | 4 +-
code/modules/clothing/masks/gas_filter.dm | 49 +++-----
code/modules/clothing/under/accessories.dm | 3 +-
code/modules/events/spacevine.dm | 20 ++--
code/modules/flufftext/Hallucination.dm | 2 +-
code/modules/holodeck/area_copy.dm | 3 +-
code/modules/holodeck/turfs.dm | 4 +-
code/modules/mapping/map_template.dm | 2 +-
code/modules/mob/camera/camera.dm | 4 +-
code/modules/mob/living/carbon/alien/life.dm | 16 +--
.../carbon/human/species_types/plasmamen.dm | 8 +-
code/modules/mob/living/carbon/life.dm | 28 ++---
code/modules/mob/living/life.dm | 2 +-
code/modules/mob/living/living.dm | 4 +-
.../mob/living/simple_animal/bot/bot.dm | 2 +-
.../mob/living/simple_animal/bot/firebot.dm | 2 +-
.../mob/living/simple_animal/hostile/tree.dm | 8 +-
.../mob/living/simple_animal/simple_animal.dm | 13 +--
.../mob/living/simple_animal/slime/life.dm | 4 +-
code/modules/mob/mob.dm | 7 +-
code/modules/mod/modules/modules_timeline.dm | 5 +-
.../file_system/programs/atmosscan.dm | 4 +-
code/modules/power/generator.dm | 4 +-
.../projectile/bullets/revolver.dm | 2 +-
code/modules/reagents/chem_splash.dm | 4 +-
.../research/ordnance/tank_compressor.dm | 10 +-
code/modules/shuttle/on_move.dm | 2 +-
code/modules/vehicles/mecha/_mecha.dm | 4 +-
tgstation.dme | 1 +
57 files changed, 320 insertions(+), 309 deletions(-)
create mode 100644 code/__HELPERS/zas.dm
diff --git a/code/__DEFINES/atmospherics/ZAS.dm b/code/__DEFINES/atmospherics/ZAS.dm
index 326f7f63016..95bb23b2daf 100644
--- a/code/__DEFINES/atmospherics/ZAS.dm
+++ b/code/__DEFINES/atmospherics/ZAS.dm
@@ -200,9 +200,11 @@ var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
//OPEN TURF ATMOS
/// the default air mix that open turfs spawn
-#define OPENTURF_DEFAULT_ATMOS list(GAS_OXYGEN=MOLESO2ATMOS, GAS_NITROGEN=MOLESN2ATMOS)
+#define OPENTURF_DEFAULT_ATMOS list(GAS_OXYGEN = MOLES_O2ATMOS, GAS_NITROGEN=MOLES_N2ATMOS)
+#define OPENTURF_LOW_PRESSURE list(GAS_OXYGEN = 14, GAS_NITROGEB = 30)
//#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15"
/// -193,15°C telecommunications. also used for xenobiology slime killrooms
+#define TCOMMS_ATMOS list(GAS_NITROGEN = 100)
//#define TCOMMS_ATMOS "n2=100;TEMP=80"
/// space
#define AIRLESS_ATMOS list()
@@ -212,14 +214,15 @@ var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
//#define KITCHEN_COLDROOM_ATMOS "o2=26;n2=97;TEMP=[COLD_ROOM_TEMP]"
// Defines how much of certain gas do the Atmospherics tanks start with. Values are in kpa per tile (assuming 20C)
-#define ATMOSTANK_NITROGEN 90000 // A lot of N2 is needed to produce air mix, that's why we keep 90MPa of it
-#define ATMOSTANK_OXYGEN 50000 // O2 is also important for airmix, but not as much as N2 as it's only 21% of it.
-#define ATMOSTANK_CO2 60000 // CO2 is used for the GUP, Charon, and Torch as the primary fuel propellant, and we need lots to stick around.
-#define ATMOSTANK_PLASMA 25000
-#define ATMOSTANK_PLASMA_FUEL 15000
-#define ATMOSTANK_HYDROGEN 50000
-#define ATMOSTANK_HYDROGEN_FUEL 25000
-#define ATMOSTANK_NITROUSOXIDE 10000 // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
+#define ATMOSTANK_NITROGEN list(GAS_NITROGEN = 90000) // A lot of N2 is needed to produce air mix, that's why we keep 90MPa of it
+#define ATMOSTANK_OXYGEN list(GAS_OXYGEN = 50000) // O2 is also important for airmix, but not as much as N2 as it's only 21% of it.
+#define ATMOSTANK_CO2 list(GAS_CO2 = 60000) // CO2 is used for the GUP, Charon, and Torch as the primary fuel propellant, and we need lots to stick around.
+#define ATMOSTANK_PLASMA list(GAS_PHORON = 25000)
+#define ATMOSTANK_PLASMA_FUEL list(GAS_PHORON = 15000)
+#define ATMOSTANK_HYDROGEN list(GAS_HYDROGEN = 50000)
+#define ATMOSTANK_HYDROGEN_FUEL list(GAS_HYDROGEN = 25000)
+#define ATMOSTANK_NITROUSOXIDE list(GAS_N2O = 10000) // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
+#define ATMOSTANK_AIRMIX list(GAS_OXYGEN = 2644, GAS_NITROGEN = 10580)
#define MAX_PUMP_PRESSURE 15000 // Maximal pressure setting for pumps and vents
#define MAX_OMNI_PRESSURE 15000 // Maximal output(s) pressure for omni devices (filters/mixers)
@@ -264,31 +267,3 @@ GLOBAL_LIST_INIT(reverse_dir, list( // reverse_dir[dir] = reverse of dir
#define ATMOS_DEFAULT_VOLUME_FILTER 500 // L.
#define ATMOS_DEFAULT_VOLUME_MIXER 500 // L.
#define ATMOS_DEFAULT_VOLUME_PIPE 70 // L.
-
-// heat2color functions. Adapted from: http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
-/proc/heat2color(temp)
- return rgb(heat2color_r(temp), heat2color_g(temp), heat2color_b(temp))
-
-/proc/heat2color_r(temp)
- temp /= 100
- if(temp <= 66)
- . = 255
- else
- . = max(0, min(255, 329.698727446 * (temp - 60) ** -0.1332047592))
-
-/proc/heat2color_g(temp)
- temp /= 100
- if(temp <= 66)
- . = max(0, min(255, 99.4708025861 * log(temp) - 161.1195681661))
- else
- . = max(0, min(255, 288.1221695283 * ((temp - 60) ** -0.0755148492)))
-
-/proc/heat2color_b(temp)
- temp /= 100
- if(temp >= 66)
- . = 255
- else
- if(temp <= 16)
- . = 0
- else
- . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307))
diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm
index 20679527175..1ad834b85eb 100644
--- a/code/__DEFINES/atmospherics/atmos_helpers.dm
+++ b/code/__DEFINES/atmospherics/atmos_helpers.dm
@@ -31,7 +31,7 @@
#define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity())
///Directly adds a gas to a gas mixture without checking for its presence beforehand, use only if is certain the absence of said gas
-#define ADD_GAS(gas_id, out_list)\
+//#define ADD_GAS(gas_id, out_list)\
var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id]; out_list[gas_id] = tmp_gaslist.Copy();
///Adds a gas to a gas mixture but checks if is already present, faster than the same proc
@@ -57,9 +57,6 @@ GLOBAL_LIST_INIT(nonoverlaying_gases, typecache_of_gases_with_no_overlays())
var/_GAS_OVERLAY = _GAS_META[META_GAS_OVERLAY];\
out_var += _GAS_OVERLAY[min(TOTAL_VISIBLE_STATES, CEILING(_GAS[MOLES] / MOLES_GAS_VISIBLE_STEP, 1))];\
}
-#define GAS_OVERLAYS(gases, outvar)\
- out_var = list();\
- for(var/_ID in gases)
#ifdef TESTING
GLOBAL_LIST_INIT(atmos_adjacent_savings, list(0,0))
#define CALCULATE_ADJACENT_TURFS(T, state) if (SSair.adjacent_rebuild[T]) { GLOB.atmos_adjacent_savings[1] += 1 } else { GLOB.atmos_adjacent_savings[2] += 1; SSair.adjacent_rebuild[T] = state}
diff --git a/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm b/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm
index 94517b21795..d84e3877269 100644
--- a/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm
+++ b/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm
@@ -1,4 +1,4 @@
-//OPEN TURF ATMOS
+/*//OPEN TURF ATMOS
/// the default air mix that open turfs spawn
#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15"
#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15"
@@ -35,7 +35,7 @@
#define ATMOS_TANK_HELIUM "helium=100000;TEMP=293.15"
#define ATMOS_TANK_ANTINOBLIUM "antinoblium=100000;TEMP=293.15"
#define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15"
-
+*/
//LAVALAND
/// what pressure you have to be under to increase the effect of equipment meant for lavaland
#define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50
diff --git a/code/__HELPERS/zas.dm b/code/__HELPERS/zas.dm
new file mode 100644
index 00000000000..cf159d36c00
--- /dev/null
+++ b/code/__HELPERS/zas.dm
@@ -0,0 +1,27 @@
+// heat2color functions. Adapted from: http://www.tannerhelland.com/4435/convert-temperature-rgb-algorithm-code/
+/proc/heat2color(temp)
+ return rgb(heat2color_r(temp), heat2color_g(temp), heat2color_b(temp))
+
+/proc/heat2color_r(temp)
+ temp /= 100
+ if(temp <= 66)
+ . = 255
+ else
+ . = max(0, min(255, 329.698727446 * (temp - 60) ** -0.1332047592))
+
+/proc/heat2color_g(temp)
+ temp /= 100
+ if(temp <= 66)
+ . = max(0, min(255, 99.4708025861 * log(temp) - 161.1195681661))
+ else
+ . = max(0, min(255, 288.1221695283 * ((temp - 60) ** -0.0755148492)))
+
+/proc/heat2color_b(temp)
+ temp /= 100
+ if(temp >= 66)
+ . = 255
+ else
+ if(temp <= 16)
+ . = 0
+ else
+ . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307))
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 8d59e8318ea..665f4915f42 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -9,7 +9,7 @@ SUBSYSTEM_DEF(processing)
var/stat_tag = "P" //Used for logging
var/list/processing = list()
var/list/currentrun = list()
- var/const/process_proc = /datum/proc/Process //Francinum is going to KILL ME
+ var/const/process_proc = /datum/proc/process //Francinum is going to FUCK ME (Of course I will~)
/datum/controller/subsystem/processing/stat_entry(msg)
msg = "[stat_tag]:[length(processing)]"
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index b74eee0faf3..8354f718661 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -1228,15 +1228,16 @@
)
category = CAT_MISC
-/datum/crafting_recipe/bluespace_vendor_mount
- name = "Bluespace Vendor Wall Mount"
- result = /obj/item/wallframe/bluespace_vendor_mount
- time = 6 SECONDS
- reqs = list(/obj/item/stack/sheet/iron = 15,
- /obj/item/stack/sheet/glass = 10,
- /obj/item/stack/cable_coil = 10,
- )
- category = CAT_MISC
+//We'll fix you if we're forced to. Nobody will miss you.
+// /datum/crafting_recipe/bluespace_vendor_mount
+// name = "Bluespace Vendor Wall Mount"
+// result = /obj/item/wallframe/bluespace_vendor_mount
+// time = 6 SECONDS
+// reqs = list(/obj/item/stack/sheet/iron = 15,
+// /obj/item/stack/sheet/glass = 10,
+// /obj/item/stack/cable_coil = 10,
+// )
+// category = CAT_MISC
/datum/crafting_recipe/shutters
name = "Shutters"
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index a686a22745b..2c46da75401 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -288,60 +288,61 @@
. = ..()
. += span_notice("It is set to layer [pipe_layer].")
-/obj/item/circuitboard/machine/HFR_fuel_input
- name = "HFR Fuel Input (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/atmospherics/components/unary/hypertorus/fuel_input
- req_components = list(
- /obj/item/stack/sheet/plasteel = 5)
-
-/obj/item/circuitboard/machine/HFR_waste_output
- name = "HFR Waste Output (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/atmospherics/components/unary/hypertorus/waste_output
- req_components = list(
- /obj/item/stack/sheet/plasteel = 5)
-
-/obj/item/circuitboard/machine/HFR_moderator_input
- name = "HFR Moderator Input (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/atmospherics/components/unary/hypertorus/moderator_input
- req_components = list(
- /obj/item/stack/sheet/plasteel = 5)
-
-/obj/item/circuitboard/machine/HFR_core
- name = "HFR core (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/atmospherics/components/unary/hypertorus/core
- req_components = list(
- /obj/item/stack/cable_coil = 10,
- /obj/item/stack/sheet/glass = 10,
- /obj/item/stack/sheet/plasteel = 10)
-
-/obj/item/circuitboard/machine/HFR_corner
- name = "HFR Corner (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/hypertorus/corner
- req_components = list(
- /obj/item/stack/sheet/plasteel = 5)
-
-/obj/item/circuitboard/machine/HFR_interface
- name = "HFR Interface (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/hypertorus/interface
- req_components = list(
- /obj/item/stack/cable_coil = 10,
- /obj/item/stack/sheet/glass = 10,
- /obj/item/stack/sheet/plasteel = 5)
-
-/obj/item/circuitboard/machine/crystallizer
- name = "Crystallizer (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/atmospherics/components/binary/crystallizer
- req_components = list(
- /obj/item/stack/cable_coil = 10,
- /obj/item/stack/sheet/glass = 10,
- /obj/item/stack/sheet/plasteel = 5)
+//FIXME: HYPERGARBAGE DONUT CREATION CODE
+// /obj/item/circuitboard/machine/HFR_fuel_input
+// name = "HFR Fuel Input (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/atmospherics/components/unary/hypertorus/fuel_input
+// req_components = list(
+// /obj/item/stack/sheet/plasteel = 5)
+
+// /obj/item/circuitboard/machine/HFR_waste_output
+// name = "HFR Waste Output (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/atmospherics/components/unary/hypertorus/waste_output
+// req_components = list(
+// /obj/item/stack/sheet/plasteel = 5)
+
+// /obj/item/circuitboard/machine/HFR_moderator_input
+// name = "HFR Moderator Input (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/atmospherics/components/unary/hypertorus/moderator_input
+// req_components = list(
+// /obj/item/stack/sheet/plasteel = 5)
+
+// /obj/item/circuitboard/machine/HFR_core
+// name = "HFR core (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/atmospherics/components/unary/hypertorus/core
+// req_components = list(
+// /obj/item/stack/cable_coil = 10,
+// /obj/item/stack/sheet/glass = 10,
+// /obj/item/stack/sheet/plasteel = 10)
+
+// /obj/item/circuitboard/machine/HFR_corner
+// name = "HFR Corner (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/hypertorus/corner
+// req_components = list(
+// /obj/item/stack/sheet/plasteel = 5)
+
+// /obj/item/circuitboard/machine/HFR_interface
+// name = "HFR Interface (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/hypertorus/interface
+// req_components = list(
+// /obj/item/stack/cable_coil = 10,
+// /obj/item/stack/sheet/glass = 10,
+// /obj/item/stack/sheet/plasteel = 5)
+
+// /obj/item/circuitboard/machine/crystallizer
+// name = "Crystallizer (Machine Board)"
+// greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+// build_path = /obj/machinery/atmospherics/components/binary/crystallizer
+// req_components = list(
+// /obj/item/stack/cable_coil = 10,
+// /obj/item/stack/sheet/glass = 10,
+// /obj/item/stack/sheet/plasteel = 5)
/obj/item/circuitboard/machine/bluespace_sender
name = "Bluespace Sender (Machine Board)"
diff --git a/code/game/objects/items/grenades/atmos_grenades.dm b/code/game/objects/items/grenades/atmos_grenades.dm
index a17fe6e9e32..70df29ce9b6 100644
--- a/code/game/objects/items/grenades/atmos_grenades.dm
+++ b/code/game/objects/items/grenades/atmos_grenades.dm
@@ -39,7 +39,7 @@
playsound(src, 'sound/effects/spray2.ogg', 100, TRUE)
var/list/connected_turfs = detect_room(origin = get_turf(src), max_size = fix_range)
var/datum/gas_mixture/base_mix = new
- base_mix.parse_gas_string(OPENTURF_DEFAULT_ATMOS)
+ base_mix.gas = OPENTURF_DEFAULT_ATMOS
for(var/turf/open/turf_fix in connected_turfs)
if(turf_fix.blocks_air)
continue
@@ -69,7 +69,7 @@
continue
var/distance_from_center = max(get_dist(turf_loc, loc), 1)
var/turf/open/floor_loc = turf_loc
- floor_loc.atmos_spawn_air("n2=[n2_gas_amount / distance_from_center];o2=[o2_gas_amount / distance_from_center];TEMP=273")
+ //floor_loc.atmos_spawn_air("n2=[n2_gas_amount / distance_from_center];o2=[o2_gas_amount / distance_from_center];TEMP=273")
floor_loc.atmos_spawn_air(GAS_NITROGEN, n2_gas_amount/distance_from_center, 273)
floor_loc.atmos_spawn_air(GAS_OXYGEN, o2_gas_amount/distance_from_center, 273)
qdel(src)
@@ -95,7 +95,8 @@
continue
var/distance_from_center = max(get_dist(turf_loc, loc), 1)
var/turf/open/floor_loc = turf_loc
- floor_loc.atmos_spawn_air("n2o=[n2o_gas_amount / distance_from_center];TEMP=273")
+ //floor_loc.atmos_spawn_air("n2o=[n2o_gas_amount / distance_from_center];TEMP=273")
+ floor_loc.atmos_spawn_air(GAS_N2O, n2o_gas_amount/distance_from_center, 273)
qdel(src)
/obj/item/grenade/gas_crystal/crystal_foam
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 1b9815b3827..001b8ff266d 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -134,7 +134,7 @@
var/turf/open/mined = ScrapeAway(null, flags)
addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE)
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
- mined.update_visuals()
+ //mined.update_visuals()
/turf/closed/mineral/attack_animal(mob/living/simple_animal/user, list/modifiers)
if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS))
@@ -357,7 +357,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
turf_type = /turf/open/misc/asteroid/snow/ice
baseturfs = /turf/open/misc/asteroid/snow/ice
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
defer_change = TRUE
/turf/closed/mineral/uranium
@@ -375,7 +375,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
turf_type = /turf/open/misc/asteroid/snow/ice
baseturfs = /turf/open/misc/asteroid/snow/ice
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
defer_change = TRUE
/turf/closed/mineral/gold
@@ -412,7 +412,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
turf_type = /turf/open/misc/asteroid/snow/ice
baseturfs = /turf/open/misc/asteroid/snow/ice
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
defer_change = TRUE
/turf/closed/mineral/bananium
@@ -463,7 +463,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS)
baseturfs = /turf/open/misc/asteroid/snow
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
turf_type = /turf/open/misc/asteroid/snow
defer_change = TRUE
@@ -601,7 +601,7 @@
flags = CHANGETURF_DEFER_CHANGE
var/turf/open/mined = ScrapeAway(null, flags)
addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE)
- mined.update_visuals()
+ //mined.update_visuals()
/turf/closed/mineral/gibtonite/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
@@ -616,7 +616,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
turf_type = /turf/open/misc/asteroid/snow/ice
baseturfs = /turf/open/misc/asteroid/snow/ice
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
defer_change = TRUE
/turf/closed/mineral/gibtonite/ice/icemoon
@@ -660,7 +660,7 @@
var/turf/open/mined = ScrapeAway(null, flags)
addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE)
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
- mined.update_visuals()
+ //mined.update_visuals()
H.mind?.adjust_experience(/datum/skill/mining, 100) //yay!
/turf/closed/mineral/strong/proc/drop_ores()
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 32ee69b0d81..8adc73747e2 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -35,7 +35,7 @@
/turf/open/update_icon()
. = ..()
- update_visuals()
+ //update_visuals()
/turf/open/indestructible
name = "floor"
@@ -160,7 +160,7 @@
icon_state = "bluespace"
blocks_air = TRUE
baseturfs = /turf/open/indestructible/airblock
-
+/*
/turf/open/Initalize_Atmos(times_fired)
excited = FALSE
update_visuals()
@@ -174,6 +174,7 @@
//testing("Active turf found. Return value of compare(): [is_active]")
excited = TRUE
SSair.active_turfs += src
+*/
/turf/open/GetHeatCapacity()
. = air.heat_capacity()
diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm
index 2a0769a1c24..0b5cff08629 100644
--- a/code/game/turfs/open/asteroid.dm
+++ b/code/game/turfs/open/asteroid.dm
@@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
icon_state = "snow"
base_icon_state = "snow"
broken_state = "snow_dug"
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
slowdown = 2
flags_1 = NONE
planetary_atmos = TRUE
@@ -222,7 +222,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
temperature = 180
/turf/open/misc/asteroid/snow/atmosphere
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
planetary_atmos = FALSE
/turf/open/misc/asteroid/snow/standard_air
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index d0be8a5e753..9757cceb226 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -157,7 +157,7 @@
icon_state = "snow"
flags_1 = NONE
floor_tile = null
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
bullet_bounce_sound = null
tiled_dirt = FALSE
diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm
index cafd386c142..af4f1fa0772 100644
--- a/code/game/turfs/open/floor/iron_floor.dm
+++ b/code/game/turfs/open/floor/iron_floor.dm
@@ -31,10 +31,11 @@
/turf/open/floor/iron/telecomms
initial_gas_mix = TCOMMS_ATMOS
+ temperature = 80
/turf/open/floor/iron/icemoon
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
-
+ temperature = 80
/turf/open/floor/iron/edge
icon_state = "floor_edge"
base_icon_state = "floor_edge"
@@ -150,7 +151,7 @@
/turf/open/floor/iron/dark/telecomms
initial_gas_mix = TCOMMS_ATMOS
-
+ temperature = 80
/turf/open/floor/iron/dark/side/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -230,7 +231,7 @@
/turf/open/floor/iron/white/telecomms
initial_gas_mix = TCOMMS_ATMOS
-
+ temperature = 80
/turf/open/floor/iron/white/side/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -306,10 +307,7 @@
/turf/open/floor/iron/kitchen_coldroom
name = "cold room floor"
-
-/turf/open/floor/iron/kitchen_coldroom/Initialize(mapload)
- initial_gas_mix = KITCHEN_COLDROOM_ATMOS
- return ..()
+ temperature = COLD_ROOM_TEMP
/turf/open/floor/iron/kitchen_coldroom/freezerfloor
icon_state = "freezerfloor"
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index bb65ee31383..d92d26dd145 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -38,6 +38,7 @@
/turf/open/floor/circuit/telecomms
initial_gas_mix = TCOMMS_ATMOS
+ temperature = 80
/turf/open/floor/circuit/telecomms/mainframe
name = "mainframe base"
@@ -65,6 +66,7 @@
/turf/open/floor/circuit/green/telecomms
initial_gas_mix = TCOMMS_ATMOS
+ temperature = 80
/turf/open/floor/circuit/green/telecomms/mainframe
name = "mainframe base"
@@ -89,6 +91,7 @@
/turf/open/floor/circuit/red/telecomms
initial_gas_mix = TCOMMS_ATMOS
+ temperature = 80
/turf/open/floor/pod
name = "pod floor"
@@ -213,7 +216,7 @@
AddElement(/datum/element/rust)
/turf/open/floor/plating/plasma
- initial_gas_mix = ATMOS_TANK_PLASMA
+ initial_gas_mix = ATMOSTANK_PLASMA
/turf/open/floor/plating/plasma/rust/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index cad8d5d3c35..e3e2ba87426 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -44,7 +44,7 @@
icon = 'icons/turf/snow.dmi'
icon_state = "snowplating"
base_icon_state = "snowplating"
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
temperature = 180
attachment_holes = FALSE
planetary_atmos = TRUE
diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
index b5c1c3cd71e..4b08509ec6c 100644
--- a/code/game/turfs/open/floor/reinf_floor.dm
+++ b/code/game/turfs/open/floor/reinf_floor.dm
@@ -100,26 +100,27 @@
/turf/open/floor/engine/n2o
article = "an"
name = "\improper N2O floor"
- initial_gas_mix = ATMOS_TANK_N2O
+ initial_gas_mix = ATMOSTANK_NITROUSOXIDE
/turf/open/floor/engine/co2
name = "\improper CO2 floor"
- initial_gas_mix = ATMOS_TANK_CO2
+ initial_gas_mix = ATMOSTANK_CO2
/turf/open/floor/engine/plasma
name = "plasma floor"
- initial_gas_mix = ATMOS_TANK_PLASMA
+ initial_gas_mix = ATMOSTANK_PLASMA
/turf/open/floor/engine/o2
name = "\improper O2 floor"
- initial_gas_mix = ATMOS_TANK_O2
+ initial_gas_mix = ATMOSTANK_OXYGEN
/turf/open/floor/engine/n2
article = "an"
name = "\improper N2 floor"
- initial_gas_mix = ATMOS_TANK_N2
+ initial_gas_mix = ATMOSTANK_NITROGEN
-/turf/open/floor/engine/bz
+
+/*/turf/open/floor/engine/bz
name = "\improper BZ floor"
initial_gas_mix = ATMOS_TANK_BZ
@@ -134,12 +135,13 @@
/turf/open/floor/engine/healium
name = "\improper Healium floor"
initial_gas_mix = ATMOS_TANK_HEALIUM
-
+*/
/turf/open/floor/engine/h2
article = "an"
name = "\improper H2 floor"
- initial_gas_mix = ATMOS_TANK_H2
+ initial_gas_mix = ATMOSTANK_HYDROGEN
+/*
/turf/open/floor/engine/hypernoblium
name = "\improper Hypernoblium floor"
initial_gas_mix = ATMOS_TANK_HYPERNOBLIUM
@@ -180,10 +182,10 @@
/turf/open/floor/engine/antinoblium
name = "\improper Antinoblium floor"
initial_gas_mix = ATMOS_TANK_ANTINOBLIUM
-
+*/
/turf/open/floor/engine/air
name = "air floor"
- initial_gas_mix = ATMOS_TANK_AIRMIX
+ initial_gas_mix = ATMOSTANK_AIRMIX
@@ -223,3 +225,4 @@
/turf/open/floor/engine/telecomms
initial_gas_mix = TCOMMS_ATMOS
+ temperature = 80
diff --git a/code/game/turfs/open/ice.dm b/code/game/turfs/open/ice.dm
index 4a9a55b53da..da29593d3a8 100644
--- a/code/game/turfs/open/ice.dm
+++ b/code/game/turfs/open/ice.dm
@@ -4,7 +4,7 @@
icon = 'icons/turf/floors/ice_turf.dmi'
icon_state = "ice_turf-0"
base_icon_state = "ice_turf-0"
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
temperature = 180
planetary_atmos = TRUE
baseturfs = /turf/open/misc/ice
diff --git a/code/game/turfs/open/snow.dm b/code/game/turfs/open/snow.dm
index 4017240e3fd..66d1bfc571a 100644
--- a/code/game/turfs/open/snow.dm
+++ b/code/game/turfs/open/snow.dm
@@ -5,7 +5,7 @@
desc = "Looks cold."
icon_state = "snow"
planetary_atmos = TRUE
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
slowdown = 2
bullet_sizzle = TRUE
footstep = FOOTSTEP_SAND
diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm
index 1a81515e940..866590ed64e 100644
--- a/code/game/turfs/open/space/space.dm
+++ b/code/game/turfs/open/space/space.dm
@@ -14,7 +14,7 @@
var/destination_y
var/static/datum/gas_mixture/immutable/space/space_gas = new
- run_later = TRUE
+ // run_later = TRUE
plane = PLANE_SPACE
layer = SPACE_LAYER
light_power = 0.25
@@ -55,8 +55,10 @@
if(our_area.area_has_base_lighting && always_lit) //Only provide your own lighting if the area doesn't for you
add_overlay(GLOB.fullbright_overlay)
+ /*
if(requires_activation)
SSair.add_to_active(src, TRUE)
+ */
if (light_system == STATIC_LIGHT && light_power && light_range)
update_light()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index e4f54355ada..64d4c935819 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -21,7 +21,6 @@ GLOBAL_LIST_EMPTY(station_turfs)
// This shouldn't be modified directly, use the helper procs.
var/list/baseturfs = /turf/baseturf_bottom
- var/temperature = T20C
///Used for fire, if a melting temperature was reached, it will be destroyed
var/to_be_destroyed = 0
///The max temperature of the fire which it was subjected to
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index cb331aac9e8..9c84efd5524 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -29,12 +29,12 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/obj/machinery/atmospherics/components/unary/portables_connector,
/obj/machinery/atmospherics/components/unary/passive_vent,
/obj/machinery/atmospherics/components/unary/heat_exchanger,
- /obj/machinery/atmospherics/components/unary/hypertorus/core,
- /obj/machinery/atmospherics/components/unary/hypertorus/waste_output,
- /obj/machinery/atmospherics/components/unary/hypertorus/moderator_input,
- /obj/machinery/atmospherics/components/unary/hypertorus/fuel_input,
- /obj/machinery/hypertorus/interface,
- /obj/machinery/hypertorus/corner,
+ // /obj/machinery/atmospherics/components/unary/hypertorus/core,
+ // /obj/machinery/atmospherics/components/unary/hypertorus/waste_output,
+ // /obj/machinery/atmospherics/components/unary/hypertorus/moderator_input,
+ // /obj/machinery/atmospherics/components/unary/hypertorus/fuel_input,
+ // /obj/machinery/hypertorus/interface,
+ // /obj/machinery/hypertorus/corner,
/obj/machinery/atmospherics/components/binary/valve,
/obj/machinery/portable_atmospherics/canister,
)))
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index 54c3b091f3c..22f9e45529b 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -9,6 +9,10 @@
var/heat_capacity = 1
var/thermal_conductivity = 0.05
var/list/initial_gas_mix
+ var/planetary_atmos //Let's just let this exist for now.
+
+#warn !!TEMPORARY PROCDEF!!
+/turf/open/proc/atmos_spawn_air(...)
/turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null)
if(graphic_add && graphic_add.len)
@@ -300,7 +304,7 @@
air.copy_from(zone.air)
air.group_multiplier = 1
-/turf/simulated/atmos_spawn_air(gas_id, amount, initial_temperature)
+/turf/simulated/proc/atmos_spawn_air(gas_id, amount, initial_temperature)
var/datum/gas_mixture/new_gas = new
var/datum/gas_mixture/existing_gas = return_air()
if(isnull(initial_temperature))
diff --git a/code/modules/atmospherics/ZAS/XGM/gases.dm b/code/modules/atmospherics/ZAS/XGM/gases.dm
index af3a25a5f84..ec311df2592 100644
--- a/code/modules/atmospherics/ZAS/XGM/gases.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gases.dm
@@ -50,7 +50,7 @@
tile_color = "#ff9940"
overlay_limit = 0.7
flags = XGM_GAS_FUEL | XGM_GAS_CONTAMINANT | XGM_GAS_FUSION_FUEL
- breathed_product = /datum/reagent/toxin/phoron
+ breathed_product = /datum/reagent/toxin/plasma
symbol_html = "Ph"
symbol = "Ph"
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
index 8dc8599de41..aa85da6b36f 100644
--- a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
@@ -495,3 +495,22 @@
/datum/gas_mixture/proc/leak_to_enviroment(datum/gas_mixture/environment)
pump_gas_passive(src, environment, calculate_transfer_moles(src, environment, src.return_pressure() - environment.return_pressure()))
+
+/**
+ * Takes the amount of the gas you want to PP as an argument
+ * So I don't have to do some hacky switches/defines/magic strings
+ * eg:
+ * Plas_PP = get_partial_pressure(gas_mixture.plasma)
+ * O2_PP = get_partial_pressure(gas_mixture.oxygen)
+ * get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp
+ * get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles()
+ *
+ * 10/20*5 = 2.5
+ * 10 = 2.5/5*20
+ */
+
+/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure)
+ return (gas_pressure * R_IDEAL_GAS_EQUATION * temperature) / BREATH_VOLUME
+///inverse
+/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure)
+ return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * temperature)
diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index 0a1ce419a2c..27fa67895fa 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -118,7 +118,7 @@
var/turf/local_turf = get_turf(loc)
if(!local_turf)
return
- local_turf./air_update_turf(update, remove)
+ //local_turf.air_update_turf(update, remove)
/**
* A helper proc for dealing with atmos changes
diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm
index b02041cd51c..8613c267306 100644
--- a/code/modules/atmospherics/machinery/components/tank.dm
+++ b/code/modules/atmospherics/machinery/components/tank.dm
@@ -190,7 +190,7 @@
continue
node.atmos_init()
node.add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
update_parents()
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index f25b5df5dc2..968dc8f08f0 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
var/filled = 0.5
///Maximum pressure allowed on initialize inside the canister, multiplied by the filled var
var/maximum_pressure = 90 * ONE_ATMOSPHERE
- ///Stores the path of the gas for mapped canisters
+ ///Stores the id of the gas for mapped canisters
var/gas_type
///Player controlled var that set the release pressure of the canister
var/release_pressure = ONE_ATMOSPHERE
@@ -100,8 +100,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
else
create_gas()
- if(ispath(gas_type, /datum/gas))
- desc = "[GLOB.meta_gas_info[gas_type][META_GAS_NAME]]. [GLOB.meta_gas_info[gas_type][META_GAS_DESC]]"
+ desc = "[xgm_gas_data.name[gas_type]]."
update_window()
@@ -272,7 +271,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
heat_limit = 1e12
pressure_limit = 1e14
mode = CANISTER_TIER_3
-
+/*
/obj/machinery/portable_atmospherics/canister/fusion_test/create_gas()
air_contents.add_gases(/datum/gas/hydrogen, /datum/gas/tritium)
air_contents.gases[/datum/gas/hydrogen][MOLES] = 300
@@ -285,12 +284,11 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
desc = "A mixture of N2O and Oxygen"
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#9fba6c#3d4680"
-
+*/
/obj/machinery/portable_atmospherics/canister/anesthetic_mix/create_gas()
- air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide)
- air_contents.gases[/datum/gas/oxygen][MOLES] = (O2_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (N2O_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- SSair.start_processing_machine(src)
+ air_contents.add(GAS_OXYGEN, (O2_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.add(GAS_N2O, (N2O_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ SSzas.start_processing_machine(src)
/**
* Getter for the amount of time left in the timer of prototype canisters
@@ -363,17 +361,15 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
/obj/machinery/portable_atmospherics/canister/proc/create_gas()
if(!gas_type)
return
- air_contents.add_gas(gas_type)
if(starter_temp)
air_contents.temperature = starter_temp
- air_contents.gases[gas_type][MOLES] = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- SSair.start_processing_machine(src)
+ air_contents.add(gas_type,(maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ SSzas.start_processing_machine(src)
/obj/machinery/portable_atmospherics/canister/air/create_gas()
- air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
- air_contents.gases[/datum/gas/oxygen][MOLES] = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- air_contents.gases[/datum/gas/nitrogen][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- SSair.start_processing_machine(src)
+ air_contents.add(GAS_OXYGEN, (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.add(GAS_NITROGEN, (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ SSzas.start_processing_machine(src)
/obj/machinery/portable_atmospherics/canister/update_icon_state()
if(machine_stat & BROKEN)
@@ -425,10 +421,10 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
cut_overlay(window)
window = image(icon, icon_state="window-base", layer=FLOAT_LAYER)
var/list/window_overlays = list()
- for(var/visual in air_contents.return_visuals())
+ /*for(var/visual in air_contents.return_visuals())
var/image/new_visual = image(visual, layer=FLOAT_LAYER)
new_visual.filters = alpha_filter
- window_overlays += new_visual
+ window_overlays += new_visual*/
window.overlays = window_overlays
add_overlay(window)
@@ -497,7 +493,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
. = ..()
if(!. || QDELETED(src))
return
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
/obj/machinery/portable_atmospherics/canister/atom_break(damage_flag)
. = ..()
@@ -547,10 +543,20 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
// Handle gas transfer.
if(valve_open)
var/turf/location = get_turf(src)
- var/datum/gas_mixture/target_air = holding?.return_air() || location.return_air()
- excited = TRUE
+ var/datum/gas_mixture/environment
+ if(holding)
+ environment = holding.air_contents
+ else
+ environment = location.return_air()
+
+ var/env_pressure = environment.return_pressure()
+ var/pressure_delta = release_pressure - env_pressure
+
+ if((air_contents.temperature > 0) && (pressure_delta > 0))
+ var/transfer_moles = calculate_transfer_moles(air_contents, environment, pressure_delta)
+ transfer_moles = min(transfer_moles, (ATMOS_DEFAULT_VOLUME_PUMP/air_contents.volume)*air_contents.total_moles) //flow rate limit
- if(air_contents.release_gas_to(target_air, release_pressure) && !holding)
+ var/returnval = pump_gas_passive(air_contents, environment, transfer_moles)
//air_update_turf(FALSE, FALSE)
var/our_pressure = air_contents.return_pressure()
@@ -667,17 +673,15 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
var/n = 0
valve_open = !valve_open
if(valve_open)
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
logmsg = "Valve was opened by [key_name(usr)], starting a transfer into \the [holding || "air"].
"
if(!holding)
var/list/gaseslog = list() //list for logging all gases in canister
- for(var/id in air_contents.gases)
- var/gas = air_contents.gases[id]
- gaseslog[gas[GAS_META][META_GAS_NAME]] = gas[MOLES] //adds gases to gaseslog
- if(!gas[GAS_META][META_GAS_DANGER])
+ for(var/gas in air_contents.gas)
+ gaseslog[xgm_gas_data.name[gas]] = air_contents.get_gas(gas) //adds gases to gaseslog
+ if(!xgm_gas_data.flags[gas] & XGM_GAS_CONTAMINANT|XGM_GAS_FUEL)
continue
- if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility
- danger = TRUE //at least 1 danger gas
+ danger = TRUE //at least 1 danger gas
logmsg = "[key_name(usr)] opened a canister that contains the following:"
admin_msg = "[key_name(usr)] opened a canister that contains the following at [ADMIN_VERBOSEJMP(src)]:"
for(var/name in gaseslog)
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 049e69d4ce3..9e62a111907 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -203,7 +203,8 @@
excited = TRUE
if(!holding)
- scrub(get_turf(src).return_air())
+ var/turf/muhturf = get_turf(src)
+ scrub(muhturf.return_air())
return ..()
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index a7d07884a71..551d8ca3596 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -6,7 +6,7 @@
requires_power = FALSE
static_lighting = FALSE
base_lighting_alpha = 255
-
+
/area/awaymission/snowdin/outside
name = "Snowdin Tundra Plains"
icon_state = "awaycontent25"
@@ -157,7 +157,7 @@
//liquid plasma!!!!!!//
/turf/open/floor/iron/dark/snowdin
- initial_gas_mix = FROZEN_ATMOS
+ temperature = 180
planetary_atmos = 1
temperature = 180
diff --git a/code/modules/clothing/masks/gas_filter.dm b/code/modules/clothing/masks/gas_filter.dm
index 09dafd7e415..5b5d2d7e96f 100644
--- a/code/modules/clothing/masks/gas_filter.dm
+++ b/code/modules/clothing/masks/gas_filter.dm
@@ -29,25 +29,14 @@
///List of gases with high filter priority
var/list/high_filtering_gases = list(
- /datum/gas/plasma,
- /datum/gas/carbon_dioxide,
- /datum/gas/nitrous_oxide
- )
+ GAS_PLASMA,
+ GAS_CO2,
+ GAS_N2O
+ )
///List of gases with medium filter priority
- var/list/mid_filtering_gases = list(
- /datum/gas/nitrium,
- /datum/gas/freon,
- /datum/gas/hypernoblium,
- /datum/gas/bz
- )
+ var/list/mid_filtering_gases = list()
///List of gases with low filter priority
- var/list/low_filtering_gases = list(
- /datum/gas/healium,
- /datum/gas/proto_nitrate,
- /datum/gas/halon,
- /datum/gas/tritium,
- /datum/gas/zauker
- )
+ var/list/low_filtering_gases = list()
/obj/item/gas_filter/examine(mob/user)
. = ..()
@@ -65,29 +54,29 @@
var/danger_points = 0
- for(var/gas_id in breath.gases)
+ for(var/gas_id in breath.gas)
if(gas_id in high_filtering_gases)
- if(breath.gases[gas_id][MOLES] > HIGH_FILTERING_MOLES)
- breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * HIGH_FILTERING_RATIO, 0)
+ if(breath.get_gas(gas_id) > HIGH_FILTERING_MOLES)
+ breath.get_gas(gas_id) = max(breath.get_gas(gas_id) - filter_strength_high * filter_efficiency * HIGH_FILTERING_RATIO, 0)
danger_points += 0.5
continue
- breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_high * filter_efficiency * LOW_FILTERING_RATIO, 0)
+ breath.get_gas(gas_id) = max(breath.get_gas(gas_id) - filter_strength_high * filter_efficiency * LOW_FILTERING_RATIO, 0)
danger_points += 0.05
continue
if(gas_id in mid_filtering_gases)
- if(breath.gases[gas_id][MOLES] > MID_FILTERING_MOLES)
- breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * HIGH_FILTERING_RATIO, 0)
+ if(breath.get_gas(gas_id) > MID_FILTERING_MOLES)
+ breath.get_gas(gas_id) = max(breath.get_gas(gas_id)- filter_strength_mid * filter_efficiency * HIGH_FILTERING_RATIO, 0)
danger_points += 0.75
continue
- breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_mid * filter_efficiency * LOW_FILTERING_RATIO, 0)
+ breath.get_gas(gas_id) = max(breath.get_gas(gas_id) - filter_strength_mid * filter_efficiency * LOW_FILTERING_RATIO, 0)
danger_points += 0.15
continue
if(gas_id in low_filtering_gases)
- if(breath.gases[gas_id][MOLES] > LOW_FILTERING_MOLES)
- breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * HIGH_FILTERING_RATIO, 0)
+ if(breath.get_gas(gas_id)> LOW_FILTERING_MOLES)
+ breath.get_gas(gas_id) = max(breath.get_gas(gas_id) - filter_strength_low * filter_efficiency * HIGH_FILTERING_RATIO, 0)
danger_points += 1
continue
- breath.gases[gas_id][MOLES] = max(breath.gases[gas_id][MOLES] - filter_strength_low * filter_efficiency * LOW_FILTERING_RATIO, 0)
+ breath.get_gas(gas_id) = max(breath.get_gas(gas_id) - filter_strength_low * filter_efficiency * LOW_FILTERING_RATIO, 0)
danger_points += 0.5
continue
@@ -106,7 +95,7 @@
/obj/item/gas_filter/plasmaman
name = "plasmaman atmospheric gas filter"
high_filtering_gases = list(
- /datum/gas/oxygen,
- /datum/gas/carbon_dioxide,
- /datum/gas/nitrous_oxide
+ GAS_OXYGEN,
+ GAS_CO2,
+ GAS_N2O
)
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index da8b23ac5a8..8612cae4cb2 100755
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -269,7 +269,8 @@
return exposed_temperature > 300
/obj/item/clothing/accessory/medal/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature)
- atmos_spawn_air("plasma=20;TEMP=[exposed_temperature]")
+ var/open/turf/turfloc = get_turf(src)
+ turfloc.atmos_spawn_air(GAS_PLASMA, 20, exposed_temperature)
visible_message(span_danger("\The [src] bursts into flame!"), span_userdanger("Your [src] bursts into flame!"))
qdel(src)
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 91dd2ef8cb1..fec5b4a45a8 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -265,10 +265,9 @@
var/turf/open/floor/turf = holder.loc
if(istype(turf))
var/datum/gas_mixture/gas_mix = turf.air
- if(!gas_mix.gases[/datum/gas/oxygen])
+ if(!gas_mix.get_gas(GAS_OXYGEN))
return
- gas_mix.gases[/datum/gas/oxygen][MOLES] = max(gas_mix.gases[/datum/gas/oxygen][MOLES] - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
- gas_mix.garbage_collect()
+ gas_mix.gas[GAS_OXYGEN] = max(gas_mix.get_gas(GAS_OXYGEN) - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
/datum/spacevine_mutation/nitro_eater
name = "Nitrogen consuming"
@@ -280,10 +279,9 @@
var/turf/open/floor/turf = holder.loc
if(istype(turf))
var/datum/gas_mixture/gas_mix = turf.air
- if(!gas_mix.gases[/datum/gas/nitrogen])
+ if(!gas_mix.get_gas(GAS_NITROGEN))
return
- gas_mix.gases[/datum/gas/nitrogen][MOLES] = max(gas_mix.gases[/datum/gas/nitrogen][MOLES] - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
- gas_mix.garbage_collect()
+ gas_mix.gas[GAS_NITROGEN] = max(gas_mix.get_gas(GAS_NITROGEN) - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
/datum/spacevine_mutation/carbondioxide_eater
name = "CO2 consuming"
@@ -295,10 +293,9 @@
var/turf/open/floor/turf = holder.loc
if(istype(turf))
var/datum/gas_mixture/gas_mix = turf.air
- if(!gas_mix.gases[/datum/gas/carbon_dioxide])
+ if(!gas_mix.get_gas(GAS_OXYGEN))
return
- gas_mix.gases[/datum/gas/carbon_dioxide][MOLES] = max(gas_mix.gases[/datum/gas/carbon_dioxide][MOLES] - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
- gas_mix.garbage_collect()
+ gas_mix.gas[GAS_CO2] = max(gas_mix.get_gas(GAS_CO2) - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
/datum/spacevine_mutation/plasma_eater
name = "Plasma consuming"
@@ -310,10 +307,9 @@
var/turf/open/floor/turf = holder.loc
if(istype(turf))
var/datum/gas_mixture/gas_mix = turf.air
- if(!gas_mix.gases[/datum/gas/plasma])
+ if(!gas_mix.get_gas(GAS_PLASMA))
return
- gas_mix.gases[/datum/gas/plasma][MOLES] = max(gas_mix.gases[/datum/gas/plasma][MOLES] - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
- gas_mix.garbage_collect()
+ gas_mix.gas[GAS_PLASMA] = max(gas_mix.get_gas(GAS_PLASMA) - GAS_MUTATION_REMOVAL_MULTIPLIER * holder.energy, 0)
/datum/spacevine_mutation/thorns
name = "Thorny"
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 204ed0792d2..c3706114a6e 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
for(var/turf/FT in flood_turfs)
for(var/dir in GLOB.cardinals)
var/turf/T = get_step(FT, dir)
- if((T in flood_turfs) || !TURFS_CAN_SHARE(T, FT) || isspaceturf(T)) //If we've gottem already, or if they're not alright to spread with.
+ if((T in flood_turfs) /*|| !TURFS_CAN_SHARE(T, FT)*/ || isspaceturf(T)) //If we've gottem already, or if they're not alright to spread with.
continue
var/obj/effect/plasma_image_holder/pih = new(T)
var/image/new_plasma = image(image_icon, pih, image_state, FLY_LAYER)
diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm
index 054f5d59abc..e413cf7438c 100644
--- a/code/modules/holodeck/area_copy.dm
+++ b/code/modules/holodeck/area_copy.dm
@@ -140,8 +140,9 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
B.vars[V] = T.vars[V]
toupdate += B
- if(toupdate.len)
+ /*if(toupdate.len)
for(var/turf/T1 in toupdate)
CALCULATE_ADJACENT_TURFS(T1, KILL_EXCITED)
+ */
return copiedobjs
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index e6df49e2a9f..a78fb3f85e4 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -47,8 +47,8 @@
/turf/open/floor/holofloor/plating/burnmix
name = "burn-mix floor"
- initial_gas_mix = BURNMIX_ATMOS
-
+ // initial_gas_mix = BURNMIX_ATMOS
+ //TODO: cause warcrimes later
/turf/open/floor/holofloor/grass
gender = PLURAL
name = "lush grass"
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index e95bb3ecc9e..08f872c3072 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -122,7 +122,7 @@
)
)
for(var/turf/affected_turf as anything in template_and_bordering_turfs)
- affected_turf.//air_update_turf(TRUE, TRUE)
+ //affected_turf.air_update_turf(TRUE, TRUE)
affected_turf.levelupdate()
/datum/map_template/proc/load_new_z(secret = FALSE)
diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm
index 2d1ea422c7a..70474c2753d 100644
--- a/code/modules/mob/camera/camera.dm
+++ b/code/modules/mob/camera/camera.dm
@@ -14,10 +14,10 @@
/mob/camera/Initialize(mapload)
. = ..()
SSpoints_of_interest.make_point_of_interest(src)
-
+/*
/mob/camera/experience_pressure_difference()
return
-
+*/
/mob/camera/canUseStorage()
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 19e6a17ac30..67fe76feebc 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -16,28 +16,22 @@
var/plasma_used = 0
var/plas_detect_threshold = 0.02
var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
- var/list/breath_gases = breath.gases
-
- breath.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
//Partial pressure of the plasma in our breath
- var/Plasma_pp = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
+ var/Plasma_pp = (breath.get_gas(GAS_PLASMA)/breath.total_moles())*breath_pressure
if(Plasma_pp > plas_detect_threshold) // Detect plasma in air
- adjustPlasma(breath_gases[/datum/gas/plasma][MOLES]*250)
+ adjustPlasma(breath.get_gas(GAS_PLASMA)*250)
throw_alert(ALERT_XENO_PLASMA, /atom/movable/screen/alert/alien_plas)
- plasma_used = breath_gases[/datum/gas/plasma][MOLES]
+ plasma_used = breath.get_gas(GAS_PLASMA)
else
clear_alert(ALERT_XENO_PLASMA)
//Breathe in plasma and out oxygen
- breath_gases[/datum/gas/plasma][MOLES] -= plasma_used
- breath_gases[/datum/gas/oxygen][MOLES] += plasma_used
-
- breath.garbage_collect()
-
+ breath.adjust_gas(GAS_PLASMA, -plasma_used)
+ breath.adjust_gas(GAS_OXYGEN, plasma_used)
//BREATH TEMPERATURE
handle_breath_temperature(breath)
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 5d34c91b2b3..1f16739d278 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -73,11 +73,11 @@
if(!atmos_sealed && (!istype(H.w_uniform, /obj/item/clothing/under/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/plasmaman) || !istype(H.gloves, /obj/item/clothing/gloves)))
var/datum/gas_mixture/environment = H.loc.return_air()
if(environment?.total_moles())
- if(environment.gases[/datum/gas/hypernoblium] && (environment.gases[/datum/gas/hypernoblium][MOLES]) >= 5)
+ /*if(environment.gases[/datum/gas/hypernoblium] && (environment.gases[/datum/gas/hypernoblium][MOLES]) >= 5)
if(H.on_fire && H.fire_stacks > 0)
- H.adjust_fire_stacks(-10 * delta_time)
- else if(!HAS_TRAIT(H, TRAIT_NOFIRE) && !HAS_TRAIT(H, TRAIT_NOSELFIGNITION))
- if(environment.gases[/datum/gas/oxygen] && (environment.gases[/datum/gas/oxygen][MOLES]) >= 1) //Same threshhold that extinguishes fire
+ H.adjust_fire_stacks(-10 * delta_time)*/
+ if(!HAS_TRAIT(H, TRAIT_NOFIRE) && !HAS_TRAIT(H, TRAIT_NOSELFIGNITION))
+ if(environment.has_gas(GAS_OXYGEN, 1)) //Same threshhold that extinguishes fire
H.adjust_fire_stacks(0.25 * delta_time)
if(!H.on_fire && H.fire_stacks > 0)
H.visible_message(span_danger("[H]'s body reacts with the atmosphere and bursts into flames!"),span_userdanger("Your body reacts with the atmosphere and bursts into flame!"))
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 74062b0efa5..33fef9d52f5 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -158,11 +158,9 @@
var/oxygen_used = 0
var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
- var/list/breath_gases = breath.gases
- breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz)
- var/O2_partialpressure = (breath_gases[/datum/gas/oxygen][MOLES]/breath.total_moles())*breath_pressure
- var/Plasma_partialpressure = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
- var/CO2_partialpressure = (breath_gases[/datum/gas/carbon_dioxide][MOLES]/breath.total_moles())*breath_pressure
+ var/O2_partialpressure = (breath.get_gas(GAS_OXYGEN)/breath.total_moles())*breath_pressure
+ var/Plasma_partialpressure = (breath.get_gas(GAS_OXYGEN)/breath.total_moles())*breath_pressure
+ var/CO2_partialpressure = (breath.get_gas(GAS_CO2)/breath.total_moles())*breath_pressure
//OXYGEN
@@ -173,7 +171,7 @@
var/ratio = 1 - O2_partialpressure/safe_oxy_min
adjustOxyLoss(min(5*ratio, 3))
failed_last_breath = TRUE
- oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]*ratio
+ oxygen_used = breath.get_gas(GAS_OXYGEN)*ratio
else
adjustOxyLoss(3)
failed_last_breath = TRUE
@@ -183,11 +181,11 @@
failed_last_breath = FALSE
if(health >= crit_threshold)
adjustOxyLoss(-5)
- oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]
+ oxygen_used = breath.get_gas(GAS_OXYGEN)
clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
- breath_gases[/datum/gas/oxygen][MOLES] -= oxygen_used
- breath_gases[/datum/gas/carbon_dioxide][MOLES] += oxygen_used
+ breath.adjust_gas(GAS_OXYGEN, -oxygen_used)
+ breath.adjust_gas(GAS_CO2, oxygen_used)
//CARBON DIOXIDE
if(CO2_partialpressure > safe_co2_max)
@@ -206,15 +204,15 @@
//PLASMA
if(Plasma_partialpressure > safe_plas_max)
- var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_plas_max) * 10
+ var/ratio = breath.get_gas(GAS_PLASMA)/safe_plas_max * 10
adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
throw_alert(ALERT_TOO_MUCH_PLASMA, /atom/movable/screen/alert/too_much_plas)
else
clear_alert(ALERT_TOO_MUCH_PLASMA)
//NITROUS OXIDE
- if(breath_gases[/datum/gas/nitrous_oxide])
- var/SA_partialpressure = (breath_gases[/datum/gas/nitrous_oxide][MOLES]/breath.total_moles())*breath_pressure
+ if(breath.get_gas(GAS_N2O))
+ var/SA_partialpressure = (breath.get_gas(GAS_N2O)/breath.total_moles())*breath_pressure
if(SA_partialpressure > SA_para_min)
throw_alert(ALERT_TOO_MUCH_N2O, /atom/movable/screen/alert/too_much_n2o)
SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "chemical_euphoria")
@@ -234,14 +232,16 @@
clear_alert(ALERT_TOO_MUCH_N2O)
//BZ (Facepunch port of their Agent B)
+ /*
if(breath_gases[/datum/gas/bz])
var/bz_partialpressure = (breath_gases[/datum/gas/bz][MOLES]/breath.total_moles())*breath_pressure
if(bz_partialpressure > 1)
hallucination += 10
else if(bz_partialpressure > 0.01)
hallucination += 5
-
+ */
//NITRIUM
+ /*
if(breath_gases[/datum/gas/nitrium])
var/nitrium_partialpressure = (breath_gases[/datum/gas/nitrium][MOLES]/breath.total_moles())*breath_pressure
if(nitrium_partialpressure > 0.5)
@@ -295,7 +295,7 @@
SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "smell")
breath.garbage_collect()
-
+ */
//BREATH TEMPERATURE
handle_breath_temperature(breath)
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 3f8447ade8c..49b16216520 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -121,7 +121,7 @@
extinguish_mob()
return TRUE //mob was put out, on_fire = FALSE via extinguish_mob(), no need to update everything down the chain.
var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
- if(!G.gases[/datum/gas/oxygen] || G.gases[/datum/gas/oxygen][MOLES] < 1)
+ if(!G.has_gas(GAS_OXYGEN, 1))
extinguish_mob() //If there's no oxygen in the tile we're on, put out the fire
return TRUE
var/turf/location = get_turf(src)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 36c2f1f3b7d..9a6fe5c5460 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -958,7 +958,7 @@
return pick("ltrails_1", "ltrails_2")
else
return pick("trails_1", "trails_2")
-
+/*
/mob/living/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0)
playsound(src, 'sound/effects/space_wind.ogg', 50, TRUE)
if(buckled || mob_negates_gravity())
@@ -988,7 +988,7 @@
pressure_resistance_prob_delta -= 20
break
..(pressure_difference, direction, pressure_resistance_prob_delta)
-
+*/
/mob/living/can_resist()
if(next_move > world.time)
return FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index f21ebabf39e..4cef50b5668 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -496,7 +496,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
var/turf/T = get_turf(src)
if(!T)
return
- var/list/adjacent = T.get_atmos_adjacent_turfs(1)
+ var/list/adjacent = T.get_adjacent_open_turfs()
if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way
adjacent = shuffle(adjacent)
shuffle = FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
index 9ffc4680868..acfc70af4f6 100644
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/firebot.dm
@@ -153,7 +153,7 @@
else if(isturf(target))
var/turf/open/T = target
- if(T.active_hotspot)
+ if(T.fire)
return TRUE
return FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index e982b5bfc38..e9bcf6f4fc6 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -56,14 +56,14 @@
if(!is_tree || !isopenturf(loc))
return
var/turf/open/T = src.loc
- if(!T.air || !T.air.gases[/datum/gas/carbon_dioxide])
+ if(!T.air || !T.air.has_gas(GAS_CO2))
return
- var/co2 = T.air.gases[/datum/gas/carbon_dioxide][MOLES]
+ var/co2 = T.air.get_gas(GAS_CO2)
if(co2 > 0 && DT_PROB(13, delta_time))
var/amt = min(co2, 9)
- T.air.gases[/datum/gas/carbon_dioxide][MOLES] -= amt
- T.atmos_spawn_air("o2=[amt]")
+ T.air.adjust_gas(GAS_CO2, -amt)
+ T.atmos_spawn_air(GAS_OXYGEN, amt)
/mob/living/simple_animal/hostile/tree/AttackingTarget()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 8ccb075e757..92608dcab13 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -317,15 +317,12 @@
if(isturf(loc) && isopenturf(loc))
var/turf/open/ST = loc
if(ST.air)
- var/ST_gases = ST.air.gases
- ST.air.assert_gases(arglist(GLOB.hardcoded_gases))
+ var/datum/gas_mixture/muhair = ST.return_air()
- var/plas = ST_gases[/datum/gas/plasma][MOLES]
- var/oxy = ST_gases[/datum/gas/oxygen][MOLES]
- var/n2 = ST_gases[/datum/gas/nitrogen][MOLES]
- var/co2 = ST_gases[/datum/gas/carbon_dioxide][MOLES]
-
- ST.air.garbage_collect()
+ var/plas = muhair.get_gas(GAS_PLASMA)
+ var/oxy = muhair.get_gas(GAS_OXYGEN)
+ var/n2 = muhair.get_gas(GAS_NITROGEN)
+ var/co2 = muhair.get_gas(GAS_CO2)
if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"])
. = FALSE
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 5afb8ac74a0..1e544408ae6 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -141,7 +141,7 @@
adjustBruteLoss(round(sqrt(bodytemperature)) * delta_time)
else
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, SLIME_COLD)
-
+ /*
if(stat != DEAD)
var/bz_percentage =0
if(environment.gases[/datum/gas/bz])
@@ -161,7 +161,7 @@
to_chat(src, span_notice("You wake up from the stasis."))
set_stat(CONSCIOUS)
regenerate_icons()
-
+ */
updatehealth()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index b1a55366fbb..87631e7d383 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -126,10 +126,9 @@
var/t = "[span_notice("Coordinates: [x],[y] ")]\n"
t += "[span_danger("Temperature: [environment.temperature] ")]\n"
- for(var/id in environment.gases)
- var/gas = environment.gases[id]
- if(gas[MOLES])
- t+="[span_notice("[gas[GAS_META][META_GAS_NAME]]: [gas[MOLES]] ")]\n"
+ for(var/id in environment.gas)
+ if(gas[id])
+ t+="[span_notice("[gas]: [gas[MOLES]] ")]\n"
to_chat(usr, t)
diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm
index 69bcbe667c2..40f9be53009 100644
--- a/code/modules/mod/modules/modules_timeline.dm
+++ b/code/modules/mod/modules/modules_timeline.dm
@@ -411,9 +411,8 @@
/obj/structure/chrono_field/return_air() //we always have nominal air and temperature
var/datum/gas_mixture/fresh_air = new
- fresh_air.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
- fresh_air.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD
- fresh_air.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD
+ fresh_air.gas[GAS_OXYGEN] = MOLES_O2STANDARD
+ fresh_air.gas[GAS_NITROGEN] = MOLES_N2STANDARD
fresh_air.temperature = T20C
return fresh_air
diff --git a/code/modules/modular_computers/file_system/programs/atmosscan.dm b/code/modules/modular_computers/file_system/programs/atmosscan.dm
index fe09b4b971e..fe744c72ecf 100644
--- a/code/modules/modular_computers/file_system/programs/atmosscan.dm
+++ b/code/modules/modular_computers/file_system/programs/atmosscan.dm
@@ -16,7 +16,7 @@
to_chat(user, span_warning("\The [computer] flashes an error: \"hardware\\sensorpackage\\startup.bin -- file not found\"."))
/datum/computer_file/program/atmosscan/ui_static_data(mob/user)
- return return_atmos_handbooks()
+ return //return_atmos_handbooks()
/datum/computer_file/program/atmosscan/ui_data(mob/user)
var/list/data = get_header_data()
@@ -27,7 +27,7 @@
if(!air_sensor)
data["gasmixes"] = list(gas_mixture_parser(null, "No Sensors Detected!"))
return data
-
+
data["gasmixes"] = list(gas_mixture_parser(air, "Sensor Reading")) //Null air wont cause errors, don't worry.
return data
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index e3e84e04511..d5b7e185874 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -20,12 +20,12 @@
AddComponent(/datum/component/simple_rotation)
find_circs()
connect_to_network()
- SSair.start_processing_machine(src)
+ SSzas.start_processing_machine(src)
update_appearance()
/obj/machinery/power/generator/Destroy()
kill_circs()
- SSair.stop_processing_machine(src)
+ SSzas.stop_processing_machine(src)
return ..()
/obj/machinery/power/generator/update_overlays()
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index 8a0b0ca51a5..14bef9e7193 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -93,7 +93,7 @@
/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
name = ".38 Iceblox bullet"
damage = 20
- var/temperature = 100
+ temperature = 100
ricochets_max = 0
/obj/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = FALSE)
diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm
index 4b4a95809ab..b731da461c9 100644
--- a/code/modules/reagents/chem_splash.dm
+++ b/code/modules/reagents/chem_splash.dm
@@ -97,8 +97,8 @@
for(var/turf/T in turflist)
if(accessible[T])
continue
- for(var/thing in T.get_atmos_adjacent_turfs(alldir = TRUE))
- var/turf/NT = thing
+ //for(var/thing in T.get_atmos_adjacent_turfs(alldir = TRUE))
+ for(var/turf/NT as anything in T.get_adjacent_open_turfs())
if(!(NT in accessible))
continue
if(!(get_dir(T,NT) in GLOB.cardinals))
diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm
index a94c28316a0..75070f324f2 100644
--- a/code/modules/research/ordnance/tank_compressor.dm
+++ b/code/modules/research/ordnance/tank_compressor.dm
@@ -86,7 +86,7 @@
return FALSE
update_appearance()
return TRUE
-
+
/obj/machinery/atmospherics/components/binary/tank_compressor/crowbar_act(mob/living/user, obj/item/tool)
if(active || inserted_tank)
return FALSE
@@ -119,7 +119,7 @@
if(nodes[2])
nodes[2].atmos_init()
nodes[2].add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
update_appearance()
/// Glorified volume pump.
@@ -172,7 +172,7 @@
return COMSIG_CANCEL_EXPLOSION
/**
- * Everytime a tank is destroyed or a new tank is inserted, our buffer is flushed.
+ * Everytime a tank is destroyed or a new tank is inserted, our buffer is flushed.
* Mole requirements in experiments are tracked by buffer data.
*/
/obj/machinery/atmospherics/components/binary/tank_compressor/proc/flush_buffer()
@@ -194,7 +194,7 @@
new_record.timestamp = station_time_timestamp()
for(var/gas_path in leaked_gas_buffer.gases)
new_record.gas_data[gas_path] = leaked_gas_buffer.gases[gas_path][MOLES]
-
+
compressor_record += new_record
record_number += 1
say("Buffer data stored.")
@@ -207,7 +207,7 @@
if(experiment.required_gas in gas_data)
if(gas_data[experiment.required_gas] > MINIMUM_MOLE_COUNT)
passed_experiments += list(experiment.type = gas_data[experiment.required_gas])
-
+
return passed_experiments
/obj/machinery/atmospherics/components/binary/tank_compressor/proc/print(mob/user, datum/data/compressor_record/record)
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 43a0fd57ad8..f72f19c96ad 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -58,7 +58,7 @@ All ShuttleMove procs go here
var/depth = baseturfs.len - shuttle_boundary + 1
newT.CopyOnTop(src, 1, depth, TRUE)
newT.blocks_air = TRUE
- newT.//air_update_turf(TRUE, FALSE)
+ //newT.air_update_turf(TRUE, FALSE)
blocks_air = TRUE
//air_update_turf(TRUE, TRUE)
if(isopenturf(newT))
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index b88e07c23e5..ab3145e92da 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -215,9 +215,7 @@
cabin_air = new
cabin_air.volume = 200
cabin_air.temperature = T20C
- cabin_air.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
- cabin_air.gases[/datum/gas/oxygen][MOLES] = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
- cabin_air.gases[/datum/gas/nitrogen][MOLES] = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ cabin_air.adjust_multi(GAS_OXYGEN, (O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)), GAS_NITROGEN, (N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)))
add_cell()
add_scanmod()
diff --git a/tgstation.dme b/tgstation.dme
index ec89a81aa47..bcf59cab7ec 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -355,6 +355,7 @@
#include "code\__HELPERS\verbs.dm"
#include "code\__HELPERS\view.dm"
#include "code\__HELPERS\weakref.dm"
+//#include "code\__HELPERS\zas.dm"
#include "code\__HELPERS\sorts\__main.dm"
#include "code\__HELPERS\sorts\InsertSort.dm"
#include "code\__HELPERS\sorts\MergeSort.dm"
From 9001e9902e67d3f77eff00689acf9200aae64912 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Sun, 17 Apr 2022 18:19:45 -0400
Subject: [PATCH 007/200] adds immutable mixtures
---
.../ZAS/XGM/xgm_immutable_gas_mixture.dm | 58 +++++++++++++++++++
tgstation.dme | 1 +
2 files changed, 59 insertions(+)
create mode 100644 code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm
new file mode 100644
index 00000000000..efbdc276daf
--- /dev/null
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm
@@ -0,0 +1,58 @@
+/datum/gas_mixture/immutable
+ temperature = TCMB
+ var/initial_temperature = TCMB
+
+/datum/gas_mixture/immutable/update_values()
+ temperature = initial_temperature
+ return ..()
+
+/datum/gas_mixture/immutable/adjust_gas()
+ return
+
+/datum/gas_mixture/immutable/remove()
+ return new type
+
+/datum/gas_mixture/immutable/add()
+ return TRUE
+
+/datum/gas_mixture/immutable/subtract()
+ return TRUE
+
+/datum/gas_mixture/immutable/divide()
+ return TRUE
+
+/datum/gas_mixture/immutable/multiply()
+ return TRUE
+
+/datum/gas_mixture/immutable/adjust_gas_temp()
+ return
+
+/datum/gas_mixture/immutable/adjust_multi()
+ return
+
+/datum/gas_mixture/immutable/adjust_multi_temp()
+ return
+
+/datum/gas_mixture/immutable/merge()
+ return
+
+/datum/gas_mixture/immutable/copy_from()
+ return
+
+/datum/gas_mixture/immutable/heat_capacity()
+ return HEAT_CAPACITY_VACUUM
+
+/datum/gas_mixture/immutable/remove_ratio()
+ return new type
+
+/datum/gas_mixture/immutable/remove_volume()
+ return new type
+
+/datum/gas_mixture/immutable/remove_by_flag()
+ return new type
+
+/datum/gas_mixture/immutable/share_ratio(datum/gas_mixture/other, connecting_tiles, share_size, one_way)
+ . = ..()
+ temperature = initial_temperature
+
+
diff --git a/tgstation.dme b/tgstation.dme
index bcf59cab7ec..e3a64ff6816 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2360,6 +2360,7 @@
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\simple.dm"
#include "code\modules\atmospherics\ZAS\Turf.dm"
#include "code\modules\atmospherics\ZAS\XGM\gases.dm"
+#include "code\modules\atmospherics\ZAS\XGM\xgm_immutable_gas_mixture.dm"
#include "code\modules\atmospherics\ZAS\Zone.dm"
#include "code\modules\atmospherics\ZAS\_docs.dm"
#include "code\modules\atmospherics\ZAS\Airflow.dm"
From 5f3b937fadc0d7672e944f388a0fe08594e57633 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Sun, 17 Apr 2022 19:31:36 -0400
Subject: [PATCH 008/200] !!!/SIMULATED/ REMOVAL!!!
---
code/__DEFINES/atmospherics/ZAS.dm | 3 +-
code/__DEFINES/atmospherics/atmos_helpers.dm | 6 +-
code/__DEFINES/wounds.dm | 1 -
code/__HELPERS/maths.dm | 3 +
code/controllers/subsystem/zas.dm | 10 ++-
code/game/turfs/change_turf.dm | 6 +-
code/game/turfs/open/space/space.dm | 1 +
code/modules/admin/verbs/fix_air.dm | 5 +-
.../abductor/equipment/glands/plasma.dm | 2 +-
code/modules/atmospherics/ZAS/Atom.dm | 5 +-
code/modules/atmospherics/ZAS/Connection.dm | 14 +++--
code/modules/atmospherics/ZAS/Diagnostic.dm | 9 +--
code/modules/atmospherics/ZAS/Fire.dm | 40 +++++++-----
code/modules/atmospherics/ZAS/Temperature.dm | 5 +-
code/modules/atmospherics/ZAS/Turf.dm | 63 ++++++++++++-------
code/modules/atmospherics/ZAS/Zone.dm | 22 +++++--
16 files changed, 130 insertions(+), 65 deletions(-)
diff --git a/code/__DEFINES/atmospherics/ZAS.dm b/code/__DEFINES/atmospherics/ZAS.dm
index 95bb23b2daf..367469bb075 100644
--- a/code/__DEFINES/atmospherics/ZAS.dm
+++ b/code/__DEFINES/atmospherics/ZAS.dm
@@ -21,8 +21,9 @@
#define SOUTHDOWN (SOUTH|DOWN)
#define WESTDOWN (WEST|DOWN)
-#define TURF_HAS_VALID_ZONE(T) (istype(T, /turf/simulated) && T:zone && !T:zone:invalid)
+//#define TURF_HAS_VALID_ZONE(T) (istype(T, /turf/simulated) && T:zone && !T:zone:invalid) ZASTURF
+#define TURF_HAS_VALID_ZONE(T) (!istype(T, /turf/open/space) && T:zone && !T:zone:invalid)
#ifdef MULTIZAS
var/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTHUP, EASTUP, WESTUP, SOUTHUP, NORTHDOWN, EASTDOWN, WESTDOWN, SOUTHDOWN)
diff --git a/code/__DEFINES/atmospherics/atmos_helpers.dm b/code/__DEFINES/atmospherics/atmos_helpers.dm
index 1ad834b85eb..6ac20c153a3 100644
--- a/code/__DEFINES/atmospherics/atmos_helpers.dm
+++ b/code/__DEFINES/atmospherics/atmos_helpers.dm
@@ -31,8 +31,10 @@
#define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity())
///Directly adds a gas to a gas mixture without checking for its presence beforehand, use only if is certain the absence of said gas
-//#define ADD_GAS(gas_id, out_list)\
- var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id]; out_list[gas_id] = tmp_gaslist.Copy();
+/*
+#define ADD_GAS(gas_id, out_list)\
+ var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id];out_list[gas_id] = tmp_gaslist.Copy();
+*/
///Adds a gas to a gas mixture but checks if is already present, faster than the same proc
#define ASSERT_GAS(gas_id, gas_mixture) if (!gas_mixture.gases[gas_id]) { ADD_GAS(gas_id, gas_mixture.gases) };
diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm
index f30947c0362..7e7ba8abd8e 100644
--- a/code/__DEFINES/wounds.dm
+++ b/code/__DEFINES/wounds.dm
@@ -60,7 +60,6 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datu
/datum/wound/pierce/critical, /datum/wound/pierce/severe, /datum/wound/pierce/moderate,
/datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate))
-
// ~burn wound infection defines
// Thresholds for infection for burn wounds, once infestation hits each threshold, things get steadily worse
/// below this has no ill effects from infection
diff --git a/code/__HELPERS/maths.dm b/code/__HELPERS/maths.dm
index 49cab9bf273..41b2532999c 100644
--- a/code/__HELPERS/maths.dm
+++ b/code/__HELPERS/maths.dm
@@ -133,3 +133,6 @@
return "centuple"
else //It gets too tedious to use latin prefixes from here.
return "[number]-tuple"
+
+/// A random real number between low and high inclusive
+#define Frand(low, high) ( rand() * ((high) - (low)) + (low) )
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index 1e22bff9a18..ff50915b87b 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -165,7 +165,10 @@ SUBSYSTEM_DEF(zas)
to_chat(world, span_boldannounce("Processing Geometry..."))
var/simulated_turf_count = 0
- for(var/turf/simulated/S)
+ //for(var/turf/simulated/S) ZASTURF
+ for(var/turf/S)
+ if(istype(S, /turf/open/space))
+ continue
simulated_turf_count++
S.update_air_properties()
@@ -411,7 +414,8 @@ SUBSYSTEM_DEF(zas)
B.c_merge(A)
mark_zone_update(A)
-/datum/controller/subsystem/zas/proc/connect(turf/simulated/A, turf/simulated/B)
+//datum/controller/subsystem/zas/proc/connect(turf/simulated/A, turf/simulated/B) //ZASTURF
+/datum/controller/subsystem/zas/proc/connect(turf/A, turf/B)
#ifdef ZASDBG
ASSERT(istype(A))
ASSERT(isturf(B))
@@ -425,7 +429,7 @@ SUBSYSTEM_DEF(zas)
if(block & AIR_BLOCKED) return
var/direct = !(block & ZONE_BLOCKED)
- var/space = !istype(B)
+ var/space = istype(B, /turf/open/space)
if(!space)
if(min(A.zone.contents.len, B.zone.contents.len) < ZONE_MIN_SIZE || (direct && (equivalent_pressure(A.zone,B.zone) || times_fired == 0)))
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index 1671adb019a..4e402941ffa 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -83,13 +83,17 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
blueprint_data = null
if(connections) connections.erase_all()
-
+ /* ZASTURF
if(istype(src,/turf/simulated))
//Yeah, we're just going to rebuild the whole thing.
//Despite this being called a bunch during explosions,
//the zone will only really do heavy lifting once.
var/turf/simulated/S = src
if(S.zone) S.zone.rebuild()
+ */
+
+ if(simulated && zone)
+ zone.rebuild()
var/list/old_baseturfs = baseturfs
var/old_type = type
diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm
index 866590ed64e..9fbc6d1c1f2 100644
--- a/code/game/turfs/open/space/space.dm
+++ b/code/game/turfs/open/space/space.dm
@@ -8,6 +8,7 @@
temperature = TCMB
thermal_conductivity = OPEN_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 700000
+ simulated = FALSE
var/destination_z
var/destination_x
diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm
index 2faf3321614..0098317ce9f 100644
--- a/code/modules/admin/verbs/fix_air.dm
+++ b/code/modules/admin/verbs/fix_air.dm
@@ -36,7 +36,10 @@
for(var/id in xgm_gas_data.tile_overlay)
unsorted_overlays |= xgm_gas_data.tile_overlay[id]
- for(var/turf/simulated/T in world)
+ //for(var/turf/simulated/T in world) ZASTURF
+ for(var/turf/T in world)
+ if(!T.simulated)
+ continue
T.air = null
T.overlays.Remove(unsorted_overlays)
T.zone = null
diff --git a/code/modules/antagonists/abductor/equipment/glands/plasma.dm b/code/modules/antagonists/abductor/equipment/glands/plasma.dm
index 07bfd96d02e..41377d2db17 100644
--- a/code/modules/antagonists/abductor/equipment/glands/plasma.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/plasma.dm
@@ -16,7 +16,7 @@
if(!owner)
return
owner.visible_message(span_danger("[owner] vomits a cloud of plasma!"))
- var/turf/simulated/open/T = get_turf(owner)
+ var/turf/open/T = get_turf(owner)
if(istype(T))
T.atmos_spawn_air(GAS_PLASMA, 20, T20C)
owner.vomit()
diff --git a/code/modules/atmospherics/ZAS/Atom.dm b/code/modules/atmospherics/ZAS/Atom.dm
index 1f4b9cf7beb..56cb4d0c0a4 100644
--- a/code/modules/atmospherics/ZAS/Atom.dm
+++ b/code/modules/atmospherics/ZAS/Atom.dm
@@ -14,7 +14,10 @@
//Convenience function for atoms to update turfs they occupy
/atom/movable/proc/update_nearby_tiles(need_rebuild)
- for(var/turf/simulated/turf in locs)
+ //for(var/turf/simulated/turf in locs) ZASTURF
+ for(var/turf/turf in locs)
+ if(istype(turf, /turf/open/space))
+ continue
SSzas.mark_for_update(turf)
return 1
diff --git a/code/modules/atmospherics/ZAS/Connection.dm b/code/modules/atmospherics/ZAS/Connection.dm
index c7f33a0aaaf..55721a9e347 100644
--- a/code/modules/atmospherics/ZAS/Connection.dm
+++ b/code/modules/atmospherics/ZAS/Connection.dm
@@ -48,9 +48,12 @@ Class Procs:
Makes numerous checks to decide whether the connection is still valid. Erases it automatically if not.
*/
-
+/* ZASTURF
/connection/var/turf/simulated/A
/connection/var/turf/simulated/B
+*/
+/connection/var/turf/A
+/connection/var/turf/B
/connection/var/zone/zoneA
/connection/var/zone/zoneB
@@ -58,7 +61,8 @@ Class Procs:
/connection/var/state = 0
-/connection/New(turf/simulated/A, turf/simulated/B)
+//connection/New(turf/simulated/A, turf/simulated/B) ZASTURF
+/connection/New(turf/A, turf/B)
#ifdef ZASDBG
ASSERT(SSzas.has_valid_zone(A))
//ASSERT(SSzas.has_valid_zone(B))
@@ -66,7 +70,7 @@ Class Procs:
src.A = A
src.B = B
zoneA = A.zone
- if(!istype(B))
+ if(istype(B /turf/open/space))
mark_space()
edge = SSzas.get_edge(A.zone,B)
edge.add_connection(src)
@@ -103,7 +107,7 @@ Class Procs:
/connection/proc/update()
// log_debug("Updated, \...")
- if(!istype(A,/turf/simulated))
+ if(istype(A,/turf/open/space))
// log_debug("Invalid A.")
erase()
return
@@ -118,7 +122,7 @@ Class Procs:
else
mark_direct()
- var/b_is_space = !istype(B,/turf/simulated)
+ var/b_is_space = istype(B,/turf/open/space)
if(state & CONNECTION_SPACE)
if(!b_is_space)
diff --git a/code/modules/atmospherics/ZAS/Diagnostic.dm b/code/modules/atmospherics/ZAS/Diagnostic.dm
index 40e89108b7d..785b83078bb 100644
--- a/code/modules/atmospherics/ZAS/Diagnostic.dm
+++ b/code/modules/atmospherics/ZAS/Diagnostic.dm
@@ -17,9 +17,9 @@
/client/var/list/zone_debug_images
-/client/proc/Test_ZAS_Connection(var/turf/simulated/T as turf)
+/client/proc/Test_ZAS_Connection(var/turf/T as turf) //ZASTURF
set category = "Debug"
- if(!istype(T))
+ if(istype(T, /turf/open/space)) //ZASTURF
return
var/direction_list = list(\
@@ -43,8 +43,9 @@
to_chat(mob, "No air passage :x")
return
- var/turf/simulated/other_turf = get_step(T, direction_list[direction])
- if(!istype(other_turf))
+ //var/turf/simulated/other_turf = get_step(T, direction_list[direction]) ZASTURF
+ var/turf/other_turf = get_step(T, direction_list[direction])
+ if(istype(other_turf, /turf/open/space))
return
var/t_block = T.c_airblock(other_turf)
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
index 409646fcbd3..1037a7a5b3e 100644
--- a/code/modules/atmospherics/ZAS/Fire.dm
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -57,7 +57,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
fire_tiles -= T
fuel_objs -= fuel
else
- for(var/turf/simulated/T in fire_tiles)
+ //for(var/turf/simulated/T in fire_tiles) ZASTURF
+ for(var/turf/T in fire_tiles)
if(istype(T.fire))
qdel(T.fire)
fire_tiles.Cut()
@@ -92,7 +93,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/turf/proc/create_fire(fl)
return 0
-/turf/simulated/create_fire(fl)
+//turf/simulated/create_fire(fl) ZASTURF
+/turf/create_fire(fl)
if(fire)
fire.firelevel = max(fl, fire.firelevel)
return 1
@@ -109,6 +111,9 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
return 0
+/turf/open/space/create_fire()
+ return
+
/obj/effect/hotspot
anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -127,8 +132,9 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/obj/effect/hotspot/Process()
. = 1
- var/turf/simulated/my_tile = loc
- if(!istype(my_tile) || !my_tile.zone)
+ //var/turf/simulated/my_tile = loc ZASTURF
+ var/turf/my_tile = loc
+ if(istype(my_tile, /turf/open/space) || !my_tile.zone)
if(my_tile && my_tile.fire == src)
my_tile.fire = null
qdel(src)
@@ -155,9 +161,9 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//spread
for(var/direction in GLOB.cardinals)
- var/turf/simulated/enemy_tile = get_step(my_tile, direction)
-
- if(istype(enemy_tile))
+ //var/turf/simulated/enemy_tile = get_step(my_tile, direction) ZASTURF
+ var/turf/enemy_tile = get_step(my_tile, direction)
+ if(!istype(enemy_tile, /turf/open/space))
if(my_tile.open_directions & direction) //Grab all valid bordering tiles
if(!enemy_tile.zone || enemy_tile.fire)
continue
@@ -212,10 +218,15 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
SSzas.active_hotspots.Remove(src)
. = ..()
-/turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again.
+//turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again. ZASTURF
+/turf/var/fire_protection = 0
/turf/proc/apply_fire_protection()
-/turf/simulated/apply_fire_protection()
fire_protection = world.time
+/*/turf/simulated/apply_fire_protection() ZASTURF
+ fire_protection = world.time*/
+
+/turf/open/space/apply_fire_protection()
+ return
//Returns the firelevel
/datum/gas_mixture/proc/react(zone/zone, force_burn, no_check = 0)
@@ -438,16 +449,17 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
/turf/proc/adjacent_fire_act(turf/simulated/floor/source, exposed_temperature, exposed_volume)
return
-/turf/simulated/floor/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
+//turf/simulated/floor/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume) ZASTURF
+/turf/open/floor/adjacent_fire_act(turf/open/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
var/dir_to = get_dir(src, adj_turf)
for(var/obj/structure/window/W in src)
if(W.dir == dir_to || W.fulltile) //Same direction or diagonal (full tile)
W.fire_act(adj_air, adj_temp, adj_volume)
-/*/turf/simulated/wall/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
+/turf/closed/wall/adjacent_fire_act(turf/open/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
burn(adj_temp)
- if(adj_temp > material.melting_point)
- take_damage(log(Frand(0.9, 1.1) * (adj_temp - material.melting_point)), BURN)
+ if(adj_temp > heat_capacity)
+ take_damage(log(Frand(0.9, 1.1) * (adj_temp - heat_capacity)), BURN)
- return ..()*/
+ return ..()
diff --git a/code/modules/atmospherics/ZAS/Temperature.dm b/code/modules/atmospherics/ZAS/Temperature.dm
index 6aa01691ad6..6d502cbebbb 100644
--- a/code/modules/atmospherics/ZAS/Temperature.dm
+++ b/code/modules/atmospherics/ZAS/Temperature.dm
@@ -35,10 +35,11 @@
// Nullspace is room temperature, clearly.
var/adjust_temp
if(loc)
- if(!istype(loc, /turf/simulated))
+ if(!loc.simulated)
adjust_temp = loc.temperature
else
- var/turf/simulated/T = loc
+ //var/turf/simulated/T = loc
+ var/turf/T = loc
if(T.zone && T.zone.air)
adjust_temp = T.zone.air.temperature
else
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index 22f9e45529b..ac359e9e743 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -1,4 +1,4 @@
-/turf/simulated
+/turf
var/zone/zone
var/open_directions
@@ -11,10 +11,8 @@
var/list/initial_gas_mix
var/planetary_atmos //Let's just let this exist for now.
-#warn !!TEMPORARY PROCDEF!!
-/turf/open/proc/atmos_spawn_air(...)
-
-/turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null)
+///turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null) ZASTURF
+/turf/open/proc/update_graphic(list/graphic_add = null, list/graphic_null = null)
if(graphic_add && graphic_add.len)
vis_contents += graphic_add
if(graphic_remove && graphic_remove.len)
@@ -49,19 +47,20 @@
if(r_block & AIR_BLOCKED)
continue
- if(istype(unsim, /turf/simulated))
-
- var/turf/simulated/sim = unsim
+ //if(istype(unsim, /turf/simulated)) ZASTURF
+ if(unsim.simulated)
+ //var/turf/simulated/sim = unsim
if(TURF_HAS_VALID_ZONE(sim))
SSzas.connect(sim, src)
// Helper for can_safely_remove_from_zone().
+//ZASTURF - MACRO IM NOT COMMENTING THIS SHIT OUT
#define GET_ZONE_NEIGHBOURS(T, ret) \
ret = 0; \
if (T.zone) { \
for (var/_gzn_dir in gzn_check) { \
- var/turf/simulated/other = get_step(T, _gzn_dir); \
- if (istype(other) && other.zone == T.zone) { \
+ var/turf/other = get_step(T, _gzn_dir); \
+ if (!istype(other, /turf/open/space) && other.zone == T.zone) { \
var/block; \
ATMOS_CANPASS_TURF(block, other, T); \
if (!(block & AIR_BLOCKED)) { \
@@ -77,7 +76,8 @@
This implementation may produce false negatives but it (hopefully) will not produce any false postiives.
*/
-/turf/simulated/proc/can_safely_remove_from_zone()
+///turf/simulated/proc/can_safely_remove_from_zone() ZASTURF
+/turf/proc/can_safely_remove_from_zone()
if(!zone)
return 1
@@ -88,8 +88,10 @@
//for each pair of "adjacent" cardinals (e.g. NORTH and WEST, but not NORTH and SOUTH)
if((dir & check_dirs) == dir)
//check that they are connected by the corner turf
- var/turf/simulated/T = get_step(src, dir)
- if (!istype(T))
+ //var/turf/simulated/T = get_step(src, dir) ZASTURF
+ var/turf/T = get_step(src, dir)
+ //if (!istype(T)) ZASTURF
+ if (istype(T, /turf/open/space))
. &= ~dir
continue
@@ -101,7 +103,8 @@
//it is safe to remove src from the zone if all cardinals are connected by corner turfs
. = !.
-/turf/simulated/update_air_properties()
+//turf/simulated/update_air_properties() ZAS
+/turf/open/update_air_properties()
if(zone && zone.invalid) //this turf's zone is in the process of being rebuilt
c_copy_air() //not very efficient :(
@@ -160,8 +163,9 @@
//Check that our zone hasn't been cut off recently.
//This happens when windows move or are constructed. We need to rebuild.
- if((previously_open & d) && istype(unsim, /turf/simulated))
- var/turf/simulated/sim = unsim
+ //if((previously_open & d) && istype(unsim, /turf/simulated)) ZAS
+ if((previously_open & d) && !istype(unsim, /turf/open/space))
+ var/turf/sim = unsim
if(zone && sim.zone == zone)
zone.rebuild()
return
@@ -170,9 +174,10 @@
open_directions |= d
- if(istype(unsim, /turf/simulated))
+ //if(istype(unsim, /turf/simulated)) ZASTURF
+ if(!istype(unsim, /turf/open/space))
- var/turf/simulated/sim = unsim
+ var/turf/sim = unsim
sim.open_directions |= GLOB.reverse_dir[d]
if(TURF_HAS_VALID_ZONE(sim))
@@ -263,11 +268,13 @@
var/datum/gas_mixture/GM = return_air()
return GM.remove(amount)
-/turf/simulated/assume_air(datum/gas_mixture/giver)
+///turf/simulated/assume_air(datum/gas_mixture/giver) ZASTURF
+/turf/proc/assume_air(datum/gas_mixture/giver)
var/datum/gas_mixture/my_air = return_air()
my_air.merge(giver)
-/turf/simulated/assume_gas(gasid, moles, temp = null)
+//turf/simulated/assume_gas(gasid, moles, temp = null) ZASTURF
+/turf/proc/assume_gas(gasid, moles, temp = null)
var/datum/gas_mixture/my_air = return_air()
if(isnull(temp))
@@ -277,7 +284,8 @@
return 1
-/turf/simulated/return_air()
+//turf/simulated/return_air() ZASTURF
+/turf/proc/return_air()
if(zone)
if(!zone.invalid)
SSzas.mark_zone_update(zone)
@@ -299,12 +307,18 @@
air.gas = initial_gas.Copy()
air.update_values()
-/turf/simulated/proc/c_copy_air()
+//turf/simulated/proc/c_copy_air() ZASTURF
+/turf/proc/c_copy_air()
if(!air) air = new/datum/gas_mixture
air.copy_from(zone.air)
air.group_multiplier = 1
-/turf/simulated/proc/atmos_spawn_air(gas_id, amount, initial_temperature)
+/*/turf/open/space/c_copy_air()
+ return
+*/
+
+//turf/simulated/proc/atmos_spawn_air(gas_id, amount, initial_temperature) ZASTURF
+/turf/proc/atmos_spawn_air(gas_id, amount, initial_temperature)
var/datum/gas_mixture/new_gas = new
var/datum/gas_mixture/existing_gas = return_air()
if(isnull(initial_temperature))
@@ -313,6 +327,9 @@
new_gas.adjust_gas_temp(gas_id, amount, initial_temperature)
existing_gas.merge(new_gas)
+/turf/open/space/atmos_spawn_air()
+ return
+
/proc/turf_contains_dense_objects(var/turf/T)
return T.contains_dense_objects()
diff --git a/code/modules/atmospherics/ZAS/Zone.dm b/code/modules/atmospherics/ZAS/Zone.dm
index a46df8e036a..b56ea3e74d5 100644
--- a/code/modules/atmospherics/ZAS/Zone.dm
+++ b/code/modules/atmospherics/ZAS/Zone.dm
@@ -104,7 +104,10 @@ Class Procs:
ASSERT(!into.invalid)
#endif
c_invalidate()
- for(var/turf/simulated/T in contents)
+ //for(var/turf/simulated/T in contents) ZASTURF
+ for(var/turf/T in contents)
+ if(istype(T, /turf/open/space))
+ continue
into.add(T)
T.update_graphic(graphic_remove = air.graphic)
#ifdef ZASDBG
@@ -122,14 +125,19 @@ Class Procs:
invalid = 1
SSzas.remove_zone(src)
#ifdef ZASDBG
- for(var/turf/simulated/T in contents)
- T.dbg(invalid_zone)
+ //for(var/turf/simulated/T in contents) ZASTURF
+ for(var/turf/T in contents)
+ if(!istype(T, /turf/open/space))
+ T.dbg(invalid_zone)
#endif
/zone/proc/rebuild()
if(invalid) return //Short circuit for explosions where rebuild is called many times over.
c_invalidate()
- for(var/turf/simulated/T in contents)
+ //for(var/turf/simulated/T in contents) ZASTURF
+ for(var/turf/T in contents)
+ if(istype(T, /turf/open/space))
+ continue
T.update_graphic(graphic_remove = air.graphic) //we need to remove the overlays so they're not doubled when the zone is rebuilt
//T.dbg(invalid_zone)
T.needs_air_update = 0 //Reset the marker so that it will be added to the list.
@@ -153,7 +161,8 @@ Class Procs:
// Update gas overlays.
if(air.check_tile_graphic(graphic_add, graphic_remove))
- for(var/turf/simulated/T in contents)
+ //for(var/turf/simulated/T in contents)
+ for(var/turf/T in contents)
T.update_graphic(graphic_add, graphic_remove)
graphic_add.len = 0
graphic_remove.len = 0
@@ -182,7 +191,8 @@ Class Procs:
// Update atom temperature.
if(abs(air.temperature - last_air_temperature) >= ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD)
last_air_temperature = air.temperature
- for(var/turf/simulated/T in contents)
+ //for(var/turf/simulated/T in contents) ZASTURF
+ for(var/turf/T in contents)
for(var/check_atom in T.contents)
var/atom/checking = check_atom
if(checking.simulated)
From ca43d37e34b53d7e5600625f7c9448ea34000fef Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Mon, 18 Apr 2022 02:02:47 -0400
Subject: [PATCH 009/200] ITS TIME
---
code/controllers/subsystem/zas.dm | 14 +++
code/game/gamemodes/objective_items.dm | 2 +-
code/game/objects/effects/countdown.dm | 4 +-
code/game/objects/items/melee/misc.dm | 6 +-
.../objects/items/stacks/sheets/mineral.dm | 3 +-
code/game/objects/structures/bonfire.dm | 4 +-
code/game/turfs/open/space/space.dm | 4 +-
code/modules/admin/admin_verbs.dm | 2 +-
code/modules/admin/verbs/fix_air.dm | 4 +-
.../traitor/equipment/Malf_Modules.dm | 2 +-
code/modules/atmospherics/ZAS/Connection.dm | 2 +-
code/modules/atmospherics/ZAS/Fire.dm | 10 +-
code/modules/atmospherics/ZAS/Turf.dm | 15 +--
.../atmospherics/ZAS/XGM/xgm_gas_mixture.dm | 18 ++++
.../ZAS/XGM/xgm_immutable_gas_mixture.dm | 4 +-
.../atmospherics/machinery/airalarm.dm | 5 +-
.../atmospherics/machinery/components/tank.dm | 2 +-
.../components/trinary_devices/filter.dm | 43 ++++----
.../atmospherics/machinery/other/meter.dm | 6 +-
.../machinery/portable/canister.dm | 2 +-
code/modules/clothing/under/accessories.dm | 2 +-
.../kitchen_machinery/smartfridge.dm | 3 +-
.../modules/hydroponics/unique_plant_genes.dm | 5 +-
code/modules/mapping/map_template.dm | 7 +-
.../living/simple_animal/hostile/regalrat.dm | 4 +-
code/modules/mob/mob.dm | 4 +-
.../computers/item/tablet_presets.dm | 4 +-
.../computers/machinery/console_presets.dm | 2 +-
code/modules/power/lighting/light_items.dm | 3 +-
code/modules/power/singularity/singularity.dm | 3 +-
.../mapGeneratorModules/helpers.dm | 3 +-
.../mapGenerators/repair.dm | 2 +-
.../projectile/special/temperature.dm | 8 +-
.../chemistry/reagents/toxin_reagents.dm | 4 +-
.../chemistry/recipes/slime_extracts.dm | 5 +-
.../research/ordnance/doppler_array.dm | 4 +-
.../research/ordnance/tank_compressor.dm | 7 +-
.../xenobiology/crossbreeding/chilling.dm | 8 +-
.../ruins/lavalandruin_code/syndicate_base.dm | 3 +-
code/modules/shuttle/on_move.dm | 4 +-
code/modules/surgery/organs/lungs.dm | 101 +++++++++---------
code/modules/unit_tests/breath.dm | 4 +-
code/modules/unit_tests/gas_transfer.dm | 2 +
tgstation.dme | 8 +-
44 files changed, 206 insertions(+), 146 deletions(-)
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index ff50915b87b..aeb1e6ba1a8 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -555,3 +555,17 @@ SUBSYSTEM_DEF(zas)
qdel(temp)
return pipe_init_dirs_cache[type]["[init_dir]"]["[dir]"]
+
+/datum/controller/subsystem/zas/proc/setup_template_machinery(list/atmos_machines)
+ var/obj/machinery/atmospherics/AM
+ for(var/A in 1 to atmos_machines.len)
+ AM = atmos_machines[A]
+ AM.atmos_init()
+ CHECK_TICK
+
+ for(var/A in 1 to atmos_machines.len)
+ AM = atmos_machines[A]
+ var/list/targets = AM.get_rebuild_targets()
+ for(var/datum/pipeline/build_off as anything in targets)
+ build_off.build_pipeline_blocking(AM)
+ CHECK_TICK
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 4c66c5e301d..771eb72ce5b 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -283,7 +283,7 @@
..()
/datum/objective_item/steal/supermatter/TargetExists()
- return GLOB.main_supermatter_engine != null
+ return //GLOB.main_supermatter_engine != null
//Items with special checks!
/datum/objective_item/steal/plasma
diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm
index e5be8ffc0c0..9106e88ed11 100644
--- a/code/game/objects/effects/countdown.dm
+++ b/code/game/objects/effects/countdown.dm
@@ -93,10 +93,12 @@
color = "#00ff80"
/obj/effect/countdown/supermatter/get_value()
- var/obj/machinery/power/supermatter_crystal/S = attached_to
+/*
+ /var/obj/machinery/power/supermatter_crystal/S = attached_to
if(!istype(S))
return
return "[round(S.get_integrity_percent(), 1)]%
"
+ */
/obj/effect/countdown/transformer
name = "transformer countdown"
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 371a2eeb34f..12a78e769d0 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -171,6 +171,7 @@
playsound(get_turf(src), hitsound, 75, TRUE, -1)
return TOXLOSS
+/*
/obj/item/melee/supermatter_sword
name = "supermatter sword"
desc = "In a station full of bad ideas, this might just be the worst."
@@ -272,7 +273,7 @@
/obj/item/melee/supermatter_sword/add_blood_DNA(list/blood_dna)
return FALSE
-
+*/
/obj/item/melee/curator_whip
name = "curator's whip"
desc = "Somewhat eccentric and outdated, it still stings like hell to be hit by."
@@ -294,7 +295,7 @@
var/mob/living/carbon/human/human_target = target
human_target.drop_all_held_items()
human_target.visible_message(span_danger("[user] disarms [human_target]!"), span_userdanger("[user] disarmed you!"))
-
+/*
/obj/item/melee/roastingstick
name = "advanced roasting stick"
desc = "A telescopic roasting stick with a miniature shield generator designed to ensure entry into various high-tech shielded cooking ovens and firepits."
@@ -413,6 +414,7 @@
QDEL_NULL(beam)
playsound(src, 'sound/weapons/batonextend.ogg', 50, TRUE)
to_chat(user, span_notice("You put [src] away."))
+*/
/obj/item/melee/cleric_mace
name = "cleric mace"
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 66372fcc4eb..d85f33be32b 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -457,7 +457,8 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
return ..()
/obj/item/stack/sheet/mineral/coal/fire_act(exposed_temperature, exposed_volume)
- atmos_spawn_air("co2=[amount*10];TEMP=[exposed_temperature]")
+ var/turf/muhturf = get_turf(src)
+ muhturf.atmos_spawn_air(GAS_CO2, amount*10, exposed_temperature)
qdel(src)
/obj/item/stack/sheet/mineral/coal/five
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 916c42c01e8..327dcf0b93a 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -61,6 +61,7 @@
return ..()
if(used_item.get_temperature())
start_burning()
+ /*
if(grill)
if(istype(used_item, /obj/item/melee/roastingstick))
return FALSE
@@ -75,7 +76,8 @@
used_item.pixel_x = used_item.base_pixel_x + clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
used_item.pixel_y = used_item.base_pixel_y + clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
else
- return ..()
+ return ..()*/
+ return ..()
/obj/structure/bonfire/attack_hand(mob/user, list/modifiers)
diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm
index 9fbc6d1c1f2..2c044d922b3 100644
--- a/code/game/turfs/open/space/space.dm
+++ b/code/game/turfs/open/space/space.dm
@@ -14,7 +14,7 @@
var/destination_x
var/destination_y
- var/static/datum/gas_mixture/immutable/space/space_gas = new
+ var/static/datum/gas_mixture/immutable/space_gas = new
// run_later = TRUE
plane = PLANE_SPACE
layer = SPACE_LAYER
@@ -94,7 +94,7 @@
/turf/open/space/AfterChange()
..()
- atmos_overlay_types = null
+ //atmos_overlay_types = null
/turf/open/space/Assimilate_Air()
return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 7055901b8d3..3f04ef1b941 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -19,7 +19,7 @@ GLOBAL_PROTECT(admin_verbs_default)
/client/proc/mark_datum_mapview,
/client/proc/tag_datum_mapview,
/client/proc/debugstatpanel,
- /client/proc/fix_air, /*resets air in designated radius to its default atmos composition*/
+ /client/proc/fixatmos, /*resets air in designated radius to its default atmos composition*/
/client/proc/requests
)
GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm
index 0098317ce9f..8762e7edeea 100644
--- a/code/modules/admin/verbs/fix_air.dm
+++ b/code/modules/admin/verbs/fix_air.dm
@@ -14,8 +14,8 @@
var/current_time = world.timeofday
// Depower the supermatter, as it would quickly blow up once we remove all gases from the pipes.
- for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines)
- S.power = 0
+ /*for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines)
+ S.power = 0*/
to_chat(usr, "\[1/5\] - Supermatter depowered")
// Remove all gases from all pipenets
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index 9c84efd5524..8386386f162 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -3,7 +3,7 @@
GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
/obj/machinery/field/containment,
- /obj/machinery/power/supermatter_crystal,
+ //obj/machinery/power/supermatter_crystal,
/obj/machinery/doomsday_device,
/obj/machinery/nuclearbomb,
/obj/machinery/nuclearbomb/selfdestruct,
diff --git a/code/modules/atmospherics/ZAS/Connection.dm b/code/modules/atmospherics/ZAS/Connection.dm
index 55721a9e347..674c6265dd6 100644
--- a/code/modules/atmospherics/ZAS/Connection.dm
+++ b/code/modules/atmospherics/ZAS/Connection.dm
@@ -70,7 +70,7 @@ Class Procs:
src.A = A
src.B = B
zoneA = A.zone
- if(istype(B /turf/open/space))
+ if(istype(B, /turf/open/space))
mark_space()
edge = SSzas.get_edge(A.zone,B)
edge.add_connection(src)
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
index 1037a7a5b3e..33968da3bed 100644
--- a/code/modules/atmospherics/ZAS/Fire.dm
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -446,7 +446,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//return a truthy value of whether burning actually happened
return mx * (head_exposure + chest_exposure + groin_exposure + legs_exposure + arms_exposure)
-/turf/proc/adjacent_fire_act(turf/simulated/floor/source, exposed_temperature, exposed_volume)
+//turf/proc/adjacent_fire_act(turf/simulated/floor/source, exposed_temperature, exposed_volume)
+/turf/proc/adjacent_fire_act(turf/source, exposed_temperature, exposed_volume)
return
//turf/simulated/floor/adjacent_fire_act(turf/simulated/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume) ZASTURF
@@ -458,8 +459,13 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
W.fire_act(adj_air, adj_temp, adj_volume)
/turf/closed/wall/adjacent_fire_act(turf/open/floor/adj_turf, datum/gas_mixture/adj_air, adj_temp, adj_volume)
- burn(adj_temp)
+ //burn(adj_temp)
if(adj_temp > heat_capacity)
take_damage(log(Frand(0.9, 1.1) * (adj_temp - heat_capacity)), BURN)
return ..()
+
+/obj/effect/dummy/lighting_obj/moblight/fire
+ name = "fire"
+ light_color = LIGHT_COLOR_FIRE
+ light_range = LIGHT_RANGE_FIRE
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index ac359e9e743..2c223d56dba 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -12,7 +12,7 @@
var/planetary_atmos //Let's just let this exist for now.
///turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null) ZASTURF
-/turf/open/proc/update_graphic(list/graphic_add = null, list/graphic_null = null)
+/turf/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null)
if(graphic_add && graphic_add.len)
vis_contents += graphic_add
if(graphic_remove && graphic_remove.len)
@@ -50,8 +50,8 @@
//if(istype(unsim, /turf/simulated)) ZASTURF
if(unsim.simulated)
//var/turf/simulated/sim = unsim
- if(TURF_HAS_VALID_ZONE(sim))
- SSzas.connect(sim, src)
+ if(TURF_HAS_VALID_ZONE(unsim))
+ SSzas.connect(unsim, src)
// Helper for can_safely_remove_from_zone().
//ZASTURF - MACRO IM NOT COMMENTING THIS SHIT OUT
@@ -246,14 +246,15 @@
/turf/proc/post_update_air_properties()
if(connections) connections.update_all()
-
+/*
/turf/assume_air(datum/gas_mixture/giver) //use this for machines to adjust air
- return 0
+ return 0*/
-/turf/proc/assume_gas(gasid, moles, temp = 0)
- return 0
+/*/turf/proc/assume_gas(gasid, moles, temp = 0)
+ return 0*/
/turf/return_air()
+ RETURN_TYPE(/datum/gas_mixture)
//Create gas mixture to hold data for passing
var/datum/gas_mixture/GM = new
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
index aa85da6b36f..bb115cccdd8 100644
--- a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
@@ -493,6 +493,24 @@
update_values()
return gas
+/datum/gas_mixture/proc/return_visuals()
+ update_values()
+ check_tile_graphic()
+ return graphic
+
+/datum/gas_mixture/proc/copy()
+ RETURN_TYPE(/datum/gas_mixture)
+ var/datum/gas_mixture/new_gas = new
+ update_values()
+ new_gas.gas = src.gas
+ new_gas.temperature = src.temperature
+ new_gas.total_moles = src.total_moles
+ return new_gas
+
+/turf/open/proc/copy_air_with_tile(turf/open/target_turf)
+ if(istype(target_turf))
+ air.copy_from(target_turf.air)
+
/datum/gas_mixture/proc/leak_to_enviroment(datum/gas_mixture/environment)
pump_gas_passive(src, environment, calculate_transfer_moles(src, environment, src.return_pressure() - environment.return_pressure()))
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm
index efbdc276daf..f1fb6daff8b 100644
--- a/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_immutable_gas_mixture.dm
@@ -6,7 +6,7 @@
temperature = initial_temperature
return ..()
-/datum/gas_mixture/immutable/adjust_gas()
+/datum/gas_mixture/immutable/adjust_gas(gasid, moles, update = 1)
return
/datum/gas_mixture/immutable/remove()
@@ -24,7 +24,7 @@
/datum/gas_mixture/immutable/multiply()
return TRUE
-/datum/gas_mixture/immutable/adjust_gas_temp()
+/datum/gas_mixture/immutable/adjust_gas_temp(gasid, moles, temp, update = 1)
return
/datum/gas_mixture/immutable/adjust_multi()
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 61edb735bfd..39e7ecefdcb 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -917,6 +917,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
var/datum/port/output/pressure
var/datum/port/output/gas_amount
+ var/datum/port/output/my_temperature
var/obj/machinery/airalarm/connected_alarm
var/list/options_map
@@ -929,7 +930,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
request_data = add_input_port("Request Atmosphere Data", PORT_TYPE_SIGNAL)
pressure = add_output_port("Pressure", PORT_TYPE_NUMBER)
- temperature = add_output_port("Temperature", PORT_TYPE_NUMBER)
+ my_temperature = add_output_port("Temperature", PORT_TYPE_NUMBER)
gas_amount = add_output_port("Chosen Gas Amount", PORT_TYPE_NUMBER)
/obj/item/circuit_component/air_alarm/populate_options()
@@ -966,7 +967,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24)
var/turf/alarm_turf = get_turf(connected_alarm)
var/datum/gas_mixture/environment = alarm_turf.return_air()
pressure.set_output(round(environment.return_pressure()))
- temperature.set_output(round(environment.temperature))
+ my_temperature.set_output(round(environment.temperature))
if(ispath(options_map[current_option]))
gas_amount.set_output(round(environment.get_gases()[options_map[current_option]]))
return
diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm
index 8613c267306..951134dc6d8 100644
--- a/code/modules/atmospherics/machinery/components/tank.dm
+++ b/code/modules/atmospherics/machinery/components/tank.dm
@@ -268,7 +268,7 @@
window = image(icon, icon_state = "window-bg", layer = FLOAT_LAYER)
var/list/new_underlays = list()
- for(var/obj/effect/overlay/gas/gas as anything in air_contents.return_visuals())
+ for(var/obj/effect/gas_overlay/gas as anything in air_contents.return_visuals())
var/image/new_underlay = image(gas.icon, icon_state = gas.icon_state, layer = FLOAT_LAYER)
new_underlay.filters = alpha_mask_filter(icon = icon(icon, icon_state = "window-bg"))
new_underlays += new_underlay
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 78fd349b75c..a565712f11f 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -136,7 +136,7 @@
data["filter_types"] = list()
for(var/gas in GLOB.all_gases)
- data["filter_types"] += list(list("name" = gas[META_GAS_NAME], "enabled" = (path in filter_type)))
+ data["filter_types"] += list(list("name" = xgm_gas_data[gas], "enabled" = (gas in filter_type)))
return data
@@ -161,15 +161,15 @@
transfer_rate = clamp(rate, 0, MAX_TRANSFER_RATE)
investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS)
if("toggle_filter")
- if(!gas_id2path(params["val"]))
+ if(!params["val"])
return TRUE
- filter_type ^= gas_id2path(params["val"])
+ filter_type ^= params["val"]
var/change
- if(gas_id2path(params["val"]) in filter_type)
+ if(params["val"] in filter_type)
change = "added"
else
change = "removed"
- var/gas_name = GLOB.meta_gas_info[gas_id2path(params["val"])][META_GAS_NAME]
+ var/gas_name = xgm_gas_data.name[params["val"]]
investigate_log("[key_name(usr)] [change] [gas_name] from the filter type.", INVESTIGATE_ATMOS)
. = TRUE
update_appearance()
@@ -227,19 +227,20 @@
icon_state = "filter_on-0"
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2
name = "nitrogen filter"
- filter_type = list(/datum/gas/nitrogen)
+ filter_type = list(GAS_N2O)
/obj/machinery/atmospherics/components/trinary/filter/atmos/o2
name = "oxygen filter"
- filter_type = list(/datum/gas/oxygen)
+ filter_type = list(GAS_OXYGEN)
/obj/machinery/atmospherics/components/trinary/filter/atmos/co2
name = "carbon dioxide filter"
- filter_type = list(/datum/gas/carbon_dioxide)
+ filter_type = list(GAS_CO2)
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o
name = "nitrous oxide filter"
- filter_type = list(/datum/gas/nitrous_oxide)
+ filter_type = list(GAS_N2O)
/obj/machinery/atmospherics/components/trinary/filter/atmos/plasma
name = "plasma filter"
- filter_type = list(/datum/gas/plasma)
+ filter_type = list(GAS_PLASMA)
+/*
/obj/machinery/atmospherics/components/trinary/filter/atmos/bz
name = "bz filter"
filter_type = list(/datum/gas/bz)
@@ -252,9 +253,11 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos/healium
name = "healium filter"
filter_type = list(/datum/gas/healium)
+*/
/obj/machinery/atmospherics/components/trinary/filter/atmos/h2
name = "hydrogen filter"
- filter_type = list(/datum/gas/hydrogen)
+ filter_type = list(GAS_HYDROGEN)
+/*
/obj/machinery/atmospherics/components/trinary/filter/atmos/hypernoblium
name = "hypernoblium filter"
filter_type = list(/datum/gas/hypernoblium)
@@ -287,25 +290,26 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos/antinoblium
name = "antinoblium filter"
filter_type = list(/datum/gas/antinoblium)
-
+*/
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped //This feels wrong, I know
icon_state = "filter_on-0_f"
flipped = TRUE
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2
name = "nitrogen filter"
- filter_type = list(/datum/gas/nitrogen)
+ filter_type = list(GAS_NITROGEN)
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2
name = "oxygen filter"
- filter_type = list(/datum/gas/oxygen)
+ filter_type = list(GAS_OXYGEN)
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2
name = "carbon dioxide filter"
- filter_type = list(/datum/gas/carbon_dioxide)
+ filter_type = list(GAS_CO2)
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o
name = "nitrous oxide filter"
- filter_type = list(/datum/gas/nitrous_oxide)
+ filter_type = list(GAS_N2O)
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma
name = "plasma filter"
- filter_type = list(/datum/gas/plasma)
+ filter_type = list(GAS_PLASMA)
+ /*
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/bz
name = "bz filter"
filter_type = list(/datum/gas/bz)
@@ -318,9 +322,11 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/healium
name = "healium filter"
filter_type = list(/datum/gas/healium)
+*/
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/h2
name = "hydrogen filter"
- filter_type = list(/datum/gas/hydrogen)
+ filter_type = list(GAS_HYDROGEN)
+/*
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/hypernoblium
name = "hypernoblium filter"
filter_type = list(/datum/gas/hypernoblium)
@@ -351,6 +357,7 @@
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/antinoblium
name = "antinoblium filter"
filter_type = list(/datum/gas/antinoblium)
+*/
// These two filter types have critical_machine flagged to on and thus causes the area they are in to be exempt from the Grid Check event.
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index 767fa2534e3..b40d85073c1 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -154,7 +154,7 @@
///Pressure of the pipenet
var/datum/port/output/pressure
///Temperature of the pipenet
- var/datum/port/output/temperature
+ var/datum/port/output/net_temperature
///The component parent object
var/obj/machinery/meter/connected_meter
@@ -163,7 +163,7 @@
request_data = add_input_port("Request Meter Data", PORT_TYPE_SIGNAL, trigger = .proc/request_meter_data)
pressure = add_output_port("Pressure", PORT_TYPE_NUMBER)
- temperature = add_output_port("Temperature", PORT_TYPE_NUMBER)
+ net_temperature = add_output_port("Temperature", PORT_TYPE_NUMBER)
/obj/item/circuit_component/atmos_meter/register_usb_parent(atom/movable/shell)
. = ..()
@@ -180,7 +180,7 @@
return
var/datum/gas_mixture/environment = connected_meter.target.return_air()
pressure.set_output(environment.return_pressure())
- temperature.set_output(environment.temperature)
+ net_temperature.set_output(environment.temperature)
// TURF METER - REPORTS A TILE'S AIR CONTENTS
// why are you yelling?
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 968dc8f08f0..961929d52ed 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -679,7 +679,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
var/list/gaseslog = list() //list for logging all gases in canister
for(var/gas in air_contents.gas)
gaseslog[xgm_gas_data.name[gas]] = air_contents.get_gas(gas) //adds gases to gaseslog
- if(!xgm_gas_data.flags[gas] & XGM_GAS_CONTAMINANT|XGM_GAS_FUEL)
+ if(!(xgm_gas_data.flags[gas] & XGM_GAS_CONTAMINANT|XGM_GAS_FUEL))
continue
danger = TRUE //at least 1 danger gas
logmsg = "[key_name(usr)] opened a canister that contains the following:"
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 8612cae4cb2..632348c29d5 100755
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -269,7 +269,7 @@
return exposed_temperature > 300
/obj/item/clothing/accessory/medal/plasma/atmos_expose(datum/gas_mixture/air, exposed_temperature)
- var/open/turf/turfloc = get_turf(src)
+ var/turf/turfloc = get_turf(src)
turfloc.atmos_spawn_air(GAS_PLASMA, 20, exposed_temperature)
visible_message(span_danger("\The [src] bursts into flame!"), span_userdanger("Your [src] bursts into flame!"))
qdel(src)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 8ecf86d9684..fde566b6c08 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -370,7 +370,8 @@
. = ..()
if(. & EMP_PROTECT_SELF)
return
- atmos_spawn_air("TEMP=1000")
+ var/turf/T = get_turf(src)
+ T.atmos_spawn_air(GAS_OXYGEN, 1, 1000)
// ----------------------------
diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm
index a53924cf2f3..225eef969fe 100644
--- a/code/modules/hydroponics/unique_plant_genes.dm
+++ b/code/modules/hydroponics/unique_plant_genes.dm
@@ -621,13 +621,12 @@
stop_gas()
return
- var/turf/open/tray_turf = get_turf(tray)
+ var/turf/tray_turf = get_turf(tray)
if(abs(ONE_ATMOSPHERE - tray_turf.return_air().return_pressure()) > (seed.potency / 10 + 10)) // clouds can begin showing at around 50-60 potency in standard atmos
return
var/datum/gas_mixture/stank = new
- ADD_GAS(/datum/gas/miasma, stank.gases)
- stank.gases[/datum/gas/miasma][MOLES] = (seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * delta_time // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
+ stank.adjust_gas(GAS_METHANE, (seed.yield + 6) * 3.5 * MIASMA_CORPSE_MOLES * delta_time) // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
stank.temperature = T20C // without this the room would eventually freeze and miasma mining would be easier
tray_turf.assume_air(stank)
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 08f872c3072..00497473f12 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -105,7 +105,7 @@
// NOTE, now that Initialize and LateInitialize run correctly, do we really
// need these two below?
SSmachines.setup_template_powernets(cables)
- SSair.setup_template_machinery(atmos_machines)
+ SSzas.setup_template_machinery(atmos_machines)
SSshuttle.setup_shuttles(ports)
//calculate all turfs inside the border
@@ -156,11 +156,13 @@
var/list/border = block(locate(max(T.x-1, 1), max(T.y-1, 1), T.z),
locate(min(T.x+width+1, world.maxx), min(T.y+height+1, world.maxy), T.z))
+ /*
for(var/L in border)
var/turf/turf_to_disable = L
SSair.remove_from_active(turf_to_disable) //stop processing turfs along the border to prevent runtimes, we return it in initTemplateBounds()
turf_to_disable.atmos_adjacent_turfs?.Cut()
-
+ */
+ SSzas.can_fire = FALSE
// Accept cached maps, but don't save them automatically - we don't want
// ruins clogging up memory for the whole round.
var/datum/parsed_map/parsed = cached_map || new(file(mappath))
@@ -187,6 +189,7 @@
generate_ceiling(affected_turfs)
log_game("[name] loaded at [T.x],[T.y],[T.z]")
+ SSzas.can_fire = TRUE
return bounds
/datum/map_template/proc/generate_ceiling(affected_turfs)
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index 4bc3466dfc8..d556498e188 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -113,9 +113,9 @@
/mob/living/simple_animal/hostile/regalrat/handle_environment(datum/gas_mixture/environment)
. = ..()
- if(stat == DEAD || !environment || !environment.gases[/datum/gas/miasma])
+ if(stat == DEAD || !environment || !environment.get_gas(GAS_METHANE))
return
- var/miasma_percentage = environment.gases[/datum/gas/miasma][MOLES] / environment.total_moles()
+ var/miasma_percentage = environment.gas[GAS_METHANE] / environment.total_moles()
if(miasma_percentage>=0.25)
heal_bodypart_damage(1)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 87631e7d383..7191222d288 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -127,8 +127,8 @@
var/t = "[span_notice("Coordinates: [x],[y] ")]\n"
t += "[span_danger("Temperature: [environment.temperature] ")]\n"
for(var/id in environment.gas)
- if(gas[id])
- t+="[span_notice("[gas]: [gas[MOLES]] ")]\n"
+ if(!environment.get_gas(id))
+ t+="[span_notice("[xgm_gas_data.name[environment.gas]]: [environment.get_gas(id)] ")]\n"
to_chat(usr, t)
diff --git a/code/modules/modular_computers/computers/item/tablet_presets.dm b/code/modules/modular_computers/computers/item/tablet_presets.dm
index bbde8533364..acd31b0135b 100644
--- a/code/modules/modular_computers/computers/item/tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/tablet_presets.dm
@@ -73,7 +73,7 @@
. = ..()
var/obj/item/computer_hardware/hard_drive/small/hard_drive = find_hardware_by_name("solid state drive")
hard_drive.store_file(new /datum/computer_file/program/alarm_monitor)
- hard_drive.store_file(new /datum/computer_file/program/supermatter_monitor)
+ //hard_drive.store_file(new /datum/computer_file/program/supermatter_monitor)
/obj/item/modular_computer/tablet/preset/advanced/security/Initialize(mapload)
. = ..()
@@ -93,7 +93,7 @@
. = ..()
var/obj/item/computer_hardware/hard_drive/small/hard_drive = find_hardware_by_name("solid state drive")
hard_drive.store_file(new /datum/computer_file/program/alarm_monitor)
- hard_drive.store_file(new /datum/computer_file/program/supermatter_monitor)
+ //hard_drive.store_file(new /datum/computer_file/program/supermatter_monitor)
/// Given to Nuke Ops members.
/obj/item/modular_computer/tablet/nukeops/Initialize(mapload)
diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm
index e2e79eed7d0..3263088816b 100644
--- a/code/modules/modular_computers/computers/machinery/console_presets.dm
+++ b/code/modules/modular_computers/computers/machinery/console_presets.dm
@@ -36,7 +36,7 @@
var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
hard_drive.store_file(new/datum/computer_file/program/power_monitor())
hard_drive.store_file(new/datum/computer_file/program/alarm_monitor())
- hard_drive.store_file(new/datum/computer_file/program/supermatter_monitor())
+ //hard_drive.store_file(new/datum/computer_file/program/supermatter_monitor())
// ===== RESEARCH CONSOLE =====
/obj/machinery/modular_computer/console/preset/research
diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm
index c9a39ba40fc..58856a46ba9 100644
--- a/code/modules/power/lighting/light_items.dm
+++ b/code/modules/power/lighting/light_items.dm
@@ -135,5 +135,6 @@
force = 5
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, TRUE)
if(rigged)
- atmos_spawn_air("plasma=5") //5u of plasma are required to rig a light bulb/tube
+ var/turf/T = get_turf(src)
+ T.atmos_spawn_air(GAS_PLASMA, 5) //5u of plasma are required to rig a light bulb/tube
update()
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 5636cac5203..76d358296e4 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -290,11 +290,12 @@
/obj/singularity/proc/consume(atom/thing)
var/gain = thing.singularity_act(current_size, src)
energy += gain
- if(istype(thing, /obj/machinery/power/supermatter_crystal) && !consumed_supermatter)
+ /*if(istype(thing, /obj/machinery/power/supermatter_crystal) && !consumed_supermatter)
desc = "[initial(desc)] It glows fiercely with inner fire."
name = "supermatter-charged [initial(name)]"
consumed_supermatter = TRUE
set_light(10)
+ */
/obj/singularity/proc/check_cardinals_range(steps, retry_with_move = FALSE)
. = length(GLOB.cardinals) //Should be 4.
diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
index 844b41c05c7..6f82e45a4bf 100644
--- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
@@ -9,6 +9,7 @@
/datum/map_generator_module/bottom_layer/repressurize/generate()
if(!mother)
return
+ /*
var/list/map = mother.map
for(var/turf/T in map)
SSair.remove_from_active(T)
@@ -16,7 +17,7 @@
if(T.air)
T.air.copy_from_turf(T)
SSair.add_to_active(T, TRUE)
-
+*/
/datum/map_generator_module/bottom_layer/massdelete
spawnableAtoms = list()
spawnableTurfs = list()
diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm
index b305ac2c438..21789898daa 100644
--- a/code/modules/procedural_mapping/mapGenerators/repair.dm
+++ b/code/modules/procedural_mapping/mapGenerators/repair.dm
@@ -51,7 +51,7 @@
SSatoms.InitializeAtoms(atoms)
SSmachines.setup_template_powernets(cables)
- SSair.setup_template_machinery(atmos_machines)
+ SSzas.setup_template_machinery(atmos_machines)
GLOB.reloading_map = FALSE
/datum/map_generator/repair
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 6f6e39004e5..a3db79507f4 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -5,22 +5,22 @@
damage_type = BURN
nodamage = FALSE
armor_flag = ENERGY
- var/temperature = -50 // reduce the body temperature by 50 points
+ var/adj_temperature = -50 // reduce the body temperature by 50 points
/obj/projectile/temp/on_hit(atom/target, blocked = 0)
. = ..()
if(iscarbon(target))
var/mob/living/carbon/hit_mob = target
- var/thermal_protection = 1 - hit_mob.get_insulation_protection(hit_mob.bodytemperature + temperature)
+ var/thermal_protection = 1 - hit_mob.get_insulation_protection(hit_mob.bodytemperature + adj_temperature)
// The new body temperature is adjusted by the bullet's effect temperature
// Reduce the amount of the effect temperature change based on the amount of insulation the mob is wearing
- hit_mob.adjust_bodytemperature((thermal_protection * temperature) + temperature)
+ hit_mob.adjust_bodytemperature((thermal_protection * adj_temperature) + adj_temperature)
else if(isliving(target))
var/mob/living/L = target
// the new body temperature is adjusted by the bullet's effect temperature
- L.adjust_bodytemperature((1 - blocked) * temperature)
+ L.adjust_bodytemperature((1 - blocked) * adj_temperature)
/obj/projectile/temp/hot
name = "heat beam"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 5cbd3f2d9d1..bb1805373f3 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -107,8 +107,8 @@
if(!holder.my_atom)
return
- var/atom/A = holder.my_atom
- A.atmos_spawn_air("plasma=[volume];TEMP=[holder.chem_temp]")
+ var/turf/T = get_turf(holder.my_atom)
+ T.atmos_spawn_air(GAS_PLASMA, volume, holder.chem_temp)
holder.del_reagent(type)
/datum/reagent/toxin/plasma/expose_turf(turf/open/exposed_turf, reac_volume)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 331a8431dac..9996cf5e216 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -210,10 +210,9 @@
/datum/chemical_reaction/slime/slimefreeze/proc/freeze(datum/reagents/holder)
if(holder?.my_atom)
- var/turf/open/T = get_turf(holder.my_atom)
+ var/turf/T = get_turf(holder.my_atom)
if(istype(T))
- var/datum/gas/gastype = /datum/gas/nitrogen
- T.atmos_spawn_air("[initial(gastype.id)]=50;TEMP=2.7")
+ T.atmos_spawn_air(GAS_NITROGEN, 50, 2.7)
/datum/chemical_reaction/slime/slimefireproof
required_reagents = list(/datum/reagent/water = 1)
diff --git a/code/modules/research/ordnance/doppler_array.dm b/code/modules/research/ordnance/doppler_array.dm
index 56c93fbbe79..08103972c0e 100644
--- a/code/modules/research/ordnance/doppler_array.dm
+++ b/code/modules/research/ordnance/doppler_array.dm
@@ -284,8 +284,8 @@
// Make sure the list is indexed first.
if(reaction_data.len)
for (var/path in reaction_data[TANK_RESULTS_REACTION])
- var/datum/gas_reaction/reaction_path = path
- record_data["reaction_results"] += initial(reaction_path.name)
+ //var/datum/gas_reaction/reaction_path = path
+ record_data["reaction_results"] += "UNIMPLIMENTED - GAS REACTIONS"
if(TANK_MERGE_OVERPRESSURE in reaction_data[TANK_RESULTS_MISC])
record_data["reaction_results"] += "Tank overpressurized before reaction"
diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm
index 75070f324f2..824c7437c80 100644
--- a/code/modules/research/ordnance/tank_compressor.dm
+++ b/code/modules/research/ordnance/tank_compressor.dm
@@ -192,8 +192,8 @@
new_record.name = "Log Recording #[record_number]"
new_record.experiment_source = inserted_tank.name
new_record.timestamp = station_time_timestamp()
- for(var/gas_path in leaked_gas_buffer.gases)
- new_record.gas_data[gas_path] = leaked_gas_buffer.gases[gas_path][MOLES]
+ for(var/gas_path in leaked_gas_buffer.gas)
+ new_record.gas_data[gas_path] = leaked_gas_buffer.gas[gas_path]
compressor_record += new_record
record_number += 1
@@ -358,7 +358,6 @@
"gases" = list()
)
for (var/path in record.gas_data)
- var/datum/gas/gas_path = path
- single_record_data["gases"] += list(initial(gas_path.name) = record.gas_data[gas_path])
+ single_record_data["gases"] += list(path = record.gas_data[path])
data["records"] += list(single_record_data)
return data
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 56d2c56a8e9..d649701840c 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -104,14 +104,12 @@ Chilling extracts:
to_chat(user, span_warning("[src] can't affect such a large area."))
return
var/filtered = FALSE
- for(var/turf/open/T in A)
+ for(var/turf/T in A)
var/datum/gas_mixture/G = T.air
if(istype(G))
- G.assert_gas(/datum/gas/plasma)
- G.gases[/datum/gas/plasma][MOLES] = 0
+ G.gas[GAS_PLASMA] = 0
filtered = TRUE
- G.garbage_collect()
- T.//air_update_turf(FALSE, FALSE)
+ //T.air_update_turf(FALSE, FALSE)
if(filtered)
user.visible_message(span_notice("Cracks spread throughout [src], and some air is sucked in!"))
else
diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
index 1fd36f7a7d1..55c6bb5fc5d 100644
--- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm
+++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm
@@ -45,7 +45,7 @@
new /obj/item/organ/tongue/tied(src)
new /obj/item/autosurgeon/organ/syndicate/commsagent(src)
new /obj/item/clothing/gloves/radio(src)
-
+/*
/obj/machinery/power/supermatter_crystal/shard/syndicate
name = "syndicate supermatter shard"
desc = "Your benefactors conveinently neglected to mention it's already assembled."
@@ -61,3 +61,4 @@
return
else
. = ..()
+*/
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index f72f19c96ad..17659877f5b 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -88,7 +88,7 @@ All ShuttleMove procs go here
blocks_air = initial(blocks_air)
//air_update_turf(TRUE, blocks_air)
oldT.blocks_air = initial(oldT.blocks_air)
- oldT.//air_update_turf(TRUE, oldT.blocks_air)
+ //oldT.air_update_turf(TRUE, oldT.blocks_air)
/////////////////////////////////////////////////////////////////////////////////////
@@ -254,7 +254,7 @@ All ShuttleMove procs go here
A.atmos_init()
if(A.return_pipenet())
A.add_member(src)
- SSair.add_to_rebuild_queue(src)
+ SSzas.add_to_rebuild_queue(src)
else
// atmos_init() calls update_appearance(), so we don't need to call it
update_appearance()
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 7f7889f7f1f..cb1f8f01062 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -110,34 +110,35 @@
breather.throw_alert(ALERT_NOT_ENOUGH_NITRO, /atom/movable/screen/alert/not_enough_nitro)
return FALSE
- for(var/gas_id in GLOB.meta_gas_info)
- breath.assert_gas(gas_id)
-
if(istype(breather.wear_mask) && (breather.wear_mask.clothing_flags & GAS_FILTERING) && breather.wear_mask.has_filter)
breath = breather.wear_mask.consume_filter(breath)
var/gas_breathed = 0
- var/list/breath_gases = breath.gases
+ //var/list/breath_gases = breath.gases
+ //Handle subtypes' breath processing
+ handle_gas_override(breather, breath, gas_breathed)
//Partial pressures in our breath
- var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES]))
- var/N2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
- var/Plasma_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
- var/CO2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
+ var/O2_moles = breath.get_gas(GAS_OXYGEN)
+ var/N2_moles = breath.get_gas(GAS_NITROGEN)
+ var/plasma_moles = breath.get_gas(GAS_PLASMA)
+ var/CO2_moles = breath.get_gas(GAS_CO2)
+
+ var/O2_pp = breath.get_breath_partial_pressure(O2_moles)//+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES]))
+ var/N2_pp = breath.get_breath_partial_pressure(N2_moles)
+ var/Plasma_pp = breath.get_breath_partial_pressure(plasma_moles)
+ var/CO2_pp = breath.get_breath_partial_pressure(CO2_moles)
//Vars for n2o and healium induced euphorias.
var/n2o_euphoria = EUPHORIA_LAST_FLAG
var/healium_euphoria = EUPHORIA_LAST_FLAG
- //Handle subtypes' breath processing
- handle_gas_override(breather,breath_gases, gas_breathed)
-
//-- OXY --//
//Too much oxygen! //Yes, some species may not like it.
if(safe_oxygen_max)
if(O2_pp > safe_oxygen_max)
- var/ratio = (breath_gases[/datum/gas/oxygen][MOLES]/safe_oxygen_max) * 10
+ var/ratio = (O2_moles/safe_oxygen_max) * 10
breather.apply_damage_type(clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
breather.throw_alert(ALERT_TOO_MUCH_OXYGEN, /atom/movable/screen/alert/too_much_oxy)
else
@@ -146,18 +147,18 @@
//Too little oxygen!
if(safe_oxygen_min)
if(O2_pp < safe_oxygen_min)
- gas_breathed = handle_too_little_breath(breather, O2_pp, safe_oxygen_min, breath_gases[/datum/gas/oxygen][MOLES])
+ gas_breathed = handle_too_little_breath(breather, O2_pp, safe_oxygen_min, O2_moles)
breather.throw_alert(ALERT_NOT_ENOUGH_OXYGEN, /atom/movable/screen/alert/not_enough_oxy)
else
breather.failed_last_breath = FALSE
if(breather.health >= breather.crit_threshold)
breather.adjustOxyLoss(-5)
- gas_breathed = breath_gases[/datum/gas/oxygen][MOLES]
+ gas_breathed = O2_moles
breather.clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
//Exhale
- breath_gases[/datum/gas/oxygen][MOLES] -= gas_breathed
- breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
+ breath.adjust_gas(GAS_OXYGEN, -gas_breathed)
+ breath.adjust_gas(GAS_CO2, gas_breathed)
gas_breathed = 0
//-- Nitrogen --//
@@ -165,7 +166,7 @@
//Too much nitrogen!
if(safe_nitro_max)
if(N2_pp > safe_nitro_max)
- var/ratio = (breath_gases[/datum/gas/nitrogen][MOLES]/safe_nitro_max) * 10
+ var/ratio = (N2_moles/safe_nitro_max) * 10
breather.apply_damage_type(clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
breather.throw_alert(ALERT_TOO_MUCH_NITRO, /atom/movable/screen/alert/too_much_nitro)
else
@@ -174,18 +175,18 @@
//Too little nitrogen!
if(safe_nitro_min)
if(N2_pp < safe_nitro_min)
- gas_breathed = handle_too_little_breath(breather, N2_pp, safe_nitro_min, breath_gases[/datum/gas/nitrogen][MOLES])
+ gas_breathed = handle_too_little_breath(breather, N2_pp, safe_nitro_min, N2_moles)
breather.throw_alert(ALERT_NOT_ENOUGH_NITRO, /atom/movable/screen/alert/not_enough_nitro)
else
breather.failed_last_breath = FALSE
if(breather.health >= breather.crit_threshold)
breather.adjustOxyLoss(-5)
- gas_breathed = breath_gases[/datum/gas/nitrogen][MOLES]
+ gas_breathed = N2_moles
breather.clear_alert(ALERT_NOT_ENOUGH_NITRO)
//Exhale
- breath_gases[/datum/gas/nitrogen][MOLES] -= gas_breathed
- breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
+ breath.adjust_gas(GAS_NITROGEN, -gas_breathed)
+ breath.adjust_gas(GAS_CO2, gas_breathed)
gas_breathed = 0
//-- CO2 --//
@@ -211,18 +212,18 @@
//Too little CO2!
if(safe_co2_min)
if(CO2_pp < safe_co2_min)
- gas_breathed = handle_too_little_breath(breather, CO2_pp, safe_co2_min, breath_gases[/datum/gas/carbon_dioxide][MOLES])
+ gas_breathed = handle_too_little_breath(breather, CO2_pp, safe_co2_min, CO2_moles)
breather.throw_alert(ALERT_NOT_ENOUGH_CO2, /atom/movable/screen/alert/not_enough_co2)
else
breather.failed_last_breath = FALSE
if(breather.health >= breather.crit_threshold)
breather.adjustOxyLoss(-5)
- gas_breathed = breath_gases[/datum/gas/carbon_dioxide][MOLES]
+ gas_breathed = CO2_moles
breather.clear_alert(ALERT_NOT_ENOUGH_CO2)
//Exhale
- breath_gases[/datum/gas/carbon_dioxide][MOLES] -= gas_breathed
- breath_gases[/datum/gas/oxygen][MOLES] += gas_breathed
+ breath.adjust_gas(GAS_CO2, -gas_breathed)
+ breath.adjust_gas(GAS_OXYGEN, gas_breathed)
gas_breathed = 0
@@ -231,7 +232,7 @@
//Too much plasma!
if(safe_plasma_max)
if(Plasma_pp > safe_plasma_max)
- var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_plasma_max) * 10
+ var/ratio = (plasma_moles/safe_plasma_max) * 10
breather.apply_damage_type(clamp(ratio, plas_breath_dam_min, plas_breath_dam_max), plas_damage_type)
breather.throw_alert(ALERT_TOO_MUCH_PLASMA, /atom/movable/screen/alert/too_much_plas)
else
@@ -241,18 +242,18 @@
//Too little plasma!
if(safe_plasma_min)
if(Plasma_pp < safe_plasma_min)
- gas_breathed = handle_too_little_breath(breather, Plasma_pp, safe_plasma_min, breath_gases[/datum/gas/plasma][MOLES])
+ gas_breathed = handle_too_little_breath(breather, Plasma_pp, safe_plasma_min, plasma_moles)
breather.throw_alert(ALERT_NOT_ENOUGH_PLASMA, /atom/movable/screen/alert/not_enough_plas)
else
breather.failed_last_breath = FALSE
if(breather.health >= breather.crit_threshold)
breather.adjustOxyLoss(-5)
- gas_breathed = breath_gases[/datum/gas/plasma][MOLES]
+ gas_breathed = plasma_moles
breather.clear_alert(ALERT_NOT_ENOUGH_PLASMA)
//Exhale
- breath_gases[/datum/gas/plasma][MOLES] -= gas_breathed
- breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
+ breath.adjust_gas(GAS_PLASMA, -gas_breathed)
+ breath.adjust_gas(GAS_CO2, gas_breathed)
gas_breathed = 0
@@ -261,8 +262,8 @@
if(breath) // If there's some other shit in the air lets deal with it here.
// N2O
-
- var/SA_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrous_oxide][MOLES])
+ var/n2o_moles = breath.get_gas(GAS_N2O)
+ var/SA_pp = breath.get_breath_partial_pressure(n2o_moles)
if(SA_pp > SA_para_min) // Enough to make us stunned for a bit
breather.throw_alert(ALERT_TOO_MUCH_N2O, /atom/movable/screen/alert/too_much_n2o)
breather.Unconscious(60) // 60 gives them one second to wake up and run away a bit!
@@ -277,7 +278,7 @@
n2o_euphoria = EUPHORIA_INACTIVE
breather.clear_alert(ALERT_TOO_MUCH_N2O)
-
+ /*
// BZ
var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz][MOLES])
@@ -428,6 +429,7 @@
// Clear out moods when no miasma at all
else
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "smell")
+ */
if (n2o_euphoria == EUPHORIA_ACTIVE || healium_euphoria == EUPHORIA_ACTIVE)
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "chemical_euphoria", /datum/mood_event/chemical_euphoria)
@@ -436,12 +438,12 @@
// Activate mood on first flag, remove on second, do nothing on third.
handle_breath_temperature(breath, breather)
- breath.garbage_collect()
+ breath.update_values()
return TRUE
///override this for breath handling unique to lung subtypes, breath_gas is the list of gas in the breath while gas breathed is just what is being added or removed from that list, just as they are when this is called in check_breath()
-/obj/item/organ/lungs/proc/handle_gas_override(mob/living/carbon/human/breather, list/breath_gas, gas_breathed)
+/obj/item/organ/lungs/proc/handle_gas_override(mob/living/carbon/human/breather, datum/gas_mixture/breath, gas_breathed)
return
/obj/item/organ/lungs/proc/handle_too_little_breath(mob/living/carbon/human/suffocator = null, breath_pp = 0, safe_breath_min = 0, true_pp = 0)
@@ -524,8 +526,8 @@
/obj/item/organ/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/breather_slime)
. = ..()
- if (breath?.gases[/datum/gas/plasma])
- var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma][MOLES])
+ if (breath.get_gas(GAS_PLASMA))
+ var/plasma_pp = breath.get_breath_partial_pressure(breath.get_gas(GAS_PLASMA))
owner.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.
/obj/item/organ/lungs/cybernetic
@@ -578,7 +580,7 @@
// Normal oxygen is 21 kPa partial pressure, but SS13 humans can tolerate down
// to 16 kPa. So it follows that ashwalkers, as humanoids, follow the same rules.
#define GAS_TOLERANCE 5
-
+/*
/obj/item/organ/lungs/ashwalker/Initialize(mapload)
. = ..()
@@ -590,23 +592,14 @@
// Take a "breath" of the air
var/datum/gas_mixture/breath = mix.remove(mix.total_moles() * BREATH_PERCENTAGE)
- var/list/breath_gases = breath.gases
-
- breath.assert_gases(
- /datum/gas/oxygen,
- /datum/gas/plasma,
- /datum/gas/carbon_dioxide,
- /datum/gas/nitrogen,
- /datum/gas/bz,
- /datum/gas/miasma,
- )
-
var/oxygen_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])
var/nitrogen_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
var/plasma_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
var/carbon_dioxide_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
+ /*
var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz][MOLES])
var/miasma_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/miasma][MOLES])
+ */
safe_oxygen_min = max(0, oxygen_pp - GAS_TOLERANCE)
safe_nitro_min = max(0, nitrogen_pp - GAS_TOLERANCE)
@@ -621,13 +614,16 @@
safe_co2_max = carbon_dioxide_pp + GAS_TOLERANCE * 2
// The lung tolerance against BZ is also increased the amount of BZ in the base air
+ /*
BZ_trip_balls_min += bz_pp
BZ_brain_damage_min += bz_pp
+ */
// Lungs adapted to a high miasma atmosphere do not process it, and breathe it back out
- if(miasma_pp)
- suffers_miasma = FALSE
+ //if(miasma_pp)
+ //suffers_miasma = FALSE
+*/
#undef GAS_TOLERANCE
/obj/item/organ/lungs/ethereal
@@ -638,10 +634,11 @@
heat_level_2_threshold = 473
heat_level_3_threshold = 1073
-
+/*
/obj/item/organ/lungs/ethereal/handle_gas_override(mob/living/carbon/human/breather, list/breath_gases, gas_breathed)
// H2O electrolysis
gas_breathed = breath_gases[/datum/gas/water_vapor][MOLES]
breath_gases[/datum/gas/oxygen][MOLES] += gas_breathed
breath_gases[/datum/gas/hydrogen][MOLES] += gas_breathed*2
breath_gases[/datum/gas/water_vapor][MOLES] -= gas_breathed
+*/
diff --git a/code/modules/unit_tests/breath.dm b/code/modules/unit_tests/breath.dm
index d564b291a60..4a88ca40646 100644
--- a/code/modules/unit_tests/breath.dm
+++ b/code/modules/unit_tests/breath.dm
@@ -26,7 +26,7 @@
//Prep the floor
to_fill.initial_gas_mix = OPENTURF_DEFAULT_ATMOS
to_fill.air = new
- to_fill.air.copy_from_turf(to_fill)
+ to_fill.air.copy_from(to_fill.return_air())
lab_rat.breathe()
@@ -66,7 +66,7 @@
//Prep the floor
to_fill.initial_gas_mix = LAVALAND_DEFAULT_ATMOS
to_fill.air = new
- to_fill.air.copy_from_turf(to_fill)
+ to_fill.air.copy_from(to_fill.return_air())
lab_rat.breathe()
diff --git a/code/modules/unit_tests/gas_transfer.dm b/code/modules/unit_tests/gas_transfer.dm
index 097a9a5efdb..9a7b4a78d62 100644
--- a/code/modules/unit_tests/gas_transfer.dm
+++ b/code/modules/unit_tests/gas_transfer.dm
@@ -2,6 +2,7 @@
/datum/unit_test/atmospheric_gas_transfer
/datum/unit_test/atmospheric_gas_transfer/Run()
+ /*
for (var/tempNmoles in list(1e4, 1e6, 1e8, 1e10, 1e12))
var/datum/gas_mixture/first_mix = allocate(/datum/gas_mixture)
var/datum/gas_mixture/second_mix = allocate(/datum/gas_mixture)
@@ -27,3 +28,4 @@
var/margin = abs(second_mix.return_pressure() - (initial_pressure+additional_pressure))
TEST_ASSERT(margin<=error_margin, "Gas pressure pumping test failed for [tempNmoles]. Expected pressure = [initial_pressure+additional_pressure] +/- [error_margin]. Got [second_mix.return_pressure()].")
+ */
diff --git a/tgstation.dme b/tgstation.dme
index e3a64ff6816..e28066aea52 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -355,7 +355,7 @@
#include "code\__HELPERS\verbs.dm"
#include "code\__HELPERS\view.dm"
#include "code\__HELPERS\weakref.dm"
-//#include "code\__HELPERS\zas.dm"
+#include "code\__HELPERS\zas.dm"
#include "code\__HELPERS\sorts\__main.dm"
#include "code\__HELPERS\sorts\InsertSort.dm"
#include "code\__HELPERS\sorts\MergeSort.dm"
@@ -3574,7 +3574,7 @@
#include "code\modules\modular_computers\file_system\programs\secureye.dm"
#include "code\modules\modular_computers\file_system\programs\signaler.dm"
#include "code\modules\modular_computers\file_system\programs\skill_tracker.dm"
-#include "code\modules\modular_computers\file_system\programs\sm_monitor.dm"
+//#include "code\modules\modular_computers\file_system\programs\sm_monitor.dm"
#include "code\modules\modular_computers\file_system\programs\techweb.dm"
#include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm"
#include "code\modules\modular_computers\file_system\programs\antagonist\revelation.dm"
@@ -3693,15 +3693,19 @@
#include "code\modules\power\singularity\field_generator.dm"
#include "code\modules\power\singularity\narsie.dm"
#include "code\modules\power\singularity\singularity.dm"
+/*
#include "code\modules\power\supermatter\supermatter.dm"
#include "code\modules\power\supermatter\supermatter_hit_procs.dm"
#include "code\modules\power\supermatter\supermatter_process.dm"
#include "code\modules\power\supermatter\supermatter_radiation.dm"
+*/
#include "code\modules\power\tesla\coil.dm"
#include "code\modules\power\tesla\energy_ball.dm"
+/*
#include "code\modules\power\turbine\turbine.dm"
#include "code\modules\power\turbine\turbine_computer.dm"
#include "code\modules\power\turbine\turbine_parts.dm"
+*/
#include "code\modules\procedural_mapping\mapGenerator.dm"
#include "code\modules\procedural_mapping\mapGeneratorModule.dm"
#include "code\modules\procedural_mapping\mapGeneratorObj.dm"
From 05c5e8ac1edb79ddbc04bb098f4d4daf4607841e Mon Sep 17 00:00:00 2001
From: Francinum <5572280+francinum@users.noreply.github.com>
Date: Mon, 18 Apr 2022 02:41:27 -0400
Subject: [PATCH 010/200] ZAS HELL
---
_maps/atmostest.json | 6 +
_maps/map_files/debug/atmos_mintest.dmm | 1193 +++++++++++++++++++++++
2 files changed, 1199 insertions(+)
create mode 100644 _maps/atmostest.json
create mode 100644 _maps/map_files/debug/atmos_mintest.dmm
diff --git a/_maps/atmostest.json b/_maps/atmostest.json
new file mode 100644
index 00000000000..7fdd314ba1e
--- /dev/null
+++ b/_maps/atmostest.json
@@ -0,0 +1,6 @@
+{
+ "version": 1,
+ "map_name": "ZAS HELL",
+ "map_path": "map_files/debug",
+ "map_file": "atmos_mintest.dmm",
+}
diff --git a/_maps/map_files/debug/atmos_mintest.dmm b/_maps/map_files/debug/atmos_mintest.dmm
new file mode 100644
index 00000000000..5628c573064
--- /dev/null
+++ b/_maps/map_files/debug/atmos_mintest.dmm
@@ -0,0 +1,1193 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/space/basic,
+/area/space)
+"b" = (
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"c" = (
+/obj/effect/spawner/structure/window/plasma,
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"d" = (
+/obj/machinery/door/poddoor{
+ id = "c1vent";
+ name = "c1vent"
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"e" = (
+/obj/machinery/door/poddoor{
+ id = "c2vent";
+ name = "c2vent"
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"f" = (
+/obj/machinery/door/poddoor{
+ id = "c3vent";
+ name = "c3vent"
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"g" = (
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"h" = (
+/turf/open/floor/engine/plasma,
+/area/hallway/primary/central)
+"i" = (
+/turf/open/floor/engine/airless,
+/area/hallway/primary/central)
+"j" = (
+/turf/open/floor/engine/n2o,
+/area/hallway/primary/central)
+"k" = (
+/obj/item/card/id/advanced/debug,
+/obj/structure/rack,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"l" = (
+/obj/machinery/power/rtg/debug,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"m" = (
+/obj/machinery/door/poddoor{
+ id = "c1toc2";
+ name = "c1toc2"
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"n" = (
+/obj/machinery/door/poddoor{
+ id = "c2toc3";
+ name = "c2toc3"
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"o" = (
+/obj/effect/landmark/latejoin,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"p" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"q" = (
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"r" = (
+/obj/machinery/atmospherics/miner/plasma,
+/turf/open/floor/engine/plasma,
+/area/hallway/primary/central)
+"s" = (
+/obj/machinery/atmospherics/miner/n2o,
+/turf/open/floor/engine/n2o,
+/area/hallway/primary/central)
+"t" = (
+/obj/effect/landmark/observer_start,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"u" = (
+/obj/effect/turf_decal/trimline,
+/turf/open/floor/engine/plasma,
+/area/hallway/primary/central)
+"v" = (
+/obj/effect/turf_decal/trimline,
+/turf/open/floor/engine/airless,
+/area/hallway/primary/central)
+"w" = (
+/obj/effect/turf_decal/trimline,
+/turf/open/floor/engine/n2o,
+/area/hallway/primary/central)
+"x" = (
+/obj/effect/turf_decal/bot_red,
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"y" = (
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"z" = (
+/obj/machinery/meter/turf,
+/turf/open/floor/engine/plasma,
+/area/hallway/primary/central)
+"A" = (
+/obj/machinery/meter/turf,
+/turf/open/floor/engine/airless,
+/area/hallway/primary/central)
+"B" = (
+/obj/machinery/meter/turf,
+/turf/open/floor/engine/n2o,
+/area/hallway/primary/central)
+"C" = (
+/obj/item/card/id/advanced/gold/captains_spare,
+/obj/item/card/id/advanced/gold/captains_spare,
+/obj/item/card/id/advanced/gold/captains_spare,
+/obj/structure/rack,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"D" = (
+/obj/machinery/button/door{
+ id = "c1toc2";
+ name = "c1toc2"
+ },
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"E" = (
+/obj/machinery/button/door{
+ id = "c2toc3";
+ name = "c2toc3"
+ },
+/turf/closed/wall/r_wall,
+/area/hallway/primary/central)
+"F" = (
+/obj/machinery/button/door{
+ id = "c1vent";
+ name = "c1vent"
+ },
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"G" = (
+/obj/machinery/button/door{
+ id = "c2vent";
+ name = "c2vent"
+ },
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"H" = (
+/obj/machinery/button/door{
+ id = "c3vent";
+ name = "c3vent"
+ },
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"I" = (
+/obj/structure/cable,
+/obj/machinery/light/floor,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"J" = (
+/obj/item/pipe_dispenser,
+/obj/structure/table/reinforced,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"K" = (
+/obj/machinery/portable_atmospherics/canister/plasma,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"L" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"M" = (
+/obj/machinery/portable_atmospherics/canister/nitrogen,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"N" = (
+/obj/machinery/door/airlock/public,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"O" = (
+/turf/open/floor/iron/red,
+/area/hallway/primary/central)
+"P" = (
+/obj/machinery/meter/turf,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"Q" = (
+/obj/machinery/meter/turf,
+/turf/open/floor/iron/red,
+/area/hallway/primary/central)
+"R" = (
+/obj/machinery/light/floor,
+/turf/open/floor/iron/red,
+/area/hallway/primary/central)
+"S" = (
+/obj/machinery/door/airlock/external/glass,
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"T" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/public,
+/turf/open/floor/iron,
+/area/hallway/primary/central)
+"U" = (
+/obj/machinery/light/floor,
+/turf/open/floor/engine/plasma,
+/area/hallway/primary/central)
+"V" = (
+/obj/machinery/light/floor,
+/turf/open/floor/engine/airless,
+/area/hallway/primary/central)
+"W" = (
+/obj/machinery/light/floor,
+/turf/open/floor/engine/n2o,
+/area/hallway/primary/central)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+c
+c
+c
+b
+b
+b
+c
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+b
+b
+b
+c
+c
+c
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+b
+g
+g
+g
+g
+g
+b
+g
+g
+g
+b
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+g
+g
+g
+g
+g
+b
+a
+"}
+(4,1,1) = {"
+a
+c
+g
+l
+p
+l
+g
+c
+g
+I
+g
+c
+g
+q
+g
+g
+q
+g
+g
+g
+q
+g
+c
+g
+g
+q
+g
+g
+c
+a
+"}
+(5,1,1) = {"
+a
+c
+g
+g
+q
+p
+p
+T
+p
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+N
+g
+g
+P
+g
+g
+c
+a
+"}
+(6,1,1) = {"
+a
+c
+g
+l
+p
+l
+g
+c
+g
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+g
+g
+g
+g
+g
+c
+a
+"}
+(7,1,1) = {"
+a
+b
+g
+g
+g
+p
+y
+b
+g
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+g
+g
+g
+g
+g
+b
+a
+"}
+(8,1,1) = {"
+a
+b
+b
+c
+c
+c
+b
+b
+g
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+b
+c
+N
+c
+b
+b
+a
+"}
+(9,1,1) = {"
+a
+b
+h
+h
+h
+h
+h
+b
+g
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+g
+g
+g
+g
+g
+b
+a
+"}
+(10,1,1) = {"
+a
+d
+h
+h
+h
+h
+h
+c
+g
+p
+g
+c
+g
+q
+g
+g
+q
+g
+g
+g
+q
+g
+c
+g
+g
+g
+g
+g
+c
+a
+"}
+(11,1,1) = {"
+a
+d
+h
+U
+r
+u
+z
+c
+F
+I
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+g
+g
+g
+g
+g
+c
+a
+"}
+(12,1,1) = {"
+a
+d
+h
+h
+h
+h
+h
+c
+g
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+N
+g
+g
+P
+g
+g
+c
+a
+"}
+(13,1,1) = {"
+a
+b
+h
+h
+h
+h
+h
+b
+g
+p
+g
+c
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+g
+g
+q
+g
+g
+c
+a
+"}
+(14,1,1) = {"
+a
+b
+b
+m
+m
+m
+b
+D
+g
+p
+g
+b
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+g
+g
+g
+g
+g
+c
+a
+"}
+(15,1,1) = {"
+a
+b
+i
+i
+i
+i
+i
+b
+g
+p
+g
+N
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+g
+g
+g
+g
+g
+b
+a
+"}
+(16,1,1) = {"
+a
+e
+i
+i
+i
+v
+i
+c
+g
+p
+g
+N
+g
+q
+g
+g
+q
+g
+g
+g
+q
+g
+b
+b
+c
+N
+c
+b
+b
+a
+"}
+(17,1,1) = {"
+a
+e
+i
+V
+i
+i
+A
+c
+G
+I
+g
+N
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+g
+g
+g
+g
+g
+b
+a
+"}
+(18,1,1) = {"
+a
+e
+i
+i
+i
+v
+i
+c
+g
+p
+g
+b
+J
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+g
+g
+g
+g
+g
+c
+a
+"}
+(19,1,1) = {"
+a
+b
+i
+i
+i
+i
+i
+b
+g
+p
+g
+c
+K
+g
+g
+g
+g
+g
+g
+g
+g
+g
+N
+g
+g
+q
+g
+g
+c
+a
+"}
+(20,1,1) = {"
+a
+b
+b
+n
+n
+n
+b
+E
+g
+p
+g
+c
+K
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+g
+g
+P
+g
+g
+c
+a
+"}
+(21,1,1) = {"
+a
+b
+j
+j
+j
+j
+j
+b
+g
+p
+g
+c
+K
+q
+g
+g
+q
+g
+g
+g
+q
+g
+c
+g
+g
+g
+g
+g
+c
+a
+"}
+(22,1,1) = {"
+a
+f
+j
+j
+j
+w
+j
+c
+g
+p
+g
+c
+L
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+g
+g
+g
+g
+g
+b
+a
+"}
+(23,1,1) = {"
+a
+f
+j
+W
+s
+w
+B
+c
+H
+I
+g
+c
+L
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+b
+c
+N
+c
+b
+b
+a
+"}
+(24,1,1) = {"
+a
+f
+j
+j
+j
+w
+j
+c
+g
+p
+g
+c
+L
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+O
+O
+O
+O
+O
+b
+a
+"}
+(25,1,1) = {"
+a
+b
+j
+j
+j
+j
+j
+b
+g
+p
+g
+c
+M
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+O
+O
+O
+O
+O
+c
+a
+"}
+(26,1,1) = {"
+a
+b
+b
+c
+c
+c
+b
+b
+g
+p
+g
+c
+M
+g
+g
+g
+g
+g
+g
+g
+g
+g
+N
+O
+O
+Q
+O
+O
+S
+a
+"}
+(27,1,1) = {"
+a
+c
+k
+o
+t
+x
+C
+c
+g
+q
+g
+c
+M
+q
+g
+g
+q
+g
+g
+g
+q
+g
+c
+O
+O
+R
+O
+O
+c
+a
+"}
+(28,1,1) = {"
+a
+b
+g
+g
+q
+g
+g
+N
+g
+g
+g
+b
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+b
+O
+O
+O
+O
+O
+b
+a
+"}
+(29,1,1) = {"
+a
+b
+b
+c
+c
+c
+b
+b
+b
+c
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+b
+b
+b
+c
+S
+c
+b
+b
+a
+"}
+(30,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
From a1444e745e2f882d04d96b39c0bbb4bda2100966 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Mon, 18 Apr 2022 04:02:35 -0400
Subject: [PATCH 011/200] it compiles
---
code/__HELPERS/atmospherics.dm | 4 +-
.../subsystem/processing/processing.dm | 2 +-
code/controllers/subsystem/zas.dm | 6 +-
code/datums/atmosphere/planetary.dm | 34 +++++-----
code/datums/components/gas_leaker.dm | 2 +-
code/game/machinery/doors/door.dm | 2 +-
code/game/machinery/doors/firedoor.dm | 2 +-
code/game/machinery/doors/windowdoor.dm | 2 +-
.../effects/effect_system/effects_smoke.dm | 2 +-
code/game/objects/effects/glowshroom.dm | 4 +-
.../circuitboards/computer_circuitboards.dm | 2 +-
.../circuitboards/machine_circuitboards.dm | 10 +--
code/game/objects/items/powerfist.dm | 4 +-
code/game/objects/items/tanks/jetpack.dm | 4 +-
code/game/objects/structures/aliens.dm | 2 +-
.../objects/structures/industrial_lift.dm | 2 +-
.../structures/transit_tubes/station.dm | 5 +-
.../objects/structures/windoor_assembly.dm | 2 +-
code/game/objects/structures/window.dm | 4 +-
code/game/turfs/open/space/space.dm | 3 +-
.../antagonists/blob/structures/_blob.dm | 2 +-
code/modules/atmospherics/ZAS/Airflow.dm | 7 +-
code/modules/atmospherics/ZAS/Atom.dm | 6 +-
code/modules/atmospherics/ZAS/Debug.dm | 16 ++---
code/modules/atmospherics/ZAS/Fire.dm | 2 +-
code/modules/atmospherics/ZAS/Plasma.dm | 6 +-
code/modules/atmospherics/ZAS/Turf.dm | 7 +-
code/modules/atmospherics/ZAS/XGM/gas_data.dm | 4 +-
code/modules/atmospherics/ZAS/XGM/gases.dm | 10 +--
code/modules/atmospherics/ZAS/ZAS_Settings.dm | 5 +-
.../atmospherics/machinery/airalarm.dm | 30 ++++-----
.../atmospherics/machinery/components/tank.dm | 13 ++--
.../atmospherics/machinery/other/miner.dm | 40 +++++------
.../machinery/portable/canister.dm | 63 +++++++++---------
.../machinery/portable/scrubber.dm | 19 ++----
code/modules/cargo/bounties/engineering.dm | 12 ++--
code/modules/cargo/exports/large_objects.dm | 2 +-
code/modules/cargo/packs.dm | 6 +-
code/modules/clothing/masks/gas_filter.dm | 3 +-
.../experisci/experiment/experiments.dm | 12 ++--
code/modules/mining/equipment/survival_pod.dm | 2 +-
.../mob/living/simple_animal/bot/bot.dm | 2 +-
code/modules/reagents/chem_splash.dm | 2 +-
code/modules/recycling/disposal/bin.dm | 2 +-
.../research/designs/machine_designs.dm | 14 ++--
code/modules/research/designs/misc_designs.dm | 2 +-
.../modules/research/designs/power_designs.dm | 6 +-
.../icons/effects/contamination.dmi | Bin 0 -> 709 bytes
.../icons/effects/tile_effects.dmi | Bin 0 -> 1514 bytes
.../master_files/icons/testing/Zone.dmi | Bin 0 -> 955 bytes
.../master_files/icons/testing/air_meter.dmi | Bin 0 -> 463 bytes
.../icons/testing/atmos_testing.dmi | Bin 0 -> 390 bytes
.../icons/testing/turf_analysis.dmi | Bin 0 -> 1144 bytes
53 files changed, 198 insertions(+), 195 deletions(-)
create mode 100644 modular_pariah/master_files/icons/effects/contamination.dmi
create mode 100644 modular_pariah/master_files/icons/effects/tile_effects.dmi
create mode 100644 modular_pariah/master_files/icons/testing/Zone.dmi
create mode 100644 modular_pariah/master_files/icons/testing/air_meter.dmi
create mode 100644 modular_pariah/master_files/icons/testing/atmos_testing.dmi
create mode 100644 modular_pariah/master_files/icons/testing/turf_analysis.dmi
diff --git a/code/__HELPERS/atmospherics.dm b/code/__HELPERS/atmospherics.dm
index 8dc421e33d7..ca0c2fc006a 100644
--- a/code/__HELPERS/atmospherics.dm
+++ b/code/__HELPERS/atmospherics.dm
@@ -1,11 +1,11 @@
-/proc/molar_cmp_less_than(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL)
+/*/proc/molar_cmp_less_than(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL)
return (a < (b + epsilon))
/proc/molar_cmp_greater_than(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL)
return ((a + epsilon) > b)
/proc/molar_cmp_equals(a,b,epsilon = MAXIMUM_ERROR_GAS_REMOVAL)
- return (((a + epsilon) > b) && ((a - epsilon) < b))
+ return (((a + epsilon) > b) && ((a - epsilon) < b))*/
/** A simple rudimentary gasmix to information list converter. Can be used for UIs.
* Args:
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 665f4915f42..8f7380198bd 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -9,7 +9,7 @@ SUBSYSTEM_DEF(processing)
var/stat_tag = "P" //Used for logging
var/list/processing = list()
var/list/currentrun = list()
- var/const/process_proc = /datum/proc/process //Francinum is going to FUCK ME (Of course I will~)
+ var/process_proc = /datum/proc/process //Francinum is going to FUCK ME (Of course I will~)
/datum/controller/subsystem/processing/stat_entry(msg)
msg = "[stat_tag]:[length(processing)]"
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index aeb1e6ba1a8..d593c053d63 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -70,7 +70,7 @@ SUBSYSTEM_DEF(zas)
//The variable setting controller
var/datum/zas_controller/settings
//A reference to the global var
- var/datum/xgm_gas_data/gas_data = xgm_gas_data
+ var/datum/xgm_gas_data/gas_data
//Geometry lists
var/list/zones = list()
@@ -160,7 +160,7 @@ SUBSYSTEM_DEF(zas)
var/starttime = REALTIMEOFDAY
settings = new
- gas_data = new
+ gas_data = xgm_gas_data
to_chat(world, span_boldannounce("Processing Geometry..."))
@@ -294,7 +294,7 @@ SUBSYSTEM_DEF(zas)
var/obj/effect/hotspot/F = curr_hotspot[curr_hotspot.len]
curr_hotspot.len--
- F.Process()
+ F.process()
if (MC_TICK_CHECK)
return
diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm
index 83596399b71..da84dcf888c 100644
--- a/code/datums/atmosphere/planetary.dm
+++ b/code/datums/atmosphere/planetary.dm
@@ -3,19 +3,19 @@
id = LAVALAND_DEFAULT_ATMOS
base_gases = list(
- /datum/gas/oxygen=5,
- /datum/gas/nitrogen=10,
+ GAS_OXYGEN = 5,
+ GAS_NITROGEN = 10,
)
normal_gases = list(
- /datum/gas/oxygen=10,
- /datum/gas/nitrogen=10,
- /datum/gas/carbon_dioxide=10,
+ GAS_OXYGEN = 10,
+ GAS_NITROGEN = 10,
+ GAS_CO2 = 10,
)
restricted_gases = list(
- /datum/gas/plasma=0.1,
- /datum/gas/bz=1.2,
- /datum/gas/miasma=1.2,
- /datum/gas/water_vapor=0.1,
+ GAS_PLASMA =0.1,
+ ///datum/gas/bz=1.2,
+ ///datum/gas/miasma=1.2,
+ ///datum/gas/water_vapor=0.1,
)
restricted_chance = 30
@@ -29,18 +29,18 @@
id = ICEMOON_DEFAULT_ATMOS
base_gases = list(
- /datum/gas/oxygen=5,
- /datum/gas/nitrogen=10,
+ GAS_OXYGEN = 5,
+ GAS_NITROGEN = 10,
)
normal_gases = list(
- /datum/gas/oxygen=10,
- /datum/gas/nitrogen=10,
- /datum/gas/carbon_dioxide=10,
+ GAS_OXYGEN = 10,
+ GAS_NITROGEN = 10,
+ GAS_CO2 = 10,
)
restricted_gases = list(
- /datum/gas/plasma=0.1,
- /datum/gas/water_vapor=0.1,
- /datum/gas/miasma=1.2,
+ GAS_PLASMA=0.1,
+ ///datum/gas/water_vapor=0.1,
+ ///datum/gas/miasma=1.2,
)
restricted_chance = 20
diff --git a/code/datums/components/gas_leaker.dm b/code/datums/components/gas_leaker.dm
index f18a8cdd0d8..eaf24de0001 100644
--- a/code/datums/components/gas_leaker.dm
+++ b/code/datums/components/gas_leaker.dm
@@ -77,7 +77,7 @@
return PROCESS_KILL
var/turf/location = get_turf(master)
var/datum/gas_mixture/open_air = location.return_air()
- var/true_rate = (1 - (current_integrity / master.max_integrity)) * leak_rate
+ //var/true_rate = (1 - (current_integrity / master.max_integrity)) * leak_rate
for(var/datum/gas_mixture/mix as anything in airs)
mix.leak_to_enviroment(open_air)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 8e9b2fc379f..0cbee448c4a 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -167,7 +167,7 @@
return
/obj/machinery/door/Move()
- var/turf/T = loc
+ //var/turf/T = loc
. = ..()
/*if(density) //Gotta be closed my friend
move_update_air(T)*/
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index f314b223636..8c2b1ab3bcb 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -659,7 +659,7 @@
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
-/obj/machinery/door/firedoor/border_only/can_atmos_pass(turf/T, vertical = FALSE)
+/obj/machinery/door/firedoor/border_only/c_block(turf/T, vertical = FALSE)
if(get_dir(loc, T) == dir)
return !density
else
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index b989be0dbbf..89f43331e89 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -173,7 +173,7 @@
return TRUE
-/obj/machinery/door/window/can_atmos_pass(turf/T, vertical = FALSE)
+/obj/machinery/door/window/c_block(turf/T, vertical = FALSE)
if(get_dir(loc, T) == dir)
return !density
else
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 5eb1ba1b59f..bc15a1782cb 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -77,7 +77,7 @@
if(!t_loc)
return
var/list/newsmokes = list()
- for(var/turf/T in t_loc.get_adjacent_open_turfs())
+ for(var/turf/T in get_adjacent_open_turfs(t_loc))
var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
if(foundsmoke)
continue
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 91d64c25c76..2c87da4834f 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -136,7 +136,7 @@ GLOBAL_VAR_INIT(glowshrooms, 0)
/obj/structure/glowshroom/proc/Spread()
var/turf/ownturf = get_turf(src)
- var/list/turf/shares = ownturf.get_adjacent_open_turfs()
+ var/list/turf/shares = get_adjacent_open_turfs(ownturf)
if(!length(shares)) //If we are in a 1x1 room
return //Deal with it not now
@@ -147,7 +147,7 @@ GLOBAL_VAR_INIT(glowshrooms, 0)
for(var/turf/open/floor/earth in oview(2,src))
if(is_type_in_typecache(earth, blacklisted_glowshroom_turfs))
continue
- if(!length(earth.get_adjacent_open_turfs()))
+ if(!length(get_adjacent_open_turfs(earth)))
continue
possible_locs += earth
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index dd22f011c53..39274306b89 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -222,7 +222,7 @@
/obj/item/circuitboard/computer/turbine_computer
name = "Turbine Computer (Computer Board)"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/computer/turbine_computer
+ //build_path = /obj/machinery/computer/turbine_computer
//Generic
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 2c46da75401..b1625a5e1ef 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -201,7 +201,7 @@
/obj/item/circuitboard/machine/turbine_compressor
name = "Turbine - Inlet Compressor (Machine Board)"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/power/turbine/inlet_compressor/constructed
+ //build_path = /obj/machinery/power/turbine/inlet_compressor/constructed
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/stack/sheet/iron = 5)
@@ -209,7 +209,7 @@
/obj/item/circuitboard/machine/turbine_rotor
name = "Turbine - Core Rotor (Machine Board)"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/power/turbine/core_rotor/constructed
+ //build_path = /obj/machinery/power/turbine/core_rotor/constructed
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/stack/sheet/iron = 5)
@@ -217,7 +217,7 @@
/obj/item/circuitboard/machine/turbine_stator
name = "Turbine - Turbine Outlet (Machine Board)"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/power/turbine/turbine_outlet/constructed
+ //build_path = /obj/machinery/power/turbine/turbine_outlet/constructed
req_components = list(
/obj/item/stack/cable_coil = 5,
/obj/item/stack/sheet/iron = 5)
@@ -347,7 +347,7 @@
/obj/item/circuitboard/machine/bluespace_sender
name = "Bluespace Sender (Machine Board)"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
- build_path = /obj/machinery/atmospherics/components/unary/bluespace_sender
+ //build_path = /obj/machinery/atmospherics/components/unary/bluespace_sender
req_components = list(
/obj/item/stack/cable_coil = 10,
/obj/item/stack/sheet/glass = 10,
@@ -483,7 +483,7 @@
/obj/item/circuitboard/machine/electrolyzer
name = "Electrolyzer (Machine Board)"
greyscale_colors = CIRCUIT_COLOR_GENERIC
- build_path = /obj/machinery/electrolyzer
+ //build_path = /obj/machinery/electrolyzer
req_components = list(
/obj/item/stock_parts/manipulator = 2,
/obj/item/stock_parts/capacitor = 2,
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index e4bb53e9841..4cd66ae96e0 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -92,14 +92,14 @@
target.visible_message(span_danger("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!"), \
span_userdanger("[user]'s punches you!"))
return
- if(!molar_cmp_equals(gasused.total_moles(), gasperfist * fisto_setting))
+ /*if(!molar_cmp_equals(gasused.total_moles(), gasperfist * fisto_setting))
to_chat(user, span_warning("\The [src]'s piston-ram lets out a weak hiss, it needs more gas!"))
playsound(loc, 'sound/weapons/punch4.ogg', 50, TRUE)
target.apply_damage((force / 2), BRUTE)
target.visible_message(span_danger("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!"), \
span_userdanger("[user]'s punch strikes with force!"))
return
-
+ */
target.apply_damage(force * fisto_setting, BRUTE, wound_bonus = CANT_WOUND)
target.visible_message(span_danger("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!"), \
span_userdanger("You cry out in pain as [user]'s punch flings you backwards!"))
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 14fafa34062..40e1586635c 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -8,7 +8,7 @@
w_class = WEIGHT_CLASS_BULKY
distribute_pressure = ONE_ATMOSPHERE * O2STANDARD
actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
- var/gas_type = /datum/gas/oxygen
+ var/gas_type = GAS_OXYGEN
var/on = FALSE
var/stabilizers = FALSE
var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not
@@ -209,4 +209,4 @@
icon_state = "jetpack-black"
inhand_icon_state = "jetpack-black"
distribute_pressure = 0
- gas_type = /datum/gas/carbon_dioxide
+ gas_type = GAS_CO2
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 07c969e0739..d9eaf40ce12 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -202,7 +202,7 @@
qdel(src)
return
//lets try to grow in a direction
- for(var/turf/check_turf in src_turf.get_adjacent_open_turfs())
+ for(var/turf/check_turf in get_adjacent_open_turfs(src_turf))
//we cannot grow on blacklisted turfs
if(is_type_in_list(check_turf, blacklisted_turfs))
continue
diff --git a/code/game/objects/structures/industrial_lift.dm b/code/game/objects/structures/industrial_lift.dm
index 9d8d3c14539..3a0326f56aa 100644
--- a/code/game/objects/structures/industrial_lift.dm
+++ b/code/game/objects/structures/industrial_lift.dm
@@ -8,7 +8,7 @@
var/list/lift_platforms
/// Typepath list of what to ignore smashing through, controls all lifts
var/list/ignored_smashthroughs = list(
- /obj/machinery/power/supermatter_crystal,
+ //obj/machinery/power/supermatter_crystal,
/obj/structure/holosign
)
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 64eaf8362c0..1072a24a227 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -169,8 +169,9 @@
if(QDELETED(pod))
return
var/datum/gas_mixture/floor_mixture = loc.return_air()
- if(pod.air_contents.equalize(floor_mixture)) //equalize the pod's mix with the tile it's on
- //air_update_turf(FALSE, FALSE)
+ /*if(pod.air_contents.equalize(floor_mixture)) //equalize the pod's mix with the tile it's on
+ air_update_turf(FALSE, FALSE)
+ */
/obj/structure/transit_tube/station/init_tube_dirs()
switch(dir)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 7354b182b93..9cb53c83a5f 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -69,7 +69,7 @@
if(istype(mover, /obj/structure/windoor_assembly) || istype(mover, /obj/machinery/door/window))
return valid_window_location(loc, mover.dir, is_fulltile = FALSE)
-/obj/structure/windoor_assembly/can_atmos_pass(turf/T, vertical = FALSE)
+/obj/structure/windoor_assembly/c_block(turf/T, vertical = FALSE)
if(get_dir(loc, T) == dir)
return !density
else
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 3fa1b100076..b10ec13e00a 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -329,13 +329,13 @@
return ..()
/obj/structure/window/Move()
- var/turf/T = loc
+ //var/turf/T = loc
. = ..()
/*
if(anchored)
move_update_air(T)*/
-/obj/structure/window/can_atmos_pass(turf/T, vertical = FALSE)
+/obj/structure/window/c_block(turf/T, vertical = FALSE)
if(!anchored || !density)
return TRUE
return !(fulltile || dir == get_dir(loc, T))
diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm
index 2c044d922b3..86d4c46115d 100644
--- a/code/game/turfs/open/space/space.dm
+++ b/code/game/turfs/open/space/space.dm
@@ -84,9 +84,10 @@
var/turf/T = locate(destination_x, destination_y, destination_z)
user.forceMove(T)
+/*
/turf/open/space/Initalize_Atmos(times_fired)
return
-
+*/
/turf/open/space/TakeTemperature(temp)
/turf/open/space/RemoveLattice()
diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm
index 7734c3c363d..7e7c9947c04 100644
--- a/code/modules/antagonists/blob/structures/_blob.dm
+++ b/code/modules/antagonists/blob/structures/_blob.dm
@@ -98,7 +98,7 @@
/obj/structure/blob/block_superconductivity()
return atmosblock
-/obj/structure/blob/can_atmos_pass(turf/T, vertical = FALSE)
+/obj/structure/blob/c_block(turf/T, vertical = FALSE)
return !atmosblock
/obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind.
diff --git a/code/modules/atmospherics/ZAS/Airflow.dm b/code/modules/atmospherics/ZAS/Airflow.dm
index 06ea7684d26..a085b95e0ef 100644
--- a/code/modules/atmospherics/ZAS/Airflow.dm
+++ b/code/modules/atmospherics/ZAS/Airflow.dm
@@ -34,6 +34,9 @@ Contains helper procs for airflow, handled in /connection_group.
return 0
..()
+/atom/movable/proc/experience_pressure_difference()
+ return
+
/mob/proc/slip_chance()
return
@@ -43,8 +46,8 @@ Contains helper procs for airflow, handled in /connection_group.
if(buckled)
return FALSE
if(shoes)
- var/obj/item/clothing/shoes = shoes
- if(shoes.clothing_flags & NOSLIP|NOSLIP_ICE)
+ var/obj/item/clothing/myshoes = shoes
+ if(myshoes.clothing_flags & NOSLIP|NOSLIP_ICE)
return FALSE
if(m_intent == MOVE_INTENT_RUN) //No running in the halls!
diff --git a/code/modules/atmospherics/ZAS/Atom.dm b/code/modules/atmospherics/ZAS/Atom.dm
index 56cb4d0c0a4..8beaf560c01 100644
--- a/code/modules/atmospherics/ZAS/Atom.dm
+++ b/code/modules/atmospherics/ZAS/Atom.dm
@@ -1,4 +1,4 @@
-/turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
+/*/turf/CanPass(atom/movable/mover, , height=1.5,air_group=0)
if(target.blocks_air||blocks_air)
return 0
@@ -11,6 +11,7 @@
return 0
return ..()
+*/
//Convenience function for atoms to update turfs they occupy
/atom/movable/proc/update_nearby_tiles(need_rebuild)
@@ -52,3 +53,6 @@
/atom
var/simulated = TRUE
var/can_atmos_pass = ATMOS_PASS_YES
+
+/atom/proc/c_block(turf/target_turf, vertical = FALSE)
+ return
diff --git a/code/modules/atmospherics/ZAS/Debug.dm b/code/modules/atmospherics/ZAS/Debug.dm
index 0022e12c3ed..6fc387fc79e 100644
--- a/code/modules/atmospherics/ZAS/Debug.dm
+++ b/code/modules/atmospherics/ZAS/Debug.dm
@@ -1,11 +1,11 @@
-var/image/assigned = image('icons/Testing/Zone.dmi', icon_state = "assigned")
-var/image/created = image('icons/Testing/Zone.dmi', icon_state = "created")
-var/image/merged = image('icons/Testing/Zone.dmi', icon_state = "merged")
-var/image/invalid_zone = image('icons/Testing/Zone.dmi', icon_state = "invalid")
-var/image/air_blocked = image('icons/Testing/Zone.dmi', icon_state = "block")
-var/image/zone_blocked = image('icons/Testing/Zone.dmi', icon_state = "zoneblock")
-var/image/blocked = image('icons/Testing/Zone.dmi', icon_state = "fullblock")
-var/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark")
+var/image/assigned = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "assigned")
+var/image/created = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "created")
+var/image/merged = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "merged")
+var/image/invalid_zone = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "invalid")
+var/image/air_blocked = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "block")
+var/image/zone_blocked = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "zoneblock")
+var/image/blocked = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "fullblock")
+var/image/mark = image('modular_pariah/master_files/icons/testing/Zone.dmi', icon_state = "mark")
/connection_edge/var/dbg_out = 0
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
index 33968da3bed..8b138ef620a 100644
--- a/code/modules/atmospherics/ZAS/Fire.dm
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -129,7 +129,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
var/firelevel = 1 //Calculated by gas_mixture.calculate_firelevel()
-/obj/effect/hotspot/Process()
+/obj/effect/hotspot/process()
. = 1
//var/turf/simulated/my_tile = loc ZASTURF
diff --git a/code/modules/atmospherics/ZAS/Plasma.dm b/code/modules/atmospherics/ZAS/Plasma.dm
index c8eab424a31..64f28ec787d 100644
--- a/code/modules/atmospherics/ZAS/Plasma.dm
+++ b/code/modules/atmospherics/ZAS/Plasma.dm
@@ -1,4 +1,4 @@
-GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contamination.dmi'))
+GLOBAL_DATUM_INIT(contamination_overlay, /image, image('modular_pariah/master_files/icons/effects/contamination.dmi'))
/datum/pl_control
var/plasma_dmg = 3
@@ -56,7 +56,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat
add_overlay(GLOB.contamination_overlay)
/obj/item/decontaminate()
- flags_2 ~= CONTAMINATED_2
+ flags_2 &= ~CONTAMINATED_2
cut_overlay(GLOB.contamination_overlay)
@@ -166,7 +166,7 @@ GLOBAL_DATUM_INIT(contamination_overlay, /image, image('icons/effects/contaminat
/turf/Entered(obj/item/I)
. = ..()
//Items that are in plasma, but not on a mob, can still be contaminated.
- if(istype(I) && SSzas && SSzas.settings.plc.cloth_contamination && I.can_contaminate())
+ if(istype(I) && SSzas && SSzas.settings?.plc.cloth_contamination && I.can_contaminate())
var/datum/gas_mixture/env = return_air(1)
if(!env)
return
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index 2c223d56dba..bfe223bb8f3 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -252,6 +252,8 @@
/*/turf/proc/assume_gas(gasid, moles, temp = 0)
return 0*/
+/atom/movable/proc/block_superconductivity()
+ return
/turf/return_air()
RETURN_TYPE(/datum/gas_mixture)
@@ -270,7 +272,7 @@
return GM.remove(amount)
///turf/simulated/assume_air(datum/gas_mixture/giver) ZASTURF
-/turf/proc/assume_air(datum/gas_mixture/giver)
+/turf/assume_air(datum/gas_mixture/giver)
var/datum/gas_mixture/my_air = return_air()
my_air.merge(giver)
@@ -286,7 +288,8 @@
return 1
//turf/simulated/return_air() ZASTURF
-/turf/proc/return_air()
+/turf/return_air()
+ RETURN_TYPE(/datum/gas_mixture)
if(zone)
if(!zone.invalid)
SSzas.mark_zone_update(zone)
diff --git a/code/modules/atmospherics/ZAS/XGM/gas_data.dm b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
index 64885c3c810..bd5a51db51f 100644
--- a/code/modules/atmospherics/ZAS/XGM/gas_data.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
@@ -1,4 +1,4 @@
-GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data)
+GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data) = new
/datum/xgm_gas_data
//Simple list of all the gas IDs.
var/list/gases = list()
@@ -93,7 +93,7 @@ GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data)
/obj/effect/gas_overlay
name = "gas"
desc = "You shouldn't be clicking this."
- icon = 'icons/effects/tile_effects.dmi'
+ icon = 'modular_pariah/master_files/icons/effects/tile_effects.dmi'
icon_state = "generic"
layer = FIRE_LAYER
appearance_flags = RESET_COLOR|PIXEL_SCALE|TILE_BOUND
diff --git a/code/modules/atmospherics/ZAS/XGM/gases.dm b/code/modules/atmospherics/ZAS/XGM/gases.dm
index ec311df2592..1f38fa75453 100644
--- a/code/modules/atmospherics/ZAS/XGM/gases.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gases.dm
@@ -30,7 +30,7 @@
name = "Methyl Bromide"
specific_heat = 42.59 // J/(mol*K)
molar_mass = 0.095 // kg/mol
- breathed_product = /datum/reagent/toxin/methyl_bromide
+ //breathed_product = /datum/reagent/toxin/methyl_bromide
symbol_html = "CH3Br"
symbol = "CH3Br"
@@ -128,7 +128,7 @@
specific_heat = 80 // J/(mol*K)
molar_mass = 0.004 // kg/mol
flags = XGM_GAS_FUSION_FUEL
- breathed_product = /datum/reagent/helium
+ //breathed_product = /datum/reagent/helium
symbol_html = "He"
symbol = "He"
@@ -162,7 +162,7 @@
name = "Xenon"
specific_heat = 3 // J/(mol*K)
molar_mass = 0.054 // kg/mol
- breathed_product = /datum/reagent/nitrous_oxide/xenon
+ //breathed_product = /datum/reagent/nitrous_oxide/xenon
symbol_html = "Xe"
symbol = "Xe"
@@ -195,7 +195,7 @@
specific_heat = 5 // J/(mol*K)
molar_mass = 0.017 // kg/mol
flags = XGM_GAS_CONTAMINANT
- breathed_product = /datum/reagent/toxin/chlorine
+ //breathed_product = /datum/reagent/toxin/chlorine
symbol_html = "Cl"
symbol = "Cl"
@@ -236,6 +236,6 @@
name = "Carbon Monoxide"
specific_heat = 30 // J/(mol*K)
molar_mass = 0.028 // kg/mol
- breathed_product = /datum/reagent/carbon_monoxide
+ //breathed_product = /datum/reagent/carbon_monoxide
symbol_html = "CO"
symbol = "CO"
diff --git a/code/modules/atmospherics/ZAS/ZAS_Settings.dm b/code/modules/atmospherics/ZAS/ZAS_Settings.dm
index 1cf3d2fbee8..430d48f9d49 100644
--- a/code/modules/atmospherics/ZAS/ZAS_Settings.dm
+++ b/code/modules/atmospherics/ZAS/ZAS_Settings.dm
@@ -1,5 +1,5 @@
/datum/zas_controller
- var/datum/pl_control/plc
+ var/datum/pl_control/plc = new
var/fire_consuption_rate = 0.25
var/fire_consuption_rate_NAME = "Fire - Air Consumption Ratio"
@@ -73,6 +73,3 @@
var/connection_temperature_delta = 10
var/connection_temperature_delta_NAME = "Connections - Temperature Difference"
var/connection_temperature_delta_DESC = "The smallest temperature difference which will cause heat to travel through doors."
-
-/datum/zas_controller/Initalize()
- plc = new
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 39e7ecefdcb..657444209d1 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -824,13 +824,13 @@
TLV = list(
"pressure" = new/datum/tlv/no_checks,
"temperature" = new/datum/tlv/no_checks,
- /datum/gas/oxygen = new/datum/tlv/no_checks,
- /datum/gas/nitrogen = new/datum/tlv/no_checks,
- /datum/gas/carbon_dioxide = new/datum/tlv/no_checks,
- /datum/gas/miasma = new/datum/tlv/no_checks,
- /datum/gas/plasma = new/datum/tlv/no_checks,
- /datum/gas/nitrous_oxide = new/datum/tlv/no_checks,
- /datum/gas/bz = new/datum/tlv/no_checks,
+ GAS_OXYGEN = new/datum/tlv/no_checks,
+ GAS_NITROGEN = new/datum/tlv/no_checks,
+ GAS_CO2 = new/datum/tlv/no_checks,
+ //datum/gas/miasma = new/datum/tlv/no_checks,
+ GAS_PLASMA = new/datum/tlv/no_checks,
+ GAS_N2O = new/datum/tlv/no_checks,
+ /*/datum/gas/bz = new/datum/tlv/no_checks,
/datum/gas/hypernoblium = new/datum/tlv/no_checks,
/datum/gas/water_vapor = new/datum/tlv/no_checks,
/datum/gas/tritium = new/datum/tlv/no_checks,
@@ -843,19 +843,19 @@
/datum/gas/zauker = new/datum/tlv/dangerous,
/datum/gas/helium = new/datum/tlv/dangerous,
/datum/gas/antinoblium = new/datum/tlv/dangerous,
- /datum/gas/halon = new/datum/tlv/dangerous,
+ /datum/gas/halon = new/datum/tlv/dangerous,*/
)
/obj/machinery/airalarm/kitchen_cold_room // Kitchen cold rooms start off at -14°C or 259.15K.
TLV = list(
"pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE * 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
"temperature" = new/datum/tlv(COLD_ROOM_TEMP-40, COLD_ROOM_TEMP-20, COLD_ROOM_TEMP+20, COLD_ROOM_TEMP+40),
- /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
- /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000),
- /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10),
- /datum/gas/miasma = new/datum/tlv/(-1, -1, 2, 5),
- /datum/gas/plasma = new/datum/tlv/dangerous,
- /datum/gas/nitrous_oxide = new/datum/tlv/dangerous,
+ GAS_OXYGEN = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
+ GAS_NITROGEN = new/datum/tlv(-1, -1, 1000, 1000),
+ GAS_CO2 = new/datum/tlv(-1, -1, 5, 10),
+ //datum/gas/miasma = new/datum/tlv/(-1, -1, 2, 5),
+ GAS_PLASMA = new/datum/tlv/dangerous,
+ /*/datum/gas/nitrous_oxide = new/datum/tlv/dangerous,
/datum/gas/bz = new/datum/tlv/dangerous,
/datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic
/datum/gas/water_vapor = new/datum/tlv/dangerous,
@@ -869,7 +869,7 @@
/datum/gas/zauker = new/datum/tlv/dangerous,
/datum/gas/helium = new/datum/tlv/dangerous,
/datum/gas/antinoblium = new/datum/tlv/dangerous,
- /datum/gas/halon = new/datum/tlv/dangerous,
+ /datum/gas/halon = new/datum/tlv/dangerous,*/
)
/obj/machinery/airalarm/unlocked
diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm
index 951134dc6d8..4d7981e0086 100644
--- a/code/modules/atmospherics/machinery/components/tank.dm
+++ b/code/modules/atmospherics/machinery/components/tank.dm
@@ -367,21 +367,21 @@
fill_to_pressure(GAS_NITROGEN, safety_margin = (N2STANDARD * 0.5))
/obj/machinery/atmospherics/components/tank/carbon_dioxide
- gas_type = /datum/gas/carbon_dioxide
+ gas_type = GAS_CO2
/obj/machinery/atmospherics/components/tank/plasma
- gas_type = /datum/gas/plasma
+ gas_type = GAS_PLASMA
/obj/machinery/atmospherics/components/tank/nitrogen
- gas_type = /datum/gas/nitrogen
+ gas_type = GAS_NITROGEN
/obj/machinery/atmospherics/components/tank/oxygen
- gas_type = /datum/gas/oxygen
+ gas_type = GAS_OXYGEN
/obj/machinery/atmospherics/components/tank/nitrous
- gas_type = /datum/gas/nitrous_oxide
+ gas_type = GAS_N2O
-/obj/machinery/atmospherics/components/tank/bz
+/*ics/components/tank/bz
gas_type = /datum/gas/bz
/obj/machinery/atmospherics/components/tank/freon
@@ -425,6 +425,7 @@
/obj/machinery/atmospherics/components/tank/antinoblium
gas_type = /datum/gas/antinoblium
+*/
///////////////////////////////////////////////////////////////////
// Tank Frame Structure
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index f83b314f5df..0577b44b910 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -145,99 +145,99 @@
/obj/machinery/atmospherics/miner/n2o
name = "\improper N2O Gas Miner"
overlay_color = "#FFCCCC"
- spawn_id = /datum/gas/nitrous_oxide
+ //spawn_id = /datum/gas/nitrous_oxide
/obj/machinery/atmospherics/miner/nitrogen
name = "\improper N2 Gas Miner"
overlay_color = "#CCFFCC"
- spawn_id = /datum/gas/nitrogen
+ //spawn_id = /datum/gas/nitrogen
/obj/machinery/atmospherics/miner/oxygen
name = "\improper O2 Gas Miner"
overlay_color = "#007FFF"
- spawn_id = /datum/gas/oxygen
+ //spawn_id = /datum/gas/oxygen
/obj/machinery/atmospherics/miner/plasma
name = "\improper Plasma Gas Miner"
overlay_color = "#FF0000"
- spawn_id = /datum/gas/plasma
+ //spawn_id = /datum/gas/plasma
/obj/machinery/atmospherics/miner/carbon_dioxide
name = "\improper CO2 Gas Miner"
overlay_color = "#CDCDCD"
- spawn_id = /datum/gas/carbon_dioxide
+ //spawn_id = /datum/gas/carbon_dioxide
/obj/machinery/atmospherics/miner/bz
name = "\improper BZ Gas Miner"
overlay_color = "#FAFF00"
- spawn_id = /datum/gas/bz
+ //spawn_id = /datum/gas/bz
/obj/machinery/atmospherics/miner/water_vapor
name = "\improper Water Vapor Gas Miner"
overlay_color = "#99928E"
- spawn_id = /datum/gas/water_vapor
+ //spawn_id = /datum/gas/water_vapor
/obj/machinery/atmospherics/miner/freon
name = "\improper Freon Gas Miner"
overlay_color = "#61edff"
- spawn_id = /datum/gas/freon
+ //spawn_id = /datum/gas/freon
/obj/machinery/atmospherics/miner/halon
name = "\improper Halon Gas Miner"
overlay_color = "#5f0085"
- spawn_id = /datum/gas/halon
+ //spawn_id = /datum/gas/halon
/obj/machinery/atmospherics/miner/healium
name = "\improper Healium Gas Miner"
overlay_color = "#da4646"
- spawn_id = /datum/gas/healium
+ //spawn_id = /datum/gas/healium
/obj/machinery/atmospherics/miner/hydrogen
name = "\improper Hydrogen Gas Miner"
overlay_color = "#ffffff"
- spawn_id = /datum/gas/hydrogen
+ //spawn_id = /datum/gas/hydrogen
/obj/machinery/atmospherics/miner/hypernoblium
name = "\improper Hypernoblium Gas Miner"
overlay_color = "#00f7ff"
- spawn_id = /datum/gas/hypernoblium
+ //spawn_id = /datum/gas/hypernoblium
/obj/machinery/atmospherics/miner/miasma
name = "\improper Miasma Gas Miner"
overlay_color = "#395806"
- spawn_id = /datum/gas/miasma
+ //spawn_id = /datum/gas/miasma
/obj/machinery/atmospherics/miner/nitrium
name = "\improper Nitrium Gas Miner"
overlay_color = "#752b00"
- spawn_id = /datum/gas/nitrium
+ //spawn_id = /datum/gas/nitrium
/obj/machinery/atmospherics/miner/pluoxium
name = "\improper Pluoxium Gas Miner"
overlay_color = "#4b54a3"
- spawn_id = /datum/gas/pluoxium
+ //spawn_id = /datum/gas/pluoxium
/obj/machinery/atmospherics/miner/proto_nitrate
name = "\improper Proto-Nitrate Gas Miner"
overlay_color = "#00571d"
- spawn_id = /datum/gas/proto_nitrate
+ //spawn_id = /datum/gas/proto_nitrate
/obj/machinery/atmospherics/miner/tritium
name = "\improper Tritium Gas Miner"
overlay_color = "#15ff00"
- spawn_id = /datum/gas/tritium
+ //spawn_id = /datum/gas/tritium
/obj/machinery/atmospherics/miner/zauker
name = "\improper Zauker Gas Miner"
overlay_color = "#022e00"
- spawn_id = /datum/gas/zauker
+ //spawn_id = /datum/gas/zauker
/obj/machinery/atmospherics/miner/helium
name = "\improper Helium Gas Miner"
overlay_color = "#022e00"
- spawn_id = /datum/gas/helium
+ //spawn_id = /datum/gas/helium
/obj/machinery/atmospherics/miner/antinoblium
name = "\improper Antinoblium Gas Miner"
overlay_color = "#022e00"
- spawn_id = /datum/gas/antinoblium
+ //spawn_id = /datum/gas/antinoblium
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 961929d52ed..f8149762cf4 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -10,12 +10,12 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
/proc/init_gas_id_to_canister()
return sort_list(list(
- "n2" = /obj/machinery/portable_atmospherics/canister/nitrogen,
- "o2" = /obj/machinery/portable_atmospherics/canister/oxygen,
- "co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
- "plasma" = /obj/machinery/portable_atmospherics/canister/plasma,
- "n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
- "nitrium" = /obj/machinery/portable_atmospherics/canister/nitrium,
+ GAS_NITROGEN = /obj/machinery/portable_atmospherics/canister/nitrogen,
+ GAS_OXYGEN = /obj/machinery/portable_atmospherics/canister/oxygen,
+ GAS_CO2 = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+ GAS_PLASMA = /obj/machinery/portable_atmospherics/canister/plasma,
+ GAS_N2O = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+ /*"nitrium" = /obj/machinery/portable_atmospherics/canister/nitrium,
"bz" = /obj/machinery/portable_atmospherics/canister/bz,
"air" = /obj/machinery/portable_atmospherics/canister/air,
"water_vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
@@ -31,9 +31,10 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
"zauker" = /obj/machinery/portable_atmospherics/canister/zauker,
"helium" = /obj/machinery/portable_atmospherics/canister/helium,
"antinoblium" = /obj/machinery/portable_atmospherics/canister/antinoblium,
- "halon" = /obj/machinery/portable_atmospherics/canister/halon
+ "halon" = /obj/machinery/portable_atmospherics/canister/halon*/
))
+
/obj/machinery/portable_atmospherics/canister
name = "canister"
desc = "A canister for the storage of gas."
@@ -132,7 +133,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
desc = "Pre-mixed air."
greyscale_config = /datum/greyscale_config/canister
greyscale_colors = "#c6c0b5"
-
+/*
/obj/machinery/portable_atmospherics/canister/antinoblium
name = "Antinoblium canister"
gas_type = /datum/gas/antinoblium
@@ -145,13 +146,13 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
gas_type = /datum/gas/bz
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#9b5d7f#d0d2a0"
-
+*/
/obj/machinery/portable_atmospherics/canister/carbon_dioxide
name = "Carbon dioxide canister"
- gas_type = /datum/gas/carbon_dioxide
+ gas_type = GAS_CO2
greyscale_config = /datum/greyscale_config/canister
greyscale_colors = "#4e4c48"
-
+/*
/obj/machinery/portable_atmospherics/canister/freon
name = "Freon canister"
gas_type = /datum/gas/freon
@@ -179,10 +180,11 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
filled = 1
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#9b5d7f#368bff"
-
+*/
+/*
/obj/machinery/portable_atmospherics/canister/hydrogen
name = "Hydrogen canister"
- gas_type = /datum/gas/hydrogen
+ gas_type = GAS_HYDROGEN
filled = 1
greyscale_config = /datum/greyscale_config/canister/stripe
greyscale_colors = "#bdc2c0#ffffff"
@@ -193,19 +195,19 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
filled = 1
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#009823#f7d5d3"
-
+*/
/obj/machinery/portable_atmospherics/canister/nitrogen
name = "Nitrogen canister"
- gas_type = /datum/gas/nitrogen
+ gas_type = GAS_NITROGEN
greyscale_config = /datum/greyscale_config/canister
greyscale_colors = "#d41010"
/obj/machinery/portable_atmospherics/canister/nitrous_oxide
name = "Nitrous oxide canister"
- gas_type = /datum/gas/nitrous_oxide
+ gas_type = GAS_N2O
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#c63e3b#f7d5d3"
-
+/*
/obj/machinery/portable_atmospherics/canister/nitrium
name = "Nitrium canister"
gas_type = /datum/gas/nitrium
@@ -217,13 +219,14 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
gas_type = /datum/gas/hypernoblium
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#6399fc#b2b2b2"
+*/
/obj/machinery/portable_atmospherics/canister/oxygen
name = "Oxygen canister"
- gas_type = /datum/gas/oxygen
+ gas_type = GAS_OXYGEN
greyscale_config = /datum/greyscale_config/canister/stripe
greyscale_colors = "#2786e5#e8fefe"
-
+/*
/obj/machinery/portable_atmospherics/canister/pluoxium
name = "Pluoxium canister"
gas_type = /datum/gas/pluoxium
@@ -236,13 +239,13 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
filled = 1
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#008200#33cc33"
-
+*/
/obj/machinery/portable_atmospherics/canister/plasma
name = "Plasma canister"
- gas_type = /datum/gas/plasma
+ gas_type = GAS_PLASMA
greyscale_config = /datum/greyscale_config/canister/hazard
greyscale_colors = "#f62800#000000"
-
+/*
/obj/machinery/portable_atmospherics/canister/tritium
name = "Tritium canister"
gas_type = /datum/gas/tritium
@@ -262,7 +265,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
filled = 1
greyscale_config = /datum/greyscale_config/canister/double_stripe
greyscale_colors = "#009a00#006600"
-
+*/
// Special canisters below here
/obj/machinery/portable_atmospherics/canister/fusion_test
@@ -286,8 +289,8 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
greyscale_colors = "#9fba6c#3d4680"
*/
/obj/machinery/portable_atmospherics/canister/anesthetic_mix/create_gas()
- air_contents.add(GAS_OXYGEN, (O2_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
- air_contents.add(GAS_N2O, (N2O_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.adjust_gas(GAS_OXYGEN, (O2_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.adjust_gas(GAS_N2O, (N2O_ANESTHETIC * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
SSzas.start_processing_machine(src)
/**
@@ -327,7 +330,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
/obj/machinery/portable_atmospherics/canister/proto/default/oxygen
name = "prototype canister"
desc = "A prototype canister for a prototype bike, what could go wrong?"
- gas_type = /datum/gas/oxygen
+ gas_type = GAS_OXYGEN
filled = 1
release_pressure = ONE_ATMOSPHERE*2
@@ -363,12 +366,12 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
return
if(starter_temp)
air_contents.temperature = starter_temp
- air_contents.add(gas_type,(maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.adjust_gas(gas_type,(maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
SSzas.start_processing_machine(src)
/obj/machinery/portable_atmospherics/canister/air/create_gas()
- air_contents.add(GAS_OXYGEN, (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
- air_contents.add(GAS_NITROGEN, (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.adjust_gas(GAS_OXYGEN, (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
+ air_contents.adjust_gas(GAS_NITROGEN, (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature))
SSzas.start_processing_machine(src)
/obj/machinery/portable_atmospherics/canister/update_icon_state()
@@ -556,7 +559,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
var/transfer_moles = calculate_transfer_moles(air_contents, environment, pressure_delta)
transfer_moles = min(transfer_moles, (ATMOS_DEFAULT_VOLUME_PUMP/air_contents.volume)*air_contents.total_moles) //flow rate limit
- var/returnval = pump_gas_passive(air_contents, environment, transfer_moles)
+ pump_gas_passive(air_contents, environment, transfer_moles)
//air_update_turf(FALSE, FALSE)
var/our_pressure = air_contents.return_pressure()
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 9e62a111907..22cd1108322 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -20,20 +20,9 @@
var/power_rating = 7500
///List of gases that can be scrubbed
var/list/scrubbing = list(
- /datum/gas/plasma,
- /datum/gas/carbon_dioxide,
- /datum/gas/nitrous_oxide,
- /datum/gas/bz,
- /datum/gas/nitrium,
- /datum/gas/tritium,
- /datum/gas/hypernoblium,
- /datum/gas/water_vapor,
- /datum/gas/freon,
- /datum/gas/hydrogen,
- /datum/gas/healium,
- /datum/gas/proto_nitrate,
- /datum/gas/zauker,
- /datum/gas/halon,
+ GAS_PLASMA,
+ GAS_CO2,
+ GAS_N2O,
)
/obj/machinery/portable_atmospherics/scrubber/Destroy()
@@ -86,7 +75,7 @@
var/transfer_moles = min(1, volume_rate/mixture.volume)*mixture.total_moles
var/datum/gas_mixture/gas2scrub = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
- var/datum/gas_mixture/filtered = new
+ //var/datum/gas_mixture/filtered = new
if(!scrubbing)
return
diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm
index 258133aea57..4ed14e40d11 100644
--- a/code/modules/cargo/bounties/engineering.dm
+++ b/code/modules/cargo/bounties/engineering.dm
@@ -4,7 +4,7 @@
reward = CARGO_CRATE_VALUE * 15
wanted_types = list(/obj/item/tank = TRUE)
var/moles_required = 20 // A full tank is 28 moles, but CentCom ignores that fact.
- var/gas_type = /datum/gas/pluoxium
+ var/gas_type
/datum/bounty/item/engineering/gas/applies_to(obj/O)
if(!..())
@@ -18,28 +18,28 @@
/datum/bounty/item/engineering/gas/nitrium_tank
name = "Full Tank of Nitrium"
description = "The non-human staff of Station 88 has been volunteered to test performance enhancing drugs. Ship them a tank full of Nitrium so they can get started. (20 Moles)"
- gas_type = /datum/gas/nitrium
+// gas_type = /datum/gas/nitrium
/datum/bounty/item/engineering/gas/freon_tank
name = "Full Tank of Freon"
description = "The Supermatter of station 33 has started the delamination process. Deliver a tank of Freon gas to help them stop it! (20 Moles)"
- gas_type = /datum/gas/freon
+ //gas_type = /datum/gas/freon
/datum/bounty/item/engineering/gas/tritium_tank
name = "Full Tank of Tritium"
description = "Station 49 is looking to kickstart their research program. Ship them a tank full of Tritium. (20 Moles)"
- gas_type = /datum/gas/tritium
+ //gas_type = /datum/gas/tritium
/datum/bounty/item/engineering/gas/hydrogen_tank
name = "Full Tank of Hydrogen"
description = "Our R&D department is working on the development of more efficient electrical batteries using hydrogen as a catalyst. Ship us a tank full of it. (20 Moles)"
- gas_type = /datum/gas/hydrogen
+ //gas_type = /datum/gas/hydrogen
/datum/bounty/item/engineering/gas/zauker_tank
name = "Full Tank of Zauker"
description = "The main planet of \[REDACTED] has been chosen as testing grounds for the new weapon that uses Zauker gas. Ship us a tank full of it. (20 Moles)"
reward = CARGO_CRATE_VALUE * 20
- gas_type = /datum/gas/zauker
+ //gas_type = /datum/gas/zauker
/datum/bounty/item/engineering/emitter
name = "Emitter"
diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm
index e26ec5efd3a..cc0948b1902 100644
--- a/code/modules/cargo/exports/large_objects.dm
+++ b/code/modules/cargo/exports/large_objects.dm
@@ -79,7 +79,7 @@
/datum/export/large/supermatter
cost = CARGO_CRATE_VALUE * 16
unit_name = "supermatter shard"
- export_types = list(/obj/machinery/power/supermatter_crystal/shard)
+ //export_types = list(/obj/machinery/power/supermatter_crystal/shard)
/datum/export/large/grounding_rod
cost = CARGO_CRATE_VALUE * 1.2
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 7370fbc4fb5..514e1eaa7bd 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -953,7 +953,7 @@
desc = "The power of the heavens condensed into a single crystal. Requires CE access to open."
cost = CARGO_CRATE_VALUE * 20
access = ACCESS_CE
- contains = list(/obj/machinery/power/supermatter_crystal/shard)
+ //contains = list(/obj/machinery/power/supermatter_crystal/shard)
crate_name = "supermatter shard crate"
crate_type = /obj/structure/closet/crate/secure/engineering
dangerous = TRUE
@@ -974,7 +974,7 @@
desc = "The new and improved fusion reactor. Requires CE access to open."
cost = CARGO_CRATE_VALUE * 23
access = ACCESS_CE
- contains = list(/obj/item/hfr_box/corner,
+ /*contains = list(/obj/item/hfr_box/corner,
/obj/item/hfr_box/corner,
/obj/item/hfr_box/corner,
/obj/item/hfr_box/corner,
@@ -982,7 +982,7 @@
/obj/item/hfr_box/body/moderator_input,
/obj/item/hfr_box/body/waste_output,
/obj/item/hfr_box/body/interface,
- /obj/item/hfr_box/core)
+ /obj/item/hfr_box/core)*/
crate_name = "HFR crate"
crate_type = /obj/structure/closet/crate/secure/engineering
dangerous = TRUE
diff --git a/code/modules/clothing/masks/gas_filter.dm b/code/modules/clothing/masks/gas_filter.dm
index 5b5d2d7e96f..6aa40cb46c2 100644
--- a/code/modules/clothing/masks/gas_filter.dm
+++ b/code/modules/clothing/masks/gas_filter.dm
@@ -51,7 +51,7 @@
*
*/
/obj/item/gas_filter/proc/reduce_filter_status(datum/gas_mixture/breath)
-
+/*
var/danger_points = 0
for(var/gas_id in breath.gas)
@@ -82,6 +82,7 @@
filter_status = max(filter_status - danger_points - FILTERS_CONSTANT_WEAR, 0)
return breath
+*/
/obj/item/gas_filter/damaged
name = "damaged gas filter"
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index c3c4e8b4180..2455708bf28 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -82,7 +82,7 @@
sanitized_misc = TRUE
sanitized_reactions = TRUE
require_all = FALSE
- required_reactions = list(/datum/gas_reaction/h2fire, /datum/gas_reaction/tritfire)
+ //required_reactions = list(/datum/gas_reaction/h2fire, /datum/gas_reaction/tritfire)
/datum/experiment/ordnance/explosive/nobliumbomb
name = "Noblium Explosives"
@@ -92,7 +92,7 @@
experiment_proper = TRUE
sanitized_misc = TRUE
sanitized_reactions = TRUE
- required_reactions = list(/datum/gas_reaction/nobliumformation)
+ //required_reactions = list(/datum/gas_reaction/nobliumformation)
/datum/experiment/ordnance/explosive/pressurebomb
name = "Reactionless Explosives"
@@ -109,7 +109,7 @@
gain = list(20,60,120)
target_amount = list(20,120,500)
experiment_proper = TRUE
- required_gas = /datum/gas/nitrium
+ //required_gas = /datum/gas/nitrium
/datum/experiment/ordnance/gaseous/bz
name = "BZ Gas Shells"
@@ -117,7 +117,7 @@
gain = list(25,50)
target_amount = list(200,600)
experiment_proper = TRUE
- required_gas = /datum/gas/bz
+ //required_gas = /datum/gas/bz
/datum/experiment/ordnance/gaseous/noblium
name = "Noblium Gas Shells"
@@ -125,7 +125,7 @@
gain = list(10,40,80)
target_amount = list(15,55,250)
experiment_proper = TRUE
- required_gas = /datum/gas/hypernoblium
+ //required_gas = /datum/gas/hypernoblium
/datum/experiment/ordnance/gaseous/halon
name = "Halon Gas Shells"
@@ -133,7 +133,7 @@
gain = list(10,30,60)
target_amount = list(15,55,250)
experiment_proper = TRUE
- required_gas = /datum/gas/halon
+ //required_gas = /datum/gas/halon
/datum/experiment/scanning/random/material/meat
name = "Biological Material Scanning Experiment"
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 36ba0ed593c..57bd0bb9579 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -290,7 +290,7 @@
/obj/item/ship_in_a_bottle,
/obj/item/gun/energy/pulse,
/obj/item/book/granter/martial/carp,
- /obj/item/melee/supermatter_sword,
+ //obj/item/melee/supermatter_sword,
/obj/item/shield/changeling,
/obj/item/lava_staff,
/obj/item/energy_katana,
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 4cef50b5668..f34469e17e6 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -496,7 +496,7 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r
var/turf/T = get_turf(src)
if(!T)
return
- var/list/adjacent = T.get_adjacent_open_turfs()
+ var/list/adjacent = get_adjacent_open_turfs(T)
if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way
adjacent = shuffle(adjacent)
shuffle = FALSE
diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm
index b731da461c9..9393c64761d 100644
--- a/code/modules/reagents/chem_splash.dm
+++ b/code/modules/reagents/chem_splash.dm
@@ -98,7 +98,7 @@
if(accessible[T])
continue
//for(var/thing in T.get_atmos_adjacent_turfs(alldir = TRUE))
- for(var/turf/NT as anything in T.get_adjacent_open_turfs())
+ for(var/turf/NT as anything in get_adjacent_open_turfs(T))
if(!(NT in accessible))
continue
if(!(get_dir(T,NT) in GLOB.cardinals))
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 51ee0c75462..acde57a3028 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -76,7 +76,7 @@
/obj/machinery/disposal/LateInitialize()
//this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
- var/atom/L = loc
+ var/turf/L = loc
var/datum/gas_mixture/env = new
env.copy_from(L.return_air())
var/datum/gas_mixture/removed = env.remove(SEND_PRESSURE + 1)
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 40c7d7b112f..0b070ddfa50 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -689,7 +689,7 @@
name = "Machine Design (HFR Core)"
desc = "The circuit board for an HFR Core."
id = "HFR_core"
- build_path = /obj/item/circuitboard/machine/HFR_core
+ //build_path = /obj/item/circuitboard/machine/HFR_core
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -697,7 +697,7 @@
name = "Machine Design (HFR fuel input)"
desc = "The circuit board for an HFR fuel input."
id = "HFR_fuel_input"
- build_path = /obj/item/circuitboard/machine/HFR_fuel_input
+ //build_path = /obj/item/circuitboard/machine/HFR_fuel_input
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -705,7 +705,7 @@
name = "Machine Design (HFR waste output)"
desc = "The circuit board for an HFR waste output."
id = "HFR_waste_output"
- build_path = /obj/item/circuitboard/machine/HFR_waste_output
+ //build_path = /obj/item/circuitboard/machine/HFR_waste_output
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -713,7 +713,7 @@
name = "Machine Design (HFR moderator input)"
desc = "The circuit board for an HFR moderator input."
id = "HFR_moderator_input"
- build_path = /obj/item/circuitboard/machine/HFR_moderator_input
+ //build_path = /obj/item/circuitboard/machine/HFR_moderator_input
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -721,7 +721,7 @@
name = "Machine Design (HFR corner)"
desc = "The circuit board for an HFR corner."
id = "HFR_corner"
- build_path = /obj/item/circuitboard/machine/HFR_corner
+ //build_path = /obj/item/circuitboard/machine/HFR_corner
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -729,7 +729,7 @@
name = "Machine Design (HFR interface)"
desc = "The circuit board for an HFR interface."
id = "HFR_interface"
- build_path = /obj/item/circuitboard/machine/HFR_interface
+ //build_path = /obj/item/circuitboard/machine/HFR_interface
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -737,7 +737,7 @@
name = "Machine Design (Crystallizer)"
desc = "The circuit board for a crystallizer."
id = "crystallizer"
- build_path = /obj/item/circuitboard/machine/crystallizer
+ //build_path = /obj/item/circuitboard/machine/crystallizer
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 89a9280a677..6b31f2247e2 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -233,7 +233,7 @@
id = "roastingstick"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250)
- build_path = /obj/item/melee/roastingstick
+ //build_path = /obj/item/melee/roastingstick
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index 8fb730f544a..aa1b0d9ee7f 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -88,7 +88,7 @@
build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 500)
construction_time = 100
- build_path = /obj/item/turbine_parts/compressor
+ //build_path = /obj/item/turbine_parts/compressor
category = list("Misc","Power Designs","Machinery","initial")
/datum/design/turbine_part_rotor
@@ -98,7 +98,7 @@
build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 500)
construction_time = 100
- build_path = /obj/item/turbine_parts/rotor
+ //build_path = /obj/item/turbine_parts/rotor
category = list("Misc","Power Designs","Machinery","initial")
/datum/design/turbine_part_stator
@@ -108,5 +108,5 @@
build_type = PROTOLATHE | AUTOLATHE
materials = list(/datum/material/iron = 500)
construction_time = 100
- build_path = /obj/item/turbine_parts/stator
+ //build_path = /obj/item/turbine_parts/stator
category = list("Misc","Power Designs","Machinery","initial")
diff --git a/modular_pariah/master_files/icons/effects/contamination.dmi b/modular_pariah/master_files/icons/effects/contamination.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..367394213be967bd895459f2bfa2c14fa443c5cf
GIT binary patch
literal 709
zcmV;$0y_PPP)V=-0C=1w$Gr-GAQT4B+4~e9x<`MjODN%>?;vRDP=QLleuLXN0-N5AgR+L+
zSZaQ5NUXz1?8~7gNGvn46!V!{Pi?+MNN`Rp%Vz+>H3d$P#0h+fM3zl+5
zLI3~)7fD1xR9J=WR)Jsn!oz5K`Oc6?$bhPBMw?V&hct=H{F;ckVq7?RGmna{YNI`%}PE0D!-B
zKL|&IWxvw^0BrXs0D$`2U2n#9@M=|n$=i!VW{Kb$w?u&U;t=&a4TPh?vJNIy^#PSU
z@oZ9eTlUVhYE{4zL8K#a*PHQne?sEfq*ms~1n>@9J@L
z&DrixS2w(nuQ;A~HZ{A$$Rwh)0?qC)I?5?2B-v3;iM>D-l6W>9<u_>&|uO$o`*y=B1j`d-9bPRiUyIy6eq2ocLskAOp^g*Y7mI77U!7GMxBM
zoj;^P0cyjQiKs%Z!{SvqhFmfoARmz$`)I#VQEm|qU^oI@2P@NoG?tXclB(nutx_js
z*HeMnl+swPE?o}*m$}DEmkaoG1I{0oIbo3tGP!yqvP7WEGrD0VE7pyf?m|+QbGHB{
r$j9=)RdVhY@SE%5*Yc-;hYR=*Heq6+wrW&r00000NkvXXu0mjf7gI{B
literal 0
HcmV?d00001
diff --git a/modular_pariah/master_files/icons/effects/tile_effects.dmi b/modular_pariah/master_files/icons/effects/tile_effects.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a1b92ff11dcb9f2167baf28d9daae8187d078c01
GIT binary patch
literal 1514
zcmVV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm
z%}mcIfpCgT5=&AQY!#H!Q}a@bGLx0KI8!o)|IeJm9>=joVGin+T3kEH
zidj~rM2i#}1o2K}=5MTH0&oFv1rRunw7J%10C#?K!Rzth`h(xxNJBIyKCAKY9sEX`
zlhJrKX0Fft=I;0tfXGZlM9s_^5y;E~frtY?)d(~lA~U1gCpr>NM8ss@YP0Z5W|k-T
zt)p9v#=?WuPw*w2hzRFBw3uY9MMTj~5|HGOnNvh0e+O3SgF?7P#Je3vhzEWE+;ZjA
z-z6DaB4X+AtAxzUk4zay~mHt{D(g#+ZdU7A!AKaw!?!0XnYSo->_@Q
zj+{A1#2?PZSbg%n<4?Shh5L#f9^_@=d+>R|t|5-!BI2XNF94Qe`#u27nc1-3ifksy
zoNRc>qmDNF`@=o6t%I~KoCClw?B=8K0MIgXA%5cllgx^r9)GdF597u08+gIQzjFWj
zk~ajb_C8TcNv0&VjW9I>I65b3$Bl=TMm=nwv_$h*$*1hR(H99{<_DUGOhgygUqoPa
zauarqnr)x7MDvhjU1i+q>DH#qluZguw>)9J(TPBFWVnOL=G#;(m_!oG05kyb4LCf?|jnPL|93=)EQXjidH!RU~Ph?bcT
z-l8;C^sbyQShc0{Ml11qpAa+)$6pM;=rD%AP^%qZ^e&t)0PaN+AtTjpSszvRrZfe2
zbS)xo*nI^+8@3zhHEg1%uUKt*0ZukfWZ6?^_6J1Q0l
z-ar+z2%vFDQ+bHVOsS{q-dUWKPw*8&h3_Wv3cs2u{fjQ&HvkctdBagPlTvz+u?c(r
zyk&q4U9N^v^f**?z)MJ#YA@`U%R#N9uVcDQEi$
zL-joOo$e=iKj3UVuW`1Ypz82cJ#X7i^%J(V7vuH(*?z)MJ#XVwKcQfE4%%?*1n{su
z6?^Ke3J?sD3EDg9D~p`Dz6si5xH~5?eD4G>+n$0wsZx>z37xbZU-f}#FF2;oTTMPv
z&yV&KhU$3?_7jw~jnwm_{e+=<9)taag7JEOw4X3k&ttHkP=Mij{-^p0r|NkO_7fDp
zN9y^}e!@^akHLO|qQHiq=j!>N?k9Y^p0{(n!vD0Nu>Ft&A%m4dkgdy0`~UIYJLb2w
z%zVcl*8}V)kU?oypX`J&SS+=c_us-Ec6E3BZ7nn3h_6ELVffOlaHhrhnR@=G`U$7%
zc?|XwioFo=v-SK>^%MS6J#YA@`U#QizsLWtdj3281ZmKzdj1RiFZ&690cia=`?d<|
QRsaA107*qoM6N<$f;TbqKmY&$
literal 0
HcmV?d00001
diff --git a/modular_pariah/master_files/icons/testing/Zone.dmi b/modular_pariah/master_files/icons/testing/Zone.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..1d8ab8516693cc287bfae96341b7294a28458047
GIT binary patch
literal 955
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSi>g8*N?cNllZ!G7N;32F7#J$%
z^qxJ-b;v+~+1>va!kk{Xzw;rk!UG9QWaUzAc#f
zMBGQw4S
z+x~~oi#{e4BV5k(kcZ(M!vivjOYeEC_6Hg=|2?-Lnc?2*<5%1&rt3vsKKk-s#jm0t
zZ|ZXF!+zfVw&mb%VUBc$f|v7|Hpxyqs`LDGAzL_u#UHK-ds)+pS;+_r@BLac>SF86
z!Wnja5pCE9HDyQI_Db8j;@AH^E|rxN4E}YKrM+-A$Cu~;Q*DQn>8z>t(^sgyWSo=#
zQ&sI*4bS|JAV&tlr%DB%)`to@9Qh<@@pF5qu)~oeAme+esKb#zK*s#ldJP>vfogt-
zN;({Q3=}yWBJFVG3&)&44_EOiB-OC^{j<2rE?{WGq+Y)#lttj8eB)&Mvsp|XJ3x%P
ztALEY11IaxyaF<8FZ%s6SGmp)1y?jfFDZ*Bkp
zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryMDlSPZNd>Z%l(;xkGK-3VOhYctw4%h^
zR0tccAhoC{zlfkJ1A;0H392w6sKS__3KN1VObMzmBdEfhpb86uDl7?y7!iR=I8+S@
z2dg2@a8*`t^>YCy9{_Y7n2TBb(m4PC0N6=HK~!jg?U}&|!!Qg*?SlvK2o-dIk_ieK
zASwL)S1G2KG%Ynnj-^=A?c>vX*s_d6@G2E^&X#kCM3^kT7tq2Vf<-V!LikKmyTr1DF#K@Oaw*!vR+X
zBw+muU^D>{=sO3P6CeyMe+0A(Xx;>s0r$TKl>zr3gp>gvKME@Y{K&f_-~KTq4agM0
ze-29n@&tUzg8{n$7r+%D4a5X?0WM%KK-p(y_s>zg^#n*2I#_hWzXAXN002ovPDHLk
FV1l&Ftup`s
literal 0
HcmV?d00001
diff --git a/modular_pariah/master_files/icons/testing/atmos_testing.dmi b/modular_pariah/master_files/icons/testing/atmos_testing.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..142bd4cbb1a4e3ed36b08be40fe05379ea402280
GIT binary patch
literal 390
zcmeAS@N?(olHy`uVBq!ia0vp^3xHUGgAGVdtuOuxq_V3*B1&9Ri<65o3raHc^B5Q^
z<^+co6qSDe5?t`{>k}<+U9EFx&IfM@HMnT}Kugb4$1`+8Xuv67ol}0gMj?+L`JB|z
z3IobMdE}$*b;h@K!^JC-f-BF>@F-Pdx%x0@!I}rJo-cav==DifhDRUmE;&v95e~HW
znx~6nNX4ADHw^g>83?dm%-0jU-&tI+{Od`l#sHomCugIxd$=Yx>AJmsFl|jXUr2A+
zmp?h)`{mD>zdCqs`&=!jlZGMh**k0yLOKPJx+Gp%;xgwtTs6
z`*6ki-v{=-|9_Tug-Ue6{rTsgv0ce4NYCGYgm*>G!m|fs1>=(%X6fu*AKv=?nV?R8
zLgBL?ZlSXm?|yW?gHem~^S|j8EZoo7pvEHEfSozdtJTHHcBHP)V=-0C=30%&`i>Fc5&@xp|7C-NkAgvq+0%XkQ^j?g9Z#%B8KZ?;z+R_T2vA
z<8R>HU+f6oVAV=oVoqQ{@Aj(9ekL$b*Q&zE1q`&R3heLn>Nki9;~H`CH<#0m)&5H@*Et;D!%W+WESgT%;pM~RW|w8Y4FCy9~nJac}0l>V-m(EXGR^kWCzVAT`5
z^}wWWGIzfK00WRoL_t(|obBDgaoac;fKhN~uc;#iBzLKeG>`_UGROjw2GWLfUsvM-
zm`gItp+$+5DEuJ#-pS+f7?5Sj-(X;%YMQ1?flhTDIsEQ*)z9cD#QL%C$6tMai=INP
zD)j9yT-WXU_y2PFTt&|Ti1Baq1X4<=tG
z_mFYx)2EPehuZgVA>-Dceua!X)U-{=xTpFQGVV~*v?1f3PGu}Uv~AGqzb@nT55y=U
zfK&QEMspcP_gm%~{1Dx_W3;e!kK8dD72RWU$7ob^kI5aQQPDjncZ^0w_n6!<8Wr73
zIv(pTrIgO+wy<||aya~X{x6>Yhy4>h0RUjSzwtZ#n0+|(p7Vp}|6u|c09N8!@QUF5
zxE8!3_%Q+)09N2u=!)R&yA`@3cs>CP0EO!ZZhzlz|6>unUH!oA@B8h4EQ03|zyMIN
zvG~3AIT5@)WAS_Kb0T;;0So{$9glUFJ2r2f_~0~%ybi~@%N?7yPJD10#C!r6017uH
za7FNTO$l5PJWny_00RIY%?aBQBKY2xja=VjE9Qi42@!m6%SNv6agP;X0AMlC?nxHE
z>-OxPuwmh!*P}x_g+X_0R{kI
zSF8X703R&1f;#0UJ6j;iv(#3EDL2_gY=N)>3;?{u)Ub7(^EOQl+lcF&1uy`xxVfvk
zB6wTouIlEFU;zvOEb7rM4I+3O9^KNAGlB&$0I-;6_w$P2b$fO{Z>|XTPjCQm!?mNk
zmiXGOTH^7S^fSD6bk`DJyH!g(eivZ?Kmq37WX874y~&L7319%2VCqd~Ih@aJRnjWy
z9!$N-EQiavt@ggs{44>m<#!hUF91w7oH=40bquH@QUC4=?Aa)U9V!!0q&}=
zq2qr^!N0>he+jkCd-N1SweR1erx2=Xo9HQoYMM5B3ZdF|eXoDvyKlmG{i>#ELeH%`
z)pg|XyVq4eqo)w-$G#tb_5Ce+3bCqvAKTe=`~LmETt15!*s0%R>)aAGmE$G=0000<
KMNUMnLSTZF(=i$V
literal 0
HcmV?d00001
From bb27b18eb2d68eb485a1de55e57b3dbabb6f7f97 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Mon, 18 Apr 2022 04:14:39 -0400
Subject: [PATCH 012/200] atmostest
---
_maps/atmostest.json | 4 ++--
code/controllers/master.dm | 3 ++-
code/modules/admin/verbs/fix_air.dm | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/_maps/atmostest.json b/_maps/atmostest.json
index 7fdd314ba1e..3435e944864 100644
--- a/_maps/atmostest.json
+++ b/_maps/atmostest.json
@@ -2,5 +2,5 @@
"version": 1,
"map_name": "ZAS HELL",
"map_path": "map_files/debug",
- "map_file": "atmos_mintest.dmm",
-}
+ "map_file": "atmos_mintest.dmm"
+}
\ No newline at end of file
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 88dadb8b52e..33b8f24cfdc 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -109,7 +109,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
for(var/global_var in global.vars)
if (istype(global.vars[global_var], /datum/controller/subsystem))
existing_subsystems += global.vars[global_var]
-
+
//Either init a new SS or if an existing one was found use that
for(var/I in subsystem_types)
var/ss_idx = existing_subsystems.Find(I)
@@ -221,6 +221,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if (SS.flags & SS_NO_INIT || SS.initialized) //Don't init SSs with the correspondig flag or if they already are initialzized
continue
current_initializing_subsystem = SS
+ to_chat(world, span_blue(span_boldannounce("Initializing [SS.name]...")))
SS.Initialize(REALTIMEOFDAY)
CHECK_TICK
current_initializing_subsystem = null
diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm
index 8762e7edeea..d4d7c0a4bda 100644
--- a/code/modules/admin/verbs/fix_air.dm
+++ b/code/modules/admin/verbs/fix_air.dm
@@ -7,7 +7,10 @@
if(alert("WARNING: Executing this command will perform a full reset of atmosphere. All pipelines will lose any gas that may be in them, and all zones will be reset to contain air mix as on roundstart. The supermatter engine will also be stopped (to prevent overheat due to removal of coolant). Do not use unless the map is suffering serious atmospheric issues due to grief or bug.", "Full Atmosphere Reboot", "No", "Yes") == "No")
return
+ if(!fix_atmos_grief())
+ to_chat(world, span_danger("Atmospherics reboot failed!"))
+/proc/fix_atmos_grief()
log_admin("Full atmosphere reset initiated by [usr].")
to_chat(world, "Initiating restart of atmosphere. The server may lag a bit.")
sleep(10)
@@ -50,3 +53,4 @@
to_chat(usr, "\[5/5\] - ZAS Rebooted")
to_chat(world, "Atmosphere restart completed in [(world.timeofday - current_time)/10] seconds.")
+ return TRUE
From a0fb535185d1d7d6030890e25d54e7c5d3f24eaa Mon Sep 17 00:00:00 2001
From: Francinum <5572280+francinum@users.noreply.github.com>
Date: Mon, 18 Apr 2022 04:12:07 -0400
Subject: [PATCH 013/200] cummies
---
code/controllers/master.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 33b8f24cfdc..b54d8e2727b 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -221,7 +221,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if (SS.flags & SS_NO_INIT || SS.initialized) //Don't init SSs with the correspondig flag or if they already are initialzized
continue
current_initializing_subsystem = SS
- to_chat(world, span_blue(span_boldannounce("Initializing [SS.name]...")))
+ to_chat(world, span_blue(span_bold("Initializing [SS.name]...")))
SS.Initialize(REALTIMEOFDAY)
CHECK_TICK
current_initializing_subsystem = null
From 7d53e70122d37a4a52fe4064bf69a908308bfc99 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Mon, 18 Apr 2022 20:11:20 -0400
Subject: [PATCH 014/200] AMONG US
---
_maps/map_files/generic/CentCom.dmm | 8 ++--
code/__DEFINES/atmospherics/ZAS.dm | 6 ++-
code/controllers/subsystem/zas.dm | 4 +-
code/game/atoms.dm | 4 +-
code/game/atoms_movable.dm | 4 +-
code/game/machinery/doors/door.dm | 24 ++++++++----
code/game/machinery/doors/firedoor.dm | 8 ++--
code/game/machinery/doors/poddoor.dm | 1 +
code/game/machinery/doors/windowdoor.dm | 9 +++--
code/game/machinery/shieldgen.dm | 4 +-
.../effects/effect_system/effects_foam.dm | 7 ++--
code/game/objects/effects/forcefields.dm | 4 +-
code/game/objects/effects/spiderwebs.dm | 2 +-
.../items/devices/forcefieldprojector.dm | 2 +-
code/game/objects/structures/aliens.dm | 2 +-
code/game/objects/structures/false_walls.dm | 10 +++--
code/game/objects/structures/holosign.dm | 2 +-
code/game/objects/structures/mineral_doors.dm | 2 +-
code/game/objects/structures/plasticflaps.dm | 4 +-
code/game/objects/structures/tram_walls.dm | 2 +-
.../objects/structures/windoor_assembly.dm | 11 +++---
code/game/objects/structures/window.dm | 14 +++----
code/game/shuttle_engines.dm | 2 +-
code/game/turfs/change_turf.dm | 11 ++----
code/game/turfs/closed/walls.dm | 3 +-
code/game/turfs/open/_open.dm | 2 +-
code/game/turfs/turf.dm | 6 ++-
code/modules/admin/verbs/fix_air.dm | 2 +-
.../antagonists/blob/structures/_blob.dm | 4 +-
code/modules/art/statues.dm | 2 +-
code/modules/atmospherics/ZAS/Atom.dm | 17 ++++++---
code/modules/atmospherics/ZAS/Connection.dm | 32 ++++++++--------
.../atmospherics/ZAS/ConnectionGroup.dm | 10 ++---
code/modules/atmospherics/ZAS/Fire.dm | 22 +++++------
code/modules/atmospherics/ZAS/Temperature.dm | 4 +-
code/modules/atmospherics/ZAS/Turf.dm | 16 ++++----
code/modules/atmospherics/ZAS/XGM/gas_data.dm | 38 +++++++++----------
.../atmospherics/ZAS/XGM/xgm_gas_mixture.dm | 1 -
code/modules/atmospherics/ZAS/Zone.dm | 6 +--
code/modules/error_handler/error_viewer.dm | 2 +-
code/modules/mining/equipment/survival_pod.dm | 2 +-
.../simple_animal/hostile/megafauna/drake.dm | 2 +-
.../power/singularity/containment_field.dm | 4 +-
.../power/singularity/field_generator.dm | 6 +--
code/modules/power/turbine/turbine.dm | 2 +-
.../xenobiology/crossbreeding/_misc.dm | 2 +-
.../modules/large_doors/code/large_doors.dm | 2 +-
47 files changed, 179 insertions(+), 155 deletions(-)
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 008b149633a..0684d3dc817 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -5273,7 +5273,7 @@
/area/syndicate_mothership/control)
"sm" = (
/obj/structure/window/paperframe{
- can_atmos_pass = 0
+ can_atmos_pass = 4
},
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -11365,7 +11365,7 @@
/area/centcom/prison)
"Qu" = (
/obj/structure/window/paperframe{
- can_atmos_pass = 0
+ can_atmos_pass = 4
},
/obj/effect/turf_decal/siding/wood,
/obj/effect/turf_decal/siding/wood{
@@ -11659,7 +11659,7 @@
/area/centcom/supplypod)
"Rv" = (
/obj/structure/window/paperframe{
- can_atmos_pass = 0
+ can_atmos_pass = 4
},
/turf/open/floor/wood/tile,
/area/centcom/holding)
@@ -14013,7 +14013,7 @@
dir = 4
},
/obj/structure/window/paperframe{
- can_atmos_pass = 0
+ can_atmos_pass = 4
},
/turf/open/floor/sepia,
/area/centcom/holding)
diff --git a/code/__DEFINES/atmospherics/ZAS.dm b/code/__DEFINES/atmospherics/ZAS.dm
index 367469bb075..64bea7e4b0f 100644
--- a/code/__DEFINES/atmospherics/ZAS.dm
+++ b/code/__DEFINES/atmospherics/ZAS.dm
@@ -1,6 +1,7 @@
-//#define ZASDBG
+#define ZASDBG
//#define MULTIZAS
+#define AIR_ALLOWED 0
#define AIR_BLOCKED 1
#define ZONE_BLOCKED 2
#define BLOCKED 3
@@ -109,7 +110,8 @@ var/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
#endif
-
+//#define ATMOS_CANPASS(A, O) ( A.can_atmos_pass == CANPASS_PROC ? A.c_airblock(O) : ( A.can_atmos_pass == CANPASS_DENSITY? !A.density : A.can_atmos_pass))
+#define ATMOS_CANPASS_NOTTURF(A) (A.can_atmos_pass == CANPASS_DENSITY ? !A.density : A.can_atmos_pass)
#define CELL_VOLUME 2500 // Liters in a cell.
#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) // Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C.
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index d593c053d63..d678d9885f5 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -235,7 +235,7 @@ SUBSYSTEM_DEF(zas)
T.needs_air_update = 0
#ifdef ZASDBG
T.overlays -= mark
- updated++
+ //updated++
#endif
if (MC_TICK_CHECK)
@@ -253,7 +253,7 @@ SUBSYSTEM_DEF(zas)
T.needs_air_update = 0
#ifdef ZASDBG
T.overlays -= mark
- updated++
+ //updated++
#endif
if (MC_TICK_CHECK)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 6fb8041ed77..6f7bae3f3f7 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -337,9 +337,11 @@
return TRUE
/// Whether the mover object can avoid being blocked by this atom, while arriving from (or leaving through) the border_dir.
-/atom/proc/CanPass(atom/movable/mover, border_dir)
+/atom/proc/CanPass(atom/movable/mover, border_dir, air_group)
SHOULD_CALL_PARENT(TRUE)
SHOULD_BE_PURE(TRUE)
+ if(!mover)
+ return FALSE
if(mover.movement_type & PHASING)
return TRUE
. = CanAllowThrough(mover, border_dir)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index bdaa6a41803..0579c638246 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -114,8 +114,8 @@
if(loc)
//Restore air flow if we were blocking it (movables with ATMOS_PASS_PROC will need to do this manually if necessary)
- if(((can_atmos_pass == ATMOS_PASS_DENSITY && density) || can_atmos_pass == ATMOS_PASS_NO) && isturf(loc))
- can_atmos_pass = ATMOS_PASS_YES
+ if(((can_atmos_pass == CANPASS_DENSITY && density) || can_atmos_pass == CANPASS_NEVER) && isturf(loc))
+ can_atmos_pass = CANPASS_ALWAYS
//air_update_turf(TRUE, FALSE)
loc.handle_atom_del(src)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 0cbee448c4a..6967aa1e5cf 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -13,7 +13,7 @@
pass_flags_self = PASSDOORS
max_integrity = 350
armor = list(MELEE = 30, BULLET = 30, LASER = 20, ENERGY = 20, BOMB = 10, BIO = 100, FIRE = 80, ACID = 70)
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_PROC
flags_1 = PREVENT_CLICK_UNDER_1
receive_ricochet_chance_mod = 0.8
damage_deflection = 10
@@ -42,6 +42,8 @@
var/unres_sides = 0 //Unrestricted sides. A bitflag for which direction (if any) can open the door with no access
var/can_crush = TRUE /// Whether or not the door can crush mobs.
var/can_open_with_hands = TRUE /// Whether or not the door can be opened by hand (used for blast doors and shutters)
+ ///If set, air zones cannot merge across the door even when it is opened.
+ var/block_air_zones = TRUE
/obj/machinery/door/Initialize(mapload)
. = ..()
@@ -57,6 +59,7 @@
else
flags_1 &= ~PREVENT_CLICK_UNDER_1
+ update_nearby_tiles(TRUE)
//doors only block while dense though so we have to use the proc
real_explosion_block = explosion_block
explosion_block = EXPLOSION_BLOCK_PROC
@@ -101,9 +104,14 @@
if(spark_system)
qdel(spark_system)
spark_system = null
- //air_update_turf(TRUE, FALSE)
+ update_nearby_tiles()
return ..()
+/obj/machinery/door/c_airblock(turf/other)
+ if(block_air_zones)
+ return density ? AIR_BLOCKED : ZONE_BLOCKED
+ return density ? AIR_BLOCKED : AIR_ALLOWED
+
/**
* Signal handler for checking if we notify our surrounding that access requirements are lifted accordingly to a newly set security level
*
@@ -167,13 +175,13 @@
return
/obj/machinery/door/Move()
- //var/turf/T = loc
+ update_nearby_tiles(TRUE)
. = ..()
- /*if(density) //Gotta be closed my friend
- move_update_air(T)*/
-/obj/machinery/door/CanAllowThrough(atom/movable/mover, border_dir)
+
+/obj/machinery/door/CanAllowThrough(atom/movable/mover, border_dir, air_group)
. = ..()
+ if(air_group) return !block_air_zones
if(.)
return
// Snowflake handling for PASSGLASS.
@@ -353,7 +361,7 @@
update_appearance()
set_opacity(0)
operating = FALSE
- //air_update_turf(TRUE, FALSE)
+ update_nearby_tiles(TRUE)
update_freelook_sight()
if(autoclose)
autoclose_in(DOOR_CLOSE_WAIT)
@@ -383,7 +391,7 @@
if(visible && !glass)
set_opacity(1)
operating = FALSE
- //air_update_turf(TRUE, TRUE)
+ update_nearby_tiles(TRUE)
update_freelook_sight()
if(!can_crush)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 8c2b1ab3bcb..e1e85fd8c33 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -611,7 +611,7 @@
icon = 'icons/obj/doors/edge_Doorfire.dmi'
can_crush = FALSE
flags_1 = ON_BORDER_1
- can_atmos_pass = ATMOS_PASS_PROC
+ can_atmos_pass = CANPASS_PROC
/obj/machinery/door/firedoor/border_only/closed
icon_state = "door_closed"
@@ -659,11 +659,11 @@
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
-/obj/machinery/door/firedoor/border_only/c_block(turf/T, vertical = FALSE)
+/obj/machinery/door/firedoor/border_only/c_airblock(turf/T, vertical = FALSE)
if(get_dir(loc, T) == dir)
- return !density
+ return density ? AIR_BLOCKED : ZONE_BLOCKED
else
- return TRUE
+ return AIR_ALLOWED
/obj/machinery/door/firedoor/heavy
name = "heavy firelock"
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 4941064217f..59356ad6b28 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -14,6 +14,7 @@
resistance_flags = FIRE_PROOF
damage_deflection = 70
can_open_with_hands = FALSE
+ block_air_zones = FALSE
var/datum/crafting_recipe/recipe_type = /datum/crafting_recipe/blast_doors
var/deconstruction = BLASTDOOR_FINISHED // deconstruction step
var/id = 1
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 89f43331e89..ee6f874ec15 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -14,7 +14,7 @@
flags_1 = ON_BORDER_1
opacity = FALSE
pass_flags_self = PASSGLASS
- can_atmos_pass = ATMOS_PASS_PROC
+ can_atmos_pass = CANPASS_PROC
interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN
network_id = NETWORK_DOOR_AIRLOCKS
set_dir_on_move = FALSE
@@ -61,6 +61,7 @@
AddElement(/datum/element/connect_loc, loc_connections)
AddElement(/datum/element/atmos_sensitive, mapload)
+ update_nearby_tiles(TRUE)
/obj/machinery/door/window/ComponentInitialize()
. = ..()
@@ -173,11 +174,11 @@
return TRUE
-/obj/machinery/door/window/c_block(turf/T, vertical = FALSE)
+/obj/machinery/door/window/c_airblock(turf/T, vertical = FALSE)
if(get_dir(loc, T) == dir)
- return !density
+ return density ? AIR_BLOCKED : ZONE_BLOCKED
else
- return TRUE
+ return ZONE_BLOCKED
//used in the AStar algorithm to determinate if the turf the door is on is passable
/obj/machinery/door/window/CanAStarPass(obj/item/card/id/ID, to_dir)
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index eca093c49b7..6261ae09e41 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -9,7 +9,7 @@
anchored = TRUE
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons)
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
/obj/structure/emergency_shield/Initialize(mapload)
. = ..()
@@ -73,7 +73,7 @@
/obj/structure/emergency_shield/cult/barrier
density = FALSE //toggled on right away by the parent rune
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
///The rune that created the shield itself. Used to delete the rune when the shield is destroyed.
var/obj/effect/rune/parent_rune
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index b4a27778235..b12c4b91580 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -276,16 +276,17 @@
desc = "A lightweight foamed metal wall that can be used as base to construct a wall."
gender = PLURAL
max_integrity = 20
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_NEVER
///Var used to prevent spamming of the construction sound
var/next_beep = 0
/obj/structure/foamedmetal/Initialize(mapload)
. = ..()
- //air_update_turf(TRUE, TRUE)
+ update_nearby_tiles(TRUE)
/obj/structure/foamedmetal/Destroy()
- //air_update_turf(TRUE, FALSE)
+ set_density(0)
+ update_nearby_tiles(TRUE)
. = ..()
/obj/structure/foamedmetal/Move()
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index 9c41da052a8..5fc593ba9f6 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -5,7 +5,7 @@
anchored = TRUE
opacity = FALSE
density = TRUE
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
var/timeleft = 300 //Set to 0 for permanent forcefields (ugh)
/obj/effect/forcefield/Initialize(mapload)
@@ -21,7 +21,7 @@
name = "glowing wall"
icon = 'icons/effects/cult/effects.dmi'
icon_state = "cultshield"
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
timeleft = 200
/// A form of the cult forcefield that lasts permanently.
diff --git a/code/game/objects/effects/spiderwebs.dm b/code/game/objects/effects/spiderwebs.dm
index 8ec5ec113c5..fcb6096eb50 100644
--- a/code/game/objects/effects/spiderwebs.dm
+++ b/code/game/objects/effects/spiderwebs.dm
@@ -77,7 +77,7 @@
desc = "A solid thick wall of web, airtight enough to block air flow."
icon_state = "sealedweb"
sealed = TRUE
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
/obj/structure/spider/stickyweb/genetic //for the spider genes in genetics
genetic = TRUE
diff --git a/code/game/objects/items/devices/forcefieldprojector.dm b/code/game/objects/items/devices/forcefieldprojector.dm
index 0a46b63e6cc..53a88c6febb 100644
--- a/code/game/objects/items/devices/forcefieldprojector.dm
+++ b/code/game/objects/items/devices/forcefieldprojector.dm
@@ -103,7 +103,7 @@
density = TRUE
mouse_opacity = MOUSE_OPACITY_OPAQUE
resistance_flags = INDESTRUCTIBLE
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_NEVER
armor = list(MELEE = 0, BULLET = 25, LASER = 50, ENERGY = 50, BOMB = 25, BIO = 100, FIRE = 100, ACID = 100)
var/obj/item/forcefield_projector/generator
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index d9eaf40ce12..38f4e3a2871 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -63,7 +63,7 @@
canSmoothWith = list(SMOOTH_GROUP_ALIEN_RESIN)
max_integrity = 200
var/resintype = null
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
/obj/structure/alien/resin/Initialize(mapload)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 971e5b2bd6c..27ecc8d49a4 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -16,7 +16,7 @@
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WALLS)
can_be_unanchored = FALSE
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_PROC
rad_insulation = RAD_MEDIUM_INSULATION
material_flags = MATERIAL_EFFECTS
var/mineral = /obj/item/stack/sheet/iron
@@ -31,7 +31,8 @@
var/obj/item/stack/initialized_mineral = new mineral // Okay this kinda sucks.
set_custom_materials(initialized_mineral.mats_per_unit, mineral_amount)
qdel(initialized_mineral)
- //air_update_turf(TRUE, TRUE)
+ update_nearby_tiles(TRUE)
+
/obj/structure/falsewall/attack_hand(mob/user, list/modifiers)
if(opening)
@@ -55,7 +56,10 @@
set_opacity(density)
opening = FALSE
update_appearance()
- //air_update_turf(TRUE, !density)
+ update_nearby_tiles(TRUE)
+
+/obj/structure/falsewall/c_airblock(turf/other)
+ return density ? ZONE_BLOCKED : AIR_BLOCKED
/obj/structure/falsewall/update_icon(updates=ALL)//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
. = ..()
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index c0f1886ee61..62daaf3102a 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -94,7 +94,7 @@
icon_state = "holo_firelock"
density = FALSE
anchored = TRUE
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
alpha = 150
rad_insulation = RAD_LIGHT_INSULATION
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 5b255b11866..ab9b1f7a944 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -13,7 +13,7 @@
icon_state = "metal"
max_integrity = 200
armor = list(MELEE = 10, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, FIRE = 50, ACID = 50)
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
rad_insulation = RAD_MEDIUM_INSULATION
material_flags = MATERIAL_EFFECTS
material_modifier = 0.25
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index cab6be77908..587e1c90f79 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -7,7 +7,7 @@
armor = list(MELEE = 100, BULLET = 80, LASER = 80, ENERGY = 100, BOMB = 50, BIO = 100, FIRE = 50, ACID = 50)
density = FALSE
anchored = TRUE
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
/obj/structure/plasticflaps/opaque
opacity = TRUE
@@ -41,7 +41,7 @@
///Update the flaps behaviour to gases, if not anchored will let air pass through
/obj/structure/plasticflaps/proc/update_atmos_behaviour()
- can_atmos_pass = anchored ? ATMOS_PASS_YES : ATMOS_PASS_NO
+ can_atmos_pass = anchored ? CANPASS_ALWAYS : CANPASS_NEVER
/obj/structure/plasticflaps/wirecutter_act(mob/living/user, obj/item/W)
. = ..()
diff --git a/code/game/objects/structures/tram_walls.dm b/code/game/objects/structures/tram_walls.dm
index cfbbec9591f..ff1df4f5dd2 100644
--- a/code/game/objects/structures/tram_walls.dm
+++ b/code/game/objects/structures/tram_walls.dm
@@ -16,7 +16,7 @@
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WALLS)
can_be_unanchored = FALSE
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
rad_insulation = RAD_MEDIUM_INSULATION
material_flags = MATERIAL_EFFECTS
var/mineral = /obj/item/stack/sheet/iron
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 9cb53c83a5f..027caa35524 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -27,7 +27,7 @@
var/facing = "l" //Does the windoor open to the left or right?
var/secure = FALSE //Whether or not this creates a secure windoor
var/state = "01" //How far the door assembly has progressed
- can_atmos_pass = ATMOS_PASS_PROC
+ can_atmos_pass = CANPASS_PROC
/obj/structure/windoor_assembly/Initialize(mapload, loc, set_dir)
. = ..()
@@ -41,10 +41,11 @@
AddElement(/datum/element/connect_loc, loc_connections)
AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
+ update_nearby_tiles(TRUE)
/obj/structure/windoor_assembly/Destroy()
set_density(FALSE)
- //air_update_turf(TRUE, FALSE)
+ update_nearby_tiles()
return ..()
/*
/obj/structure/windoor_assembly/Move()
@@ -69,11 +70,11 @@
if(istype(mover, /obj/structure/windoor_assembly) || istype(mover, /obj/machinery/door/window))
return valid_window_location(loc, mover.dir, is_fulltile = FALSE)
-/obj/structure/windoor_assembly/c_block(turf/T, vertical = FALSE)
+/obj/structure/windoor_assembly/c_airblock(turf/T, vertical = FALSE)
if(get_dir(loc, T) == dir)
- return !density
+ return density ? AIR_BLOCKED : ZONE_BLOCKED
else
- return TRUE
+ return ZONE_BLOCKED
/obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, direction)
SIGNAL_HANDLER
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index b10ec13e00a..2ee0237f9fb 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -11,7 +11,7 @@
can_be_unanchored = TRUE
resistance_flags = ACID_PROOF
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 80, ACID = 100)
- can_atmos_pass = ATMOS_PASS_PROC
+ can_atmos_pass = CANPASS_PROC
rad_insulation = RAD_VERY_LIGHT_INSULATION
pass_flags_self = PASSGLASS
set_dir_on_move = FALSE
@@ -313,7 +313,7 @@
. += new /obj/item/shard(location)
/obj/structure/window/proc/AfterRotation(mob/user, degrees)
- //air_update_turf(TRUE, FALSE)
+ update_nearby_tiles(TRUE)
/obj/structure/window/proc/on_painted(obj/structure/window/source, is_dark_color)
SIGNAL_HANDLER
@@ -329,16 +329,16 @@
return ..()
/obj/structure/window/Move()
- //var/turf/T = loc
+ update_nearby_tiles()
. = ..()
/*
if(anchored)
move_update_air(T)*/
-/obj/structure/window/c_block(turf/T, vertical = FALSE)
+/obj/structure/window/c_airblock(turf/T, vertical = FALSE)
if(!anchored || !density)
- return TRUE
- return !(fulltile || dir == get_dir(loc, T))
+ return ZONE_BLOCKED
+ return (fulltile || dir == get_dir(loc, T)) ? AIR_BLOCKED : ZONE_BLOCKED
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
@@ -739,7 +739,7 @@
glass_type = /obj/item/stack/sheet/paperframes
heat_resistance = 233
decon_speed = 10
- can_atmos_pass = ATMOS_PASS_YES
+ can_atmos_pass = CANPASS_ALWAYS
resistance_flags = FLAMMABLE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
knock_sound = SFX_PAGE_TURN
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index eba89bf0bc0..e508198fb0d 100644
--- a/code/game/shuttle_engines.dm
+++ b/code/game/shuttle_engines.dm
@@ -10,7 +10,7 @@
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS)
max_integrity = 500
armor = list(MELEE = 100, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 70) //default + ignores melee
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
/obj/structure/shuttle/engine
name = "engine"
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index 4e402941ffa..8a5988300a9 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -40,8 +40,8 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
var/datum/component/wet_floor/WF = T.AddComponent(/datum/component/wet_floor)
WF.InheritComponent(slip)
if (copy_air)
- var/turf/open/openTurf = T
- openTurf.air.copy_from(air)
+ var/turf/openTurf = T
+ T.air.copy_from(air)
//wrapper for ChangeTurf()s that you want to prevent/affect without overriding ChangeTurf() itself
/turf/proc/TerraformTurf(path, new_baseturf, flags)
@@ -83,17 +83,12 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
blueprint_data = null
if(connections) connections.erase_all()
- /* ZASTURF
if(istype(src,/turf/simulated))
//Yeah, we're just going to rebuild the whole thing.
//Despite this being called a bunch during explosions,
//the zone will only really do heavy lifting once.
var/turf/simulated/S = src
if(S.zone) S.zone.rebuild()
- */
-
- if(simulated && zone)
- zone.rebuild()
var/list/old_baseturfs = baseturfs
var/old_type = type
@@ -324,7 +319,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
//////Assimilate Air//////
/turf/open/proc/Assimilate_Air()
- var/list/turf/turf_list = get_adjacent_open_turfs()
+ var/list/turf/turf_list = get_adjacent_open_turfs(src)
var/turf_count = LAZYLEN(turf_list)
if(blocks_air || !turf_count)
return
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index d6cfdd3e1b6..3dc68a83fa0 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -7,10 +7,9 @@
icon_state = "wall-0"
base_icon_state = "wall"
explosion_block = 1
-
+ blocks_air = AIR_BLOCKED
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 62500 //a little over 5 cm thick , 62500 for 1 m by 2.5 m by 0.25 m iron wall. also indicates the temperature at wich the wall will melt (currently only able to melt with H/E pipes)
- blocks_air = TRUE
baseturfs = /turf/open/floor/plating
flags_ricochet = RICOCHET_HARD
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 8adc73747e2..5f12102a624 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -148,7 +148,7 @@
/turf/open/indestructible/binary
name = "tear in the fabric of reality"
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
baseturfs = /turf/open/indestructible/binary
icon_state = "binary"
footstep = null
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 64d4c935819..4f680b91b90 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
///The max temperature of the fire which it was subjected to
var/max_fire_temperature_sustained = 0
- var/blocks_air = FALSE
+ var/blocks_air = AIR_ALLOWED
var/list/image/blueprint_data //for the station blueprints, images of objects eg: pipes
@@ -99,6 +99,10 @@ GLOBAL_LIST_EMPTY(station_turfs)
stack_trace("Warning: [src]([type]) initialized multiple times!")
flags_1 |= INITIALIZED_1
+ if(!blocks_air || !simulated)
+ air = new
+ air.copy_from(src.return_air())
+
// by default, vis_contents is inherited from the turf that was here before
vis_contents.Cut()
diff --git a/code/modules/admin/verbs/fix_air.dm b/code/modules/admin/verbs/fix_air.dm
index d4d7c0a4bda..78edeb5893a 100644
--- a/code/modules/admin/verbs/fix_air.dm
+++ b/code/modules/admin/verbs/fix_air.dm
@@ -23,7 +23,7 @@
// Remove all gases from all pipenets
for(var/datum/pipeline/PN as anything in SSzas.networks)
- for(var/datum/gas_mixture/G in PN.air & PN.other_airs)
+ for(var/datum/gas_mixture/G in list(PN.air) & PN.other_airs)
G.gas = list()
G.update_values()
diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm
index 7e7c9947c04..b5c383f9f66 100644
--- a/code/modules/antagonists/blob/structures/_blob.dm
+++ b/code/modules/antagonists/blob/structures/_blob.dm
@@ -9,7 +9,7 @@
anchored = TRUE
layer = BELOW_MOB_LAYER
pass_flags_self = PASSBLOB
- can_atmos_pass = ATMOS_PASS_PROC
+ can_atmos_pass = CANPASS_PROC
obj_flags = CAN_BE_HIT|BLOCK_Z_OUT_DOWN // stops blob mobs from falling on multiz.
/// How many points the blob gets back when it removes a blob of that type. If less than 0, blob cannot be removed.
var/point_return = 0
@@ -98,7 +98,7 @@
/obj/structure/blob/block_superconductivity()
return atmosblock
-/obj/structure/blob/c_block(turf/T, vertical = FALSE)
+/obj/structure/blob/c_airblock(turf/T, vertical = FALSE)
return !atmosblock
/obj/structure/blob/update_icon() //Updates color based on overmind color if we have an overmind.
diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm
index 06327591c95..e5d2b0ae346 100644
--- a/code/modules/art/statues.dm
+++ b/code/modules/art/statues.dm
@@ -6,7 +6,7 @@
density = TRUE
anchored = FALSE
max_integrity = 100
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
material_modifier = 0.5
material_flags = MATERIAL_EFFECTS | MATERIAL_AFFECT_STATISTICS
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
diff --git a/code/modules/atmospherics/ZAS/Atom.dm b/code/modules/atmospherics/ZAS/Atom.dm
index 8beaf560c01..2834b6c0860 100644
--- a/code/modules/atmospherics/ZAS/Atom.dm
+++ b/code/modules/atmospherics/ZAS/Atom.dm
@@ -1,4 +1,4 @@
-/*/turf/CanPass(atom/movable/mover, , height=1.5,air_group=0)
+/*/turf/CanPass(atom/movable/mover, border_dir, height=1.5,air_group=0)
if(target.blocks_air||blocks_air)
return 0
@@ -33,7 +33,12 @@
#ifdef ZASDBG
ASSERT(isturf(other))
#endif
- return (AIR_BLOCKED*!CanPass(null, other, 0, 0))|(ZONE_BLOCKED*!CanPass(null, other, 1.5, 1))
+ if(can_atmos_pass == CANPASS_PROC)
+ CRASH("Atmos pass assigned proc when proc doesn't exist.")
+ //var/direction = get_dir(src, other)
+ //return (AIR_BLOCKED*!CanPass(null, other, 0, 0))|(ZONE_BLOCKED*!CanPass(null, other, 1.5, 1))
+ //return (AIR_BLOCKED*!CanPass(other, direction, 0))|(ZONE_BLOCKED*!CanPass(other, direction, 1))
+ return (AIR_BLOCKED*!ATMOS_CANPASS_NOTTURF(src))
// This is a legacy proc only here for compatibility - you probably should just use ATMOS_CANPASS_TURF directly.
/turf/c_airblock(turf/other)
@@ -52,7 +57,7 @@
/atom
var/simulated = TRUE
- var/can_atmos_pass = ATMOS_PASS_YES
-
-/atom/proc/c_block(turf/target_turf, vertical = FALSE)
- return
+ var/can_atmos_pass = CANPASS_ALWAYS
+#ifdef ZASDBG
+ var/verbose = FALSE
+#endif
diff --git a/code/modules/atmospherics/ZAS/Connection.dm b/code/modules/atmospherics/ZAS/Connection.dm
index 674c6265dd6..11506523110 100644
--- a/code/modules/atmospherics/ZAS/Connection.dm
+++ b/code/modules/atmospherics/ZAS/Connection.dm
@@ -64,7 +64,7 @@ Class Procs:
//connection/New(turf/simulated/A, turf/simulated/B) ZASTURF
/connection/New(turf/A, turf/B)
#ifdef ZASDBG
- ASSERT(SSzas.has_valid_zone(A))
+ //ASSERT(TURF_HAS_VALID_ZONE(A))
//ASSERT(SSzas.has_valid_zone(B))
#endif
src.A = A
@@ -83,13 +83,13 @@ Class Procs:
if(!direct())
state |= CONNECTION_DIRECT
edge.direct++
-// log_debug("Marked direct.")
+// log_admin("Marked direct.")
/connection/proc/mark_indirect()
if(direct())
state &= ~CONNECTION_DIRECT
edge.direct--
-// log_debug("Marked indirect.")
+// log_admin("Marked indirect.")
/connection/proc/mark_space()
state |= CONNECTION_SPACE
@@ -103,18 +103,18 @@ Class Procs:
/connection/proc/erase()
edge.remove_connection(src)
state |= CONNECTION_INVALID
-// log_debug("Connection Erased: [state]")
+// log_admin("Connection Erased: [state]")
/connection/proc/update()
-// log_debug("Updated, \...")
+// log_admin("Updated, \...")
if(istype(A,/turf/open/space))
-// log_debug("Invalid A.")
+// log_admin("Invalid A.")
erase()
return
var/block_status = SSzas.air_blocked(A,B)
if(block_status & AIR_BLOCKED)
-// log_debug("Blocked connection.")
+// log_admin("Blocked connection.")
erase()
return
else if(block_status & ZONE_BLOCKED)
@@ -126,14 +126,14 @@ Class Procs:
if(state & CONNECTION_SPACE)
if(!b_is_space)
-// log_debug("Invalid B.")
+// log_admin("Invalid B.")
erase()
return
if(A.zone != zoneA)
-// log_debug("Zone changed, \...")
+// log_admin("Zone changed, \...")
if(!A.zone)
erase()
-// log_debug("erased.")
+// log_admin("erased.")
return
else
edge.remove_connection(src)
@@ -141,22 +141,22 @@ Class Procs:
edge.add_connection(src)
zoneA = A.zone
-// log_debug("valid.")
+// log_admin("valid.")
return
else if(b_is_space)
-// log_debug("Invalid B.")
+// log_admin("Invalid B.")
erase()
return
if(A.zone == B.zone)
-// log_debug("A == B")
+// log_admin("A == B")
erase()
return
if(A.zone != zoneA || (zoneB && (B.zone != zoneB)))
-// log_debug("Zones changed, \...")
+// log_admin("Zones changed, \...")
if(A.zone && B.zone)
edge.remove_connection(src)
edge = SSzas.get_edge(A.zone, B.zone)
@@ -164,9 +164,9 @@ Class Procs:
zoneA = A.zone
zoneB = B.zone
else
-// log_debug("erased.")
+// log_admin("erased.")
erase()
return
-// log_debug("valid.")
+// log_admin("valid.")
diff --git a/code/modules/atmospherics/ZAS/ConnectionGroup.dm b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
index caafd283649..66b88abfc1e 100644
--- a/code/modules/atmospherics/ZAS/ConnectionGroup.dm
+++ b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
@@ -72,11 +72,11 @@ Class Procs:
/connection_edge/proc/add_connection(connection/c)
coefficient++
if(c.direct()) direct++
-// log_debug("Connection added: [type] Coefficient: [coefficient]")
+// log_admin("Connection added: [type] Coefficient: [coefficient]")
/connection_edge/proc/remove_connection(connection/c)
-// log_debug("Connection removed: [type] Coefficient: [coefficient-1]")
+// log_admin("Connection removed: [type] Coefficient: [coefficient-1]")
coefficient--
if(coefficient <= 0)
@@ -87,7 +87,7 @@ Class Procs:
/connection_edge/proc/erase()
SSzas.remove_edge(src)
-// log_debug("[type] Erased.")
+// log_admin("[type] Erased.")
/connection_edge/proc/tick()
@@ -131,7 +131,7 @@ Class Procs:
A.edges.Add(src)
B.edges.Add(src)
//id = edge_id(A,B)
-// log_debug("New edge between [A] and [B]")
+// log_admin("New edge between [A] and [B]")
/connection_edge/zone/add_connection(connection/c)
@@ -202,7 +202,7 @@ Class Procs:
A.edges.Add(src)
air = B.return_air()
//id = 52*A.id
-// log_debug("New edge from [A] to [B].")
+// log_admin("New edge from [A] to [B].")
/connection_edge/unsimulated/add_connection(connection/c)
diff --git a/code/modules/atmospherics/ZAS/Fire.dm b/code/modules/atmospherics/ZAS/Fire.dm
index 8b138ef620a..95d2cc6c467 100644
--- a/code/modules/atmospherics/ZAS/Fire.dm
+++ b/code/modules/atmospherics/ZAS/Fire.dm
@@ -234,8 +234,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
if((temperature > PHORON_MINIMUM_BURN_TEMPERATURE || force_burn) && (no_check ||check_recombustability(zone? zone.fuel_objs : null)))
#ifdef FIREDBG
- log_debug("***************** FIREDBG *****************")
- log_debug("Burning [zone? zone.name : "zoneless gas_mixture"]!")
+ log_admin("***************** FIREDBG *****************")
+ log_admin("Burning [zone? zone.name : "zoneless gas_mixture"]!")
#endif
var/gas_fuel = 0
@@ -288,13 +288,13 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
var/used_oxidizers = used_fuel*(FIRE_REACTION_OXIDIZER_AMOUNT/FIRE_REACTION_FUEL_AMOUNT)
#ifdef FIREDBG
- log_debug("gas_fuel = [gas_fuel], liquid_fuel = [liquid_fuel], total_oxidizers = [total_oxidizers]")
- log_debug("fuel_area = [fuel_area], total_fuel = [total_fuel], reaction_limit = [reaction_limit]")
- log_debug("firelevel -> [firelevel] (gas: [gas_firelevel], liquid: [liquid_firelevel])")
- log_debug("liquid_reaction_progress = [liquid_reaction_progress]")
- log_debug("gas_reaction_progress = [gas_reaction_progress]")
- log_debug("total_reaction_progress = [total_reaction_progress]")
- log_debug("used_fuel = [used_fuel], used_oxidizers = [used_oxidizers]; ")
+ log_admin("gas_fuel = [gas_fuel], liquid_fuel = [liquid_fuel], total_oxidizers = [total_oxidizers]")
+ log_admin("fuel_area = [fuel_area], total_fuel = [total_fuel], reaction_limit = [reaction_limit]")
+ log_admin("firelevel -> [firelevel] (gas: [gas_firelevel], liquid: [liquid_firelevel])")
+ log_admin("liquid_reaction_progress = [liquid_reaction_progress]")
+ log_admin("gas_reaction_progress = [gas_reaction_progress]")
+ log_admin("total_reaction_progress = [total_reaction_progress]")
+ log_admin("used_fuel = [used_fuel], used_oxidizers = [used_oxidizers]; ")
#endif
//if the reaction is progressing too slow then it isn't self-sustaining anymore and burns out
@@ -323,8 +323,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
update_values()
#ifdef FIREDBG
- log_debug("used_gas_fuel = [used_gas_fuel]; used_liquid_fuel = [used_liquid_fuel]; total = [used_fuel]")
- log_debug("new temperature = [temperature]; new pressure = [return_pressure()]")
+ log_admin("used_gas_fuel = [used_gas_fuel]; used_liquid_fuel = [used_liquid_fuel]; total = [used_fuel]")
+ log_admin("new temperature = [temperature]; new pressure = [return_pressure()]")
#endif
if (temperature<220)
diff --git a/code/modules/atmospherics/ZAS/Temperature.dm b/code/modules/atmospherics/ZAS/Temperature.dm
index 6d502cbebbb..4dd66a56b9c 100644
--- a/code/modules/atmospherics/ZAS/Temperature.dm
+++ b/code/modules/atmospherics/ZAS/Temperature.dm
@@ -39,7 +39,9 @@
adjust_temp = loc.temperature
else
//var/turf/simulated/T = loc
- var/turf/T = loc
+ var/turf/T = get_turf(loc)
+ if(!istype(T))
+ return
if(T.zone && T.zone.air)
adjust_temp = T.zone.air.temperature
else
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index bfe223bb8f3..afbe60689b3 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -114,7 +114,7 @@
ATMOS_CANPASS_TURF(s_block, src, src)
if(s_block & AIR_BLOCKED)
#ifdef ZASDBG
- if(verbose) log_debug("Self-blocked.")
+ //if(verbose) log_admin("Self-blocked.")
//dbg(blocked)
#endif
if(zone)
@@ -147,7 +147,7 @@
if(block & AIR_BLOCKED)
#ifdef ZASDBG
- if(verbose) log_debug("[d] is blocked.")
+ if(verbose) log_admin("[d] is blocked.")
//unsim.dbg(air_blocked, turn(180,d))
#endif
@@ -157,7 +157,7 @@
if(r_block & AIR_BLOCKED)
#ifdef ZASDBG
- if(verbose) log_debug("[d] is blocked.")
+ if(verbose) log_admin("[d] is blocked.")
//dbg(air_blocked, d)
#endif
@@ -190,7 +190,7 @@
// we are blocking them and not blocking ourselves - this prevents tiny zones from forming on doorways.
if(((block & ZONE_BLOCKED) && !(r_block & ZONE_BLOCKED)) || ((r_block & ZONE_BLOCKED) && !(s_block & ZONE_BLOCKED)))
#ifdef ZASDBG
- if(verbose) log_debug("[d] is zone blocked.")
+ if(verbose) log_admin("[d] is zone blocked.")
//dbg(zone_blocked, d)
#endif
@@ -205,22 +205,22 @@
#ifdef ZASDBG
dbg(assigned)
- if(verbose) log_debug("Added to [zone]")
+ if(verbose) log_admin("Added to [zone]")
#endif
else if(sim.zone != zone)
#ifdef ZASDBG
- if(verbose) log_debug("Connecting to [sim.zone]")
+ if(verbose) log_admin("Connecting to [sim.zone]")
#endif
SSzas.connect(src, sim)
#ifdef ZASDBG
- else if(verbose) log_debug("[d] has same zone.")
+ else if(verbose) log_admin("[d] has same zone.")
- else if(verbose) log_debug("[d] has invalid zone.")
+ else if(verbose) log_admin("[d] has invalid zone.")
#endif
else
diff --git a/code/modules/atmospherics/ZAS/XGM/gas_data.dm b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
index bd5a51db51f..532ce87360c 100644
--- a/code/modules/atmospherics/ZAS/XGM/gas_data.dm
+++ b/code/modules/atmospherics/ZAS/XGM/gas_data.dm
@@ -61,32 +61,32 @@ GLOBAL_REAL(xgm_gas_data, /datum/xgm_gas_data) = new
for(var/p in subtypesof(/datum/xgm_gas))
var/datum/xgm_gas/gas = new p //avoid initial() because of potential New() actions
- if(gas.id in xgm_gas_data.gases)
- stack_trace("Duplicate gas id `[gas.id]` in `[p]`")
+ //if(gas.id in xgm_gas_data.gases)
+ //stack_trace("Duplicate gas id `[gas.id]` in `[p]`")
- xgm_gas_data.gases += gas.id
- xgm_gas_data.name[gas.id] = gas.name
- xgm_gas_data.specific_heat[gas.id] = gas.specific_heat
- xgm_gas_data.molar_mass[gas.id] = gas.molar_mass
+ gases += gas.id
+ name[gas.id] = gas.name
+ specific_heat[gas.id] = gas.specific_heat
+ molar_mass[gas.id] = gas.molar_mass
if(gas.overlay_limit)
- xgm_gas_data.overlay_limit[gas.id] = gas.overlay_limit
- xgm_gas_data.tile_overlay[gas.id] = gas.tile_overlay
- xgm_gas_data.tile_overlay_color[gas.id] = gas.tile_color
- xgm_gas_data.flags[gas.id] = gas.flags
- xgm_gas_data.burn_product[gas.id] = gas.burn_product
+ overlay_limit[gas.id] = gas.overlay_limit
+ tile_overlay[gas.id] = gas.tile_overlay
+ tile_overlay_color[gas.id] = gas.tile_color
+ flags[gas.id] = gas.flags
+ burn_product[gas.id] = gas.burn_product
- xgm_gas_data.symbol_html[gas.id] = gas.symbol_html
- xgm_gas_data.symbol[gas.id] = gas.symbol
+ symbol_html[gas.id] = gas.symbol_html
+ symbol[gas.id] = gas.symbol
if(!isnull(gas.condensation_product) && !isnull(gas.condensation_point))
- xgm_gas_data.condensation_points[gas.id] = gas.condensation_point
- xgm_gas_data.condensation_products[gas.id] = gas.condensation_product
+ condensation_points[gas.id] = gas.condensation_point
+ condensation_products[gas.id] = gas.condensation_product
- xgm_gas_data.breathed_product[gas.id] = gas.breathed_product
- xgm_gas_data.hidden_from_codex[gas.id] = gas.hidden_from_codex
+ breathed_product[gas.id] = gas.breathed_product
+ hidden_from_codex[gas.id] = gas.hidden_from_codex
- xgm_gas_data.base_value[gas.id] = gas.base_value
- xgm_gas_data.purchaseable[gas.id] = gas.purchaseable
+ base_value[gas.id] = gas.base_value
+ purchaseable[gas.id] = gas.purchaseable
return 1
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
index bb115cccdd8..0ea9c9697f9 100644
--- a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
@@ -304,7 +304,6 @@
temperature = sample.temperature
update_values()
-
return 1
diff --git a/code/modules/atmospherics/ZAS/Zone.dm b/code/modules/atmospherics/ZAS/Zone.dm
index b56ea3e74d5..cb183465d3a 100644
--- a/code/modules/atmospherics/ZAS/Zone.dm
+++ b/code/modules/atmospherics/ZAS/Zone.dm
@@ -59,11 +59,11 @@ Class Procs:
air.group_multiplier = 1
air.volume = CELL_VOLUME
-/zone/proc/add(turf/simulated/T)
+/zone/proc/add(turf/T)
#ifdef ZASDBG
ASSERT(!invalid)
ASSERT(istype(T))
- ASSERT(!SSzas.has_valid_zone(T))
+ ASSERT(!TURF_HAS_VALID_ZONE(T))
#endif
var/datum/gas_mixture/turf_air = T.return_air()
@@ -77,7 +77,7 @@ Class Procs:
if(fuel) fuel_objs += fuel
T.update_graphic(air.graphic)
-/zone/proc/remove(turf/simulated/T)
+/zone/proc/remove(turf/T)
#ifdef ZASDBG
ASSERT(!invalid)
ASSERT(istype(T))
diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm
index fbaa0ca3fae..56c5a082c09 100644
--- a/code/modules/error_handler/error_viewer.dm
+++ b/code/modules/error_handler/error_viewer.dm
@@ -116,7 +116,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache)
// from the same source hasn't been shown too recently
if (error_source.next_message_at <= world.time)
var/const/viewtext = "\[view]" // Nesting these in other brackets went poorly
- //log_debug("Runtime in [e.file], line [e.line]: [html_encode(e.name)] [error_entry.make_link(viewtext)]")
+ //log_admin("Runtime in [e.file], line [e.line]: [html_encode(e.name)] [error_entry.make_link(viewtext)]")
var/err_msg_delay
if(config?.loaded)
err_msg_delay = CONFIG_GET(number/error_msg_delay)
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 57bd0bb9579..510e942ac7a 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -233,7 +233,7 @@
density = TRUE
var/buildstacktype = /obj/item/stack/sheet/iron
var/buildstackamount = 5
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
/obj/structure/fans/deconstruct()
if(!(flags_1 & NODECONSTRUCT_1))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 51d2a3a4736..756ffc9cd74 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -285,7 +285,7 @@
anchored = TRUE
opacity = FALSE
density = TRUE
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
duration = 82
color = COLOR_DARK_ORANGE
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 98e31b31286..a0a004e1ad6 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -11,7 +11,7 @@
use_power = NO_POWER_USE
interaction_flags_atom = NONE
interaction_flags_machine = NONE
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
light_range = 4
layer = ABOVE_OBJ_LAYER
///First of the generators producing the containment field
@@ -35,7 +35,7 @@
if(field_gen_2)
field_gen_2.fields -= src
field_gen_2 = null
- can_atmos_pass = ATMOS_PASS_YES
+ can_atmos_pass = CANPASS_ALWAYS
//air_update_turf(TRUE, FALSE)
return ..()
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 15c3d10c2e2..7e3a4b06481 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -32,7 +32,7 @@ no power level overlay is currently in the overlays list.
density = TRUE
use_power = NO_POWER_USE
max_integrity = 500
- can_atmos_pass = ATMOS_PASS_YES
+ can_atmos_pass = CANPASS_ALWAYS
//100% immune to lasers and energy projectiles since it absorbs their energy.
armor = list(MELEE = 25, BULLET = 10, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, FIRE = 50, ACID = 70)
///Amount of energy stored, used for visual overlays (over 9000?)
@@ -199,7 +199,7 @@ no power level overlay is currently in the overlays list.
/obj/machinery/field/generator/proc/turn_off()
active = FG_OFFLINE
- can_atmos_pass = ATMOS_PASS_YES
+ can_atmos_pass = CANPASS_ALWAYS
//air_update_turf(TRUE, FALSE)
INVOKE_ASYNC(src, .proc/cleanup)
addtimer(CALLBACK(src, .proc/cool_down), 5 SECONDS)
@@ -275,7 +275,7 @@ no power level overlay is currently in the overlays list.
turn_off()
return
move_resist = INFINITY
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
//air_update_turf(TRUE, TRUE)
addtimer(CALLBACK(src, .proc/setup_field, 1), 1)
addtimer(CALLBACK(src, .proc/setup_field, 2), 2)
diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm
index 1d6e9ced35a..3155d9a7c6f 100644
--- a/code/modules/power/turbine/turbine.dm
+++ b/code/modules/power/turbine/turbine.dm
@@ -1,7 +1,7 @@
/obj/machinery/power/turbine
density = TRUE
resistance_flags = FIRE_PROOF
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
///Theoretical volume of gas that's moving through the turbine, it expands the further it goes
var/gas_theoretical_volume = 0
diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm
index 8ca7afff9ba..a9a7c578af1 100644
--- a/code/modules/research/xenobiology/crossbreeding/_misc.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm
@@ -134,7 +134,7 @@ Slimecrossing Items
desc = "A mass of solidified slime gel - completely impenetrable, but it's melting away!"
icon = 'icons/obj/slimecrossing.dmi'
icon_state = "slimebarrier_thick"
- can_atmos_pass = ATMOS_PASS_NO
+ can_atmos_pass = CANPASS_NEVER
opacity = TRUE
timeleft = 100
diff --git a/modular_pariah/modules/large_doors/code/large_doors.dm b/modular_pariah/modules/large_doors/code/large_doors.dm
index 7b161926250..f4ce1ee62a1 100644
--- a/modular_pariah/modules/large_doors/code/large_doors.dm
+++ b/modular_pariah/modules/large_doors/code/large_doors.dm
@@ -61,7 +61,7 @@
density = TRUE
opacity = TRUE
anchored = TRUE
- can_atmos_pass = ATMOS_PASS_DENSITY
+ can_atmos_pass = CANPASS_DENSITY
var/parent_airlock
/obj/airlock_filler_object/CanAllowThrough(atom/movable/mover, turf/target)
From e0e920af2b163783d30edf5ee3094275c6e982f9 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Mon, 18 Apr 2022 21:26:29 -0400
Subject: [PATCH 015/200] SSzas refactor + initial gas stuff
---
.../IceRuins/icemoon_surface_asteroid.dmm | 10 +-
...cemoon_underground_abandoned_homestead.dmm | 54 +--
..._underground_abandoned_plasma_facility.dmm | 70 +--
.../icemoon_underground_frozen_comms.dmm | 44 +-
.../IceRuins/icemoon_underground_lavaland.dmm | 8 +-
.../IceRuins/icemoon_underground_library.dmm | 96 ++---
.../icemoon_underground_wendigo_cave.dmm | 6 +-
.../lavaland_surface_biodome_winter.dmm | 6 +-
.../LavaRuins/lavaland_surface_cultaltar.dmm | 16 +-
.../LavaRuins/lavaland_surface_hermit.dmm | 2 +-
.../LavaRuins/lavaland_surface_pizzaparty.dmm | 72 ++--
.../LavaRuins/lavaland_surface_ufo_crash.dmm | 26 +-
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 10 +-
.../RandomRuins/SpaceRuins/caravanambush.dmm | 22 +-
.../SpaceRuins/hilbertshoteltestingsite.dmm | 6 +-
.../RandomRuins/SpaceRuins/thelizardsgas.dmm | 12 +-
_maps/RandomRuins/SpaceRuins/vaporwave.dmm | 12 +-
_maps/RandomZLevels/caves.dmm | 406 +++++++++---------
_maps/RandomZLevels/challenge.dmm | 10 +-
_maps/RandomZLevels/moonoutpost19.dmm | 338 +++++++--------
_maps/RandomZLevels/snowdin.dmm | 36 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 98 ++---
_maps/RandomZLevels/wildwest.dmm | 6 +-
.../map_files/Deltastation/DeltaStation2.dmm | 4 +-
.../IcemoonUnderground_Above.dmm | 24 +-
_maps/map_files/MetaStation/MetaStation.dmm | 6 +-
_maps/map_files/generic/CentCom.dmm | 36 +-
.../maintenance_miningsolar_3.dmm | 2 +-
_maps/shuttles/ruin_caravan_victim.dmm | 38 +-
_maps/templates/battlecruiser_starfury.dmm | 6 +-
.../templates/heretic_sacrifice_template.dmm | 40 +-
code/controllers/subsystem/zas.dm | 369 ++++++++++++----
code/game/turfs/closed/minerals.dm | 32 +-
code/game/turfs/open/_open.dm | 12 +-
code/game/turfs/open/ashplanet.dm | 2 +-
code/game/turfs/open/asteroid.dm | 22 +-
code/game/turfs/open/basalt.dm | 2 +-
code/game/turfs/open/chasm.dm | 6 +-
code/game/turfs/open/floor/fancy_floor.dm | 80 ++--
code/game/turfs/open/floor/hull.dm | 2 +-
code/game/turfs/open/floor/iron_floor.dm | 32 +-
code/game/turfs/open/floor/mineral_floor.dm | 26 +-
code/game/turfs/open/floor/misc_floor.dm | 20 +-
.../turfs/open/floor/plating/misc_plating.dm | 14 +-
code/game/turfs/open/floor/reinf_floor.dm | 50 +--
code/game/turfs/open/glass.dm | 2 +-
code/game/turfs/open/grass.dm | 2 +-
code/game/turfs/open/ice.dm | 2 +-
code/game/turfs/open/lava.dm | 6 +-
code/game/turfs/open/openspace.dm | 4 +-
code/game/turfs/open/planet.dm | 6 +-
code/game/turfs/open/snow.dm | 2 +-
code/game/turfs/open/water.dm | 6 +-
code/modules/atmospherics/ZAS/Turf.dm | 3 +-
.../atmospherics/ZAS/XGM/xgm_gas_mixture.dm | 1 +
.../environmental/LINDA_turf_tile.dm | 14 +-
.../atmospherics/gasmixtures/gas_mixture.dm | 2 +-
.../awaymissions/mission_code/snowdin.dm | 4 +-
code/modules/holodeck/turfs.dm | 4 +-
.../ruins/icemoonruin_code/hotsprings.dm | 2 +-
.../lavalandruin_code/elephantgraveyard.dm | 2 +-
code/modules/unit_tests/breath.dm | 12 +-
62 files changed, 1240 insertions(+), 1025 deletions(-)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
index 42ca9e3a167..26856fe193f 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
@@ -12,7 +12,7 @@
/obj/item/clothing/shoes/bronze,
/obj/item/clothing/head/bronze,
/turf/open/floor/bronze{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/icemoon/surface)
"m" = (
@@ -20,12 +20,12 @@
name = "empowered bronze spear"
},
/turf/open/floor/bronze{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/icemoon/surface)
"o" = (
/turf/open/floor/bronze{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/icemoon/surface)
"A" = (
@@ -66,7 +66,7 @@
"L" = (
/mob/living/simple_animal/hostile/megafauna/clockwork_defender,
/turf/open/floor/bronze{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/icemoon/surface)
"M" = (
@@ -95,7 +95,7 @@
},
/obj/item/pen,
/turf/open/floor/bronze{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/icemoon/surface)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
index 035d091871c..9fc33f694ed 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_homestead.dmm
@@ -6,7 +6,7 @@
"cP" = (
/mob/living/simple_animal/hostile/asteroid/polarbear,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"dy" = (
@@ -27,7 +27,7 @@
},
/obj/item/plate,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"ht" = (
@@ -38,7 +38,7 @@
/obj/structure/barricade/wooden/crude/snow,
/turf/open/floor/wood{
icon_state = "wood-broken7";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"kj" = (
@@ -58,7 +58,7 @@
/area/icemoon/underground/explored)
"ng" = (
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"nq" = (
@@ -78,7 +78,7 @@
dir = 8
},
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"qd" = (
@@ -103,14 +103,14 @@
pixel_y = 11
},
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"uA" = (
/obj/structure/barricade/wooden/snowed,
/turf/open/floor/wood{
icon_state = "wood-broken6";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"uG" = (
@@ -128,7 +128,7 @@
/obj/item/ammo_casing/shotgun/buckshot,
/obj/item/ammo_casing/shotgun/buckshot,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"vk" = (
@@ -153,7 +153,7 @@
pixel_y = 3
},
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"wl" = (
@@ -163,7 +163,7 @@
/obj/effect/turf_decal/siding/wood,
/obj/structure/mineral_door/wood,
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"wN" = (
@@ -174,7 +174,7 @@
dir = 4
},
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"yO" = (
@@ -190,13 +190,13 @@
"zT" = (
/obj/structure/bed/dogbed,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Cv" = (
/obj/structure/bookcase/random/religion,
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Ea" = (
@@ -212,7 +212,7 @@
pixel_y = 5
},
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"El" = (
@@ -221,7 +221,7 @@
},
/obj/item/flashlight/lantern,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Ez" = (
@@ -249,14 +249,14 @@
dir = 8
},
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Hy" = (
/obj/structure/barricade/wooden/crude/snow,
/turf/open/floor/wood{
icon_state = "wood-broken";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"HF" = (
@@ -268,7 +268,7 @@
pixel_y = -8
},
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Iz" = (
@@ -280,7 +280,7 @@
pixel_y = -7
},
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Mf" = (
@@ -294,7 +294,7 @@
/obj/structure/bed,
/obj/item/bedsheet/patriot,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"NP" = (
@@ -312,12 +312,12 @@
/obj/item/seeds/coffee,
/obj/item/seeds/coffee,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"QI" = (
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Rf" = (
@@ -336,7 +336,7 @@
/obj/structure/mineral_door/wood,
/obj/item/assembly/mousetrap/armed,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Sv" = (
@@ -365,14 +365,14 @@
/obj/structure/barricade/wooden/snowed,
/turf/open/floor/wood{
icon_state = "wood-broken3";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Vf" = (
/obj/structure/barricade/wooden/snowed,
/turf/open/floor/wood{
icon_state = "wood-broken";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"VV" = (
@@ -384,7 +384,7 @@
dir = 8
},
/turf/open/floor/stone{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Zg" = (
@@ -394,7 +394,7 @@
},
/obj/structure/mineral_door/wood,
/turf/open/floor/wood/large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
index c322b7c33d0..3d95d429115 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -307,7 +307,7 @@
/obj/item/storage/toolbox/electrical,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"dY" = (
@@ -450,7 +450,7 @@
dir = 8
},
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"gD" = (
@@ -501,7 +501,7 @@
/obj/item/pickaxe,
/obj/item/clothing/head/hardhat/weldhat/orange,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"hd" = (
@@ -509,7 +509,7 @@
/obj/structure/closet/crate,
/obj/item/stack/sheet/mineral/plasma/five,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"hr" = (
@@ -651,7 +651,7 @@
},
/obj/structure/plasticflaps,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"ja" = (
@@ -679,7 +679,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/broken/directional/west,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"jN" = (
@@ -719,7 +719,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"ku" = (
@@ -801,7 +801,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/caution,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"lG" = (
@@ -851,7 +851,7 @@
/obj/item/flashlight/lantern,
/obj/machinery/light/small/built/directional/west,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"ms" = (
@@ -876,7 +876,7 @@
"mA" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"mG" = (
@@ -969,7 +969,7 @@
name = "Interior Access"
},
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"oc" = (
@@ -1005,7 +1005,7 @@
dir = 8
},
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"oE" = (
@@ -1141,7 +1141,7 @@
/obj/machinery/atmospherics/components/tank/plasma,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"qP" = (
@@ -1226,7 +1226,7 @@
},
/obj/item/stack/sheet/mineral/plasma/thirty,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"sq" = (
@@ -1376,7 +1376,7 @@
},
/mob/living/simple_animal/hostile/asteroid/wolf,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"uq" = (
@@ -1414,7 +1414,7 @@
/obj/item/tank/internals/emergency_oxygen/empty,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"ve" = (
@@ -1447,7 +1447,7 @@
},
/obj/effect/mapping_helpers/airlock/abandoned,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"wc" = (
@@ -1469,7 +1469,7 @@
/obj/machinery/atmospherics/components/tank/air,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"wu" = (
@@ -1615,7 +1615,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron/smooth_large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Ae" = (
@@ -1698,7 +1698,7 @@
dir = 8
},
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"BJ" = (
@@ -1781,14 +1781,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"CJ" = (
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"CU" = (
@@ -2034,7 +2034,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Id" = (
@@ -2101,7 +2101,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"Jp" = (
@@ -2138,7 +2138,7 @@
/mob/living/simple_animal/hostile/skeleton/plasmaminer/jackhammer,
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Jy" = (
@@ -2360,7 +2360,7 @@
/obj/machinery/power/smes/engineering,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"MU" = (
@@ -2442,7 +2442,7 @@
/obj/machinery/light/small/directional/north,
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/smooth_large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Ny" = (
@@ -2516,7 +2516,7 @@
"OF" = (
/obj/effect/decal/cleanable/glass,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"OJ" = (
@@ -2526,7 +2526,7 @@
},
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"OM" = (
@@ -2564,7 +2564,7 @@
dir = 1
},
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Px" = (
@@ -2648,7 +2648,7 @@
/obj/machinery/door/airlock/external/glass/ruin,
/obj/effect/mapping_helpers/airlock/abandoned,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"Qn" = (
@@ -2696,7 +2696,7 @@
/obj/structure/rack,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Rf" = (
@@ -2970,7 +2970,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_half{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"Xj" = (
@@ -2984,7 +2984,7 @@
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_large{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/operations)
"XC" = (
@@ -2992,7 +2992,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/broken/directional/west,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/plasma_facility/commons)
"XI" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
index b737262d596..e23841cab79 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
@@ -19,7 +19,7 @@
/obj/structure/table/reinforced/rglass,
/obj/item/radio/intercom,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"cO" = (
@@ -40,7 +40,7 @@
},
/obj/machinery/door/airlock/external/glass/ruin,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"gz" = (
@@ -57,7 +57,7 @@
/area/icemoon/underground/unexplored/rivers)
"kr" = (
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"oj" = (
@@ -65,18 +65,18 @@
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/turf/open/floor/iron/grimy{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"oD" = (
/mob/living/simple_animal/hostile/asteroid/wolf,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"oT" = (
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"qS" = (
@@ -89,13 +89,13 @@
pixel_y = 7
},
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"rm" = (
/obj/structure/table/reinforced/rglass,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"rn" = (
@@ -110,7 +110,7 @@
"st" = (
/obj/machinery/door/airlock/public,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"sM" = (
@@ -132,13 +132,13 @@
"uz" = (
/obj/structure/tank_dispenser,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"vh" = (
/obj/item/chair/plastic,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"wg" = (
@@ -152,7 +152,7 @@
pixel_y = 20
},
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"wP" = (
@@ -166,7 +166,7 @@
/obj/structure/closet/wardrobe/grey,
/obj/item/clothing/gloves/color/plasmaman,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"yW" = (
@@ -185,7 +185,7 @@
/obj/item/clothing/head/helmet/space/plasmaman,
/obj/item/clothing/mask/breath,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"zk" = (
@@ -220,7 +220,7 @@
/obj/item/toy/crayon/spraycan,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Cu" = (
@@ -265,7 +265,7 @@
/obj/structure/dresser,
/obj/machinery/light/small/broken/directional/west,
/turf/open/floor/iron/grimy{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"GH" = (
@@ -286,7 +286,7 @@
/obj/structure/closet/wardrobe/grey,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Jh" = (
@@ -330,13 +330,13 @@
/obj/effect/turf_decal/siding/wood,
/obj/machinery/door/airlock/shuttle,
/turf/open/floor/iron/grimy{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"NO" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/grimy{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Oi" = (
@@ -379,7 +379,7 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/door/airlock/external/ruin,
/turf/open/floor/iron/smooth{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"SR" = (
@@ -412,14 +412,14 @@
},
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Ws" = (
/obj/structure/closet/wardrobe/grey,
/obj/item/clothing/under/plasmaman,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/powered/shuttle)
"Zd" = (
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
index cc8a6ae371f..7746d05bf10 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
@@ -12,7 +12,7 @@
},
/obj/item/pen,
/turf/open/misc/asteroid{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/icemoon/underground)
"q" = (
@@ -34,7 +34,7 @@
"A" = (
/obj/effect/mob_spawn/corpse/human/skeleton,
/turf/open/misc/asteroid{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/icemoon/underground)
"E" = (
@@ -56,12 +56,12 @@
"V" = (
/obj/item/storage/toolbox/mechanical/old/clean,
/turf/open/misc/asteroid{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/icemoon/underground)
"Z" = (
/turf/open/misc/asteroid{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/icemoon/underground)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
index 4124628eafa..357144bca96 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
@@ -16,25 +16,25 @@
/area/icemoon/underground/unexplored)
"ae" = (
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"af" = (
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"ag" = (
/obj/item/feather,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"ah" = (
/obj/structure/bookcase/random,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"ai" = (
@@ -64,21 +64,21 @@
"ao" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"ap" = (
/obj/item/stack/sheet/mineral/wood,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aq" = (
/obj/structure/fluff/paper/stack,
/turf/open/floor/wood{
icon_state = "wood-broken";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"ar" = (
@@ -87,7 +87,7 @@
"at" = (
/obj/structure/fluff/paper,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"au" = (
@@ -108,7 +108,7 @@
"az" = (
/obj/item/paper/crumpled/fluff/stations/lavaland/library/diary,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aA" = (
@@ -118,7 +118,7 @@
"aB" = (
/turf/open/floor/wood{
icon_state = "wood-broken6";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aC" = (
@@ -127,28 +127,28 @@
/area/ruin/unpowered/buried_library)
"aD" = (
/turf/open/floor/carpet/black{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aE" = (
/obj/item/stack/sheet/mineral/wood,
/obj/item/book/manual/random,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aG" = (
/obj/structure/table/bronze,
/obj/item/stack/ore/slag,
/turf/open/floor/carpet/black{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aH" = (
/obj/structure/table/bronze,
/obj/item/statuebust/hippocratic,
/turf/open/floor/carpet/black{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aI" = (
@@ -169,7 +169,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper/stack,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aM" = (
@@ -180,13 +180,13 @@
"aN" = (
/obj/structure/statue/sandstone/venus,
/turf/open/floor/carpet/black{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aO" = (
/mob/living/simple_animal/pet/fox,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aP" = (
@@ -197,13 +197,13 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aR" = (
/obj/structure/fluff/paper/stack,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aS" = (
@@ -219,7 +219,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/fluff/paper,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aU" = (
@@ -230,7 +230,7 @@
/obj/item/stack/sheet/mineral/wood,
/obj/structure/fluff/paper/stack,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"aW" = (
@@ -250,7 +250,7 @@
/obj/structure/fluff/paper/stack,
/obj/structure/fluff/paper,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"ba" = (
@@ -268,7 +268,7 @@
dir = 1
},
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bd" = (
@@ -278,7 +278,7 @@
},
/turf/open/floor/wood{
icon_state = "wood-broken7";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"be" = (
@@ -286,7 +286,7 @@
dir = 5
},
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bf" = (
@@ -295,7 +295,7 @@
dir = 4
},
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bg" = (
@@ -306,7 +306,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/mob/living/simple_animal/pet/fox,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bi" = (
@@ -321,7 +321,7 @@
/obj/structure/fluff/paper/stack,
/turf/open/floor/wood{
icon_state = "wood-broken4";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bl" = (
@@ -345,7 +345,7 @@
/obj/structure/mineral_door/wood,
/obj/structure/barricade/wooden/crude/snow,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"br" = (
@@ -368,26 +368,26 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken4";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bw" = (
/turf/open/floor/wood{
icon_state = "wood-broken3";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bx" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken5";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"by" = (
/obj/structure/statue/bronze/marx,
/turf/open/floor/carpet/black{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bz" = (
@@ -403,7 +403,7 @@
"bB" = (
/obj/structure/fluff/paper/stack,
/turf/open/floor/carpet/black{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bC" = (
@@ -413,34 +413,34 @@
},
/mob/living/simple_animal/pet/fox,
/turf/open/floor/wood{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bD" = (
/turf/open/floor/wood{
icon_state = "wood-broken5";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bE" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bF" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken3";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bG" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken6";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bH" = (
@@ -448,28 +448,28 @@
/obj/structure/fluff/paper,
/turf/open/floor/wood{
icon_state = "wood-broken4";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bI" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken7";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bJ" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood{
icon_state = "wood-broken2";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bK" = (
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/wood{
icon_state = "wood-broken5";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bL" = (
@@ -478,7 +478,7 @@
},
/turf/open/floor/wood{
icon_state = "wood-broken3";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bM" = (
@@ -487,7 +487,7 @@
},
/turf/open/floor/wood{
icon_state = "wood-broken5";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bN" = (
@@ -495,20 +495,20 @@
/obj/structure/fluff/paper,
/turf/open/floor/wood{
icon_state = "wood-broken5";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bP" = (
/obj/item/paper/crumpled/bloody/fluff/stations/lavaland/library/warning,
/turf/open/floor/wood{
icon_state = "wood-broken3";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
"bQ" = (
/turf/open/floor/wood{
icon_state = "wood-broken7";
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/ruin/unpowered/buried_library)
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm
index 910598c44b4..e58ad558b34 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm
@@ -15,7 +15,7 @@
"q" = (
/mob/living/simple_animal/hostile/megafauna/wendigo,
/turf/open/indestructible/necropolis{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"z" = (
@@ -23,7 +23,7 @@
id = "wendigo arena"
},
/turf/open/indestructible/necropolis{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"K" = (
@@ -34,7 +34,7 @@
/area/icemoon/underground/unexplored)
"N" = (
/turf/open/indestructible/necropolis{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"U" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
index e381d3dc0e0..cd6d52fab41 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -204,7 +204,7 @@
dir = 1
},
/turf/open/floor/wood{
- initial_gas_mix = "o2=22;n2=82;TEMP=180";
+ initial_gas = "o2=22;n2=82;TEMP=180";
name = "bridge"
},
/area/ruin/powered/snow_biodome)
@@ -276,7 +276,7 @@
/obj/machinery/light/built/directional/north,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/pod/dark{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/powered/snow_biodome)
"og" = (
@@ -423,7 +423,7 @@
"PM" = (
/obj/effect/turf_decal/siding/wood,
/turf/open/floor/wood{
- initial_gas_mix = "o2=22;n2=82;TEMP=180";
+ initial_gas = "o2=22;n2=82;TEMP=180";
name = "bridge"
},
/area/ruin/powered/snow_biodome)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
index a2b3d227d5d..553b09f55fc 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
@@ -4,7 +4,7 @@
/area/template_noop)
"b" = (
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"c" = (
@@ -24,21 +24,21 @@
"g" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"i" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"k" = (
/obj/effect/decal/remains/human,
/obj/item/melee/cultblade,
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"l" = (
@@ -46,13 +46,13 @@
/obj/item/clothing/shoes/cult,
/obj/item/clothing/suit/hooded/cultrobes,
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"m" = (
/obj/effect/decal/remains/human,
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"o" = (
@@ -74,7 +74,7 @@
name = "ohfuck"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"q" = (
@@ -83,7 +83,7 @@
/obj/item/clothing/suit/hooded/cultrobes,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered/cultaltar)
"s" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 8ce56831f6b..5ec32d26957 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -164,7 +164,7 @@
"J" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/powered)
"L" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
index ba0c6f9a672..1bb066f4c07 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
@@ -15,14 +15,14 @@
"e" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"f" = (
/obj/structure/table/wood,
/obj/item/storage/box/cups,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"g" = (
@@ -32,27 +32,27 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"h" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"i" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"j" = (
/obj/item/food/pizzaslice/mushroom,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"k" = (
@@ -60,7 +60,7 @@
/obj/effect/spawner/random/food_or_drink/pizzaparty,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"l" = (
@@ -70,42 +70,42 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"m" = (
/obj/item/chair/wood/wings,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"n" = (
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"o" = (
/obj/item/plate,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"p" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"q" = (
/obj/item/chair/wood/wings,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"r" = (
@@ -116,25 +116,25 @@
name = "party hat"
},
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"s" = (
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"t" = (
/obj/structure/chair/wood/wings,
/obj/effect/decal/remains/human,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"u" = (
/obj/structure/glowshroom/single,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"v" = (
@@ -146,21 +146,21 @@
/obj/item/kitchen/fork,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"x" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/food_or_drink/pizzaparty,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"y" = (
/obj/structure/table/wood,
/obj/item/plate,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"z" = (
@@ -168,7 +168,7 @@
/obj/structure/glowshroom/single,
/obj/item/a_gift,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"A" = (
@@ -176,7 +176,7 @@
/obj/item/plate,
/obj/item/kitchen/fork,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"C" = (
@@ -185,7 +185,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"D" = (
@@ -193,47 +193,47 @@
/obj/item/food/pizzaslice/margherita,
/obj/item/plate,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"E" = (
/obj/structure/table/wood,
/obj/item/food/pizzaslice/meat,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"F" = (
/obj/structure/table/wood,
/obj/item/food/cake/birthday,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"G" = (
/obj/structure/table/wood,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"H" = (
/obj/item/chair/wood/wings,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"I" = (
/obj/item/kitchen/fork,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"J" = (
/obj/structure/glowshroom/single,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"K" = (
@@ -243,21 +243,21 @@
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"L" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"M" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/a_gift,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"N" = (
@@ -269,19 +269,19 @@
/obj/item/knife/kitchen,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"P" = (
/obj/machinery/light/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"Q" = (
/turf/open/floor/plating{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
index 372731e7223..e06a4ff91d2 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm
@@ -16,12 +16,12 @@
team_number = 100
},
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"k" = (
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"l" = (
@@ -29,59 +29,59 @@
team_number = 100
},
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"o" = (
/obj/item/hemostat/alien,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"p" = (
/obj/effect/mob_spawn/corpse/human/abductor,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"q" = (
/obj/structure/closet/abductor,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"s" = (
/obj/structure/table/optable/abductor,
/obj/item/cautery/alien,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"t" = (
/obj/structure/table/abductor,
/obj/item/storage/box/alienhandcuffs,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"v" = (
/obj/item/scalpel/alien,
/obj/item/surgical_drapes,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"w" = (
/obj/item/retractor/alien,
/obj/item/paper/guides/antag/abductor,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"y" = (
/obj/machinery/abductor/gland_dispenser,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"z" = (
@@ -89,13 +89,13 @@
/obj/item/surgicaldrill/alien,
/obj/item/circular_saw/alien,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
"A" = (
/obj/structure/bed/abductor,
/turf/open/floor/plating/abductor{
- initial_gas_mix = "LAVALAND_ATMOS"
+ initial_gas = "LAVALAND_ATMOS"
},
/area/ruin/unpowered)
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 37862ff0d6e..638fa459a2b 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -2443,7 +2443,7 @@
"lw" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/engine/air{
- initial_gas_mix = "o2=20000;n2=80000;TEMP=293.15"
+ initial_gas = "o2=20000;n2=80000;TEMP=293.15"
},
/area/ruin/space/derelict/atmospherics)
"lx" = (
@@ -2519,7 +2519,7 @@
chamber_id = "ks13"
},
/turf/open/floor/engine/air{
- initial_gas_mix = "o2=20000;n2=80000;TEMP=293.15"
+ initial_gas = "o2=20000;n2=80000;TEMP=293.15"
},
/area/ruin/space/derelict/atmospherics)
"lO" = (
@@ -2527,7 +2527,7 @@
chamber_id = "ks13"
},
/turf/open/floor/engine/air{
- initial_gas_mix = "o2=20000;n2=80000;TEMP=293.15"
+ initial_gas = "o2=20000;n2=80000;TEMP=293.15"
},
/area/ruin/space/derelict/atmospherics)
"lP" = (
@@ -2666,7 +2666,7 @@
"mq" = (
/turf/open/floor/iron{
icon_state = "damaged2";
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/space/derelict/atmospherics)
"mr" = (
@@ -3157,7 +3157,7 @@
chamber_id = "ks13"
},
/turf/open/floor/engine/air{
- initial_gas_mix = "o2=20000;n2=80000;TEMP=293.15"
+ initial_gas = "o2=20000;n2=80000;TEMP=293.15"
},
/area/ruin/space/derelict/atmospherics)
"rC" = (
diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 0f8fa5f5f77..269f8102e67 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -112,7 +112,7 @@
dir = 4
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"aD" = (
@@ -132,7 +132,7 @@
dir = 4
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"aI" = (
@@ -148,14 +148,14 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"aM" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"aN" = (
@@ -193,7 +193,7 @@
dir = 4
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"aR" = (
@@ -486,7 +486,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"gY" = (
@@ -513,7 +513,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"hm" = (
@@ -610,7 +610,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"hB" = (
@@ -813,7 +813,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter2)
"ix" = (
@@ -883,7 +883,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter3)
"iT" = (
@@ -923,7 +923,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter2)
"ja" = (
diff --git a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
index b73909ba583..1e7ece5606b 100644
--- a/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
@@ -223,7 +223,7 @@
/area/ruin/unpowered/no_grav)
"K" = (
/turf/open/floor/iron/stairs/right{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"Q" = (
@@ -237,12 +237,12 @@
/area/ruin/space/has_grav/hilbertresearchfacility)
"U" = (
/turf/open/floor/iron/stairs/medium{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"X" = (
/turf/open/floor/iron/stairs/left{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
diff --git a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
index 58a0bfafca9..74dee33ca80 100644
--- a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
+++ b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
@@ -118,7 +118,7 @@
chamber_id = "lizardgas"
},
/turf/open/floor/engine/plasma{
- initial_gas_mix = "plasma=35000;TEMP=293.15"
+ initial_gas = "plasma=35000;TEMP=293.15"
},
/area/ruin/space/has_grav/thelizardsgas)
"mN" = (
@@ -298,7 +298,7 @@
/area/template_noop)
"DG" = (
/turf/open/floor/engine/plasma{
- initial_gas_mix = "plasma=35000;TEMP=293.15"
+ initial_gas = "plasma=35000;TEMP=293.15"
},
/area/ruin/space/has_grav/thelizardsgas)
"Es" = (
@@ -423,7 +423,7 @@
"OQ" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/engine/plasma{
- initial_gas_mix = "plasma=35000;TEMP=293.15"
+ initial_gas = "plasma=35000;TEMP=293.15"
},
/area/ruin/space/has_grav/thelizardsgas)
"Pb" = (
@@ -457,7 +457,7 @@
name = "Zingo"
},
/turf/open/floor/engine/plasma{
- initial_gas_mix = "plasma=35000;TEMP=293.15"
+ initial_gas = "plasma=35000;TEMP=293.15"
},
/area/ruin/space/has_grav/thelizardsgas)
"RB" = (
@@ -499,7 +499,7 @@
dir = 4
},
/turf/open/floor/engine/plasma{
- initial_gas_mix = "plasma=35000;TEMP=293.15"
+ initial_gas = "plasma=35000;TEMP=293.15"
},
/area/ruin/space/has_grav/thelizardsgas)
"Um" = (
@@ -549,7 +549,7 @@
chamber_id = "lizardgas"
},
/turf/open/floor/engine/plasma{
- initial_gas_mix = "plasma=35000;TEMP=293.15"
+ initial_gas = "plasma=35000;TEMP=293.15"
},
/area/ruin/space/has_grav/thelizardsgas)
"Ys" = (
diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
index e988f85602b..f20af636567 100644
--- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
+++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm
@@ -118,13 +118,13 @@
/obj/effect/turf_decal/sand,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"B" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"C" = (
@@ -135,7 +135,7 @@
},
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"D" = (
@@ -155,14 +155,14 @@
},
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"G" = (
/obj/effect/turf_decal/stripes/asteroid/line,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
"H" = (
@@ -216,7 +216,7 @@
/obj/machinery/light/small/directional/north,
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/ruin/unpowered/no_grav)
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index 65506463dd4..ba60d17af25 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -11,14 +11,14 @@
"ad" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
luminosity = 5
},
/area/awaymission/caves/bmp_asteroid/level_four)
"ah" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
luminosity = 5
},
/area/awaymission/caves/bmp_asteroid/level_three)
@@ -27,25 +27,25 @@
/area/awaymission/caves/bmp_asteroid/level_three)
"ao" = (
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"ap" = (
/obj/structure/destructible/cult/pylon,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"ar" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"as" = (
/obj/effect/decal/cleanable/blood/gibs/old,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"au" = (
@@ -58,7 +58,7 @@
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/organ/heart/demon,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"av" = (
@@ -67,13 +67,13 @@
name = "shock rune"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aw" = (
/obj/effect/decal/remains/human,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"ax" = (
@@ -87,39 +87,39 @@
},
/obj/item/coin/antagtoken,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"az" = (
/obj/structure/constructshell,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aA" = (
/obj/structure/girder/cult,
/obj/item/stack/sheet/runed_metal,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aB" = (
/obj/structure/spawner/skeleton,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aC" = (
/obj/structure/bed,
/obj/item/bedsheet/cult,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aD" = (
/obj/item/stack/sheet/runed_metal,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aE" = (
@@ -132,7 +132,7 @@
name = "\proper an extremely flamboyant book"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aF" = (
@@ -143,13 +143,13 @@
name = "weak forcefield"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aG" = (
/obj/item/ectoplasm,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aH" = (
@@ -158,7 +158,7 @@
"aI" = (
/obj/machinery/door/airlock/external/ruin,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"aJ" = (
@@ -166,7 +166,7 @@
/area/awaymission/caves/bmp_asteroid/level_three)
"aK" = (
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"aM" = (
@@ -175,7 +175,7 @@
id = "minedeep"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"aP" = (
@@ -185,33 +185,33 @@
name = "rusty ladder"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aR" = (
/obj/effect/forcefield/cult,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aS" = (
/obj/structure/girder/cult,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aV" = (
/obj/effect/forcefield/cult,
/turf/open/lava/smooth{
desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
luminosity = 5
},
/area/awaymission/caves/bmp_asteroid/level_four)
"aW" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"aX" = (
@@ -225,7 +225,7 @@
name = "light of the tunnel"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"aZ" = (
@@ -234,26 +234,26 @@
name = "flame rune"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"ba" = (
/obj/structure/destructible/cult/item_dispenser/altar,
/obj/item/book/granter/martial/plasma_fist/nobomb,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bf" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bl" = (
/obj/structure/ore_box,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"bm" = (
@@ -261,7 +261,7 @@
calibrated = 0
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bn" = (
@@ -272,14 +272,14 @@
/obj/effect/decal/cleanable/blood,
/obj/structure/spawner/skeleton,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bz" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bA" = (
@@ -287,25 +287,25 @@
/obj/item/necromantic_stone,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bC" = (
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"bD" = (
/mob/living/simple_animal/hostile/skeleton,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"bE" = (
/obj/structure/destructible/cult/pylon,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"bF" = (
@@ -315,7 +315,7 @@
name = "rusty ladder"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"bK" = (
@@ -327,7 +327,7 @@
"bM" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
luminosity = 5
},
/area/awaymission/caves/bmp_asteroid)
@@ -337,7 +337,7 @@
"bO" = (
/turf/open/lava/smooth{
desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
luminosity = 5
},
/area/awaymission/caves/bmp_asteroid/level_two)
@@ -350,12 +350,12 @@
"bS" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"bT" = (
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"bU" = (
@@ -369,19 +369,19 @@
name = "light of the tunnel"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"bY" = (
/mob/living/simple_animal/hostile/skeleton,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"ca" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"ce" = (
@@ -390,12 +390,12 @@
id = "mineintro"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"cf" = (
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"cg" = (
@@ -407,7 +407,7 @@
"cl" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"cm" = (
@@ -415,24 +415,24 @@
/area/awaymission/caves/bmp_asteroid/level_two)
"cn" = (
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cp" = (
/obj/structure/table,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cr" = (
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cs" = (
/obj/item/shard,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"ct" = (
@@ -440,36 +440,36 @@
/obj/item/stack/rods,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cu" = (
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cv" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cw" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cx" = (
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"cA" = (
/obj/effect/decal/remains/xeno,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cB" = (
@@ -478,7 +478,7 @@
},
/obj/effect/decal/cleanable/xenoblood,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cC" = (
@@ -486,13 +486,13 @@
/obj/item/restraints/handcuffs/cable,
/obj/item/restraints/handcuffs/cable,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cD" = (
/obj/effect/decal/remains/human,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cE" = (
@@ -502,19 +502,19 @@
},
/obj/item/stack/rods,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cF" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cH" = (
/obj/machinery/door/airlock/external/ruin,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"cK" = (
@@ -528,7 +528,7 @@
/obj/machinery/door/window/left/directional/east,
/obj/effect/decal/cleanable/xenoblood/xgibs,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cO" = (
@@ -537,19 +537,19 @@
},
/obj/machinery/door/window/left/directional/east,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cP" = (
/obj/machinery/door/airlock/external/ruin,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cR" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cS" = (
@@ -559,7 +559,7 @@
icon_state = "right"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cT" = (
@@ -570,13 +570,13 @@
icon_state = "right"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cV" = (
/obj/effect/decal/cleanable/xenoblood/xgibs,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cW" = (
@@ -584,20 +584,20 @@
dir = 4
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cX" = (
/obj/structure/table,
/obj/item/melee/baton/security,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cY" = (
/obj/structure/glowshroom/single,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"cZ" = (
@@ -606,7 +606,7 @@
pixel_x = 32
},
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"db" = (
@@ -614,13 +614,13 @@
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/crap,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"dd" = (
/obj/structure/closet/emcloset,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"df" = (
@@ -631,7 +631,7 @@
/obj/item/grenade/syndieminibomb/concussion,
/obj/item/grenade/syndieminibomb/concussion,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"dg" = (
@@ -645,7 +645,7 @@
name = "light of the tunnel"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"dh" = (
@@ -832,20 +832,20 @@
/area/awaymission/caves/northblock)
"ec" = (
/turf/open/floor/wood{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"ed" = (
/obj/structure/bed,
/obj/effect/landmark/awaystart,
/turf/open/floor/wood{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"ee" = (
/obj/structure/girder,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"eg" = (
@@ -882,24 +882,24 @@
"em" = (
/obj/structure/closet/secure_closet/personal,
/turf/open/floor/wood{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"en" = (
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/wood{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"eo" = (
/obj/item/stack/rods,
/turf/open/floor/wood{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"ep" = (
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"er" = (
@@ -917,7 +917,7 @@
"et" = (
/obj/effect/decal/cleanable/shreds,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"ev" = (
@@ -1076,18 +1076,18 @@
name = "light of the tunnel"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"fy" = (
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"fz" = (
/obj/structure/barricade/wooden,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"fA" = (
@@ -1131,7 +1131,7 @@
/area/awaymission/caves/bmp_asteroid)
"fQ" = (
/turf/open/floor/plating/elevatorshaft{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
name = "elevator flooring"
},
/area/awaymission/caves/bmp_asteroid)
@@ -1142,14 +1142,14 @@
"fU" = (
/obj/effect/landmark/awaystart,
/turf/open/floor/plating/elevatorshaft{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
name = "elevator flooring"
},
/area/awaymission/caves/bmp_asteroid)
"fW" = (
/obj/structure/girder,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"fY" = (
@@ -1163,7 +1163,7 @@
id = "mineintro"
},
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gb" = (
@@ -1173,7 +1173,7 @@
"gc" = (
/obj/item/stack/rods,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gf" = (
@@ -1185,20 +1185,20 @@
/obj/structure/table/reinforced,
/obj/item/storage/box/donkpockets,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gh" = (
/obj/structure/table/reinforced,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gi" = (
/obj/structure/table/reinforced,
/obj/item/stack/rods,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gj" = (
@@ -1218,13 +1218,13 @@
"go" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gp" = (
/obj/structure/table_frame,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gq" = (
@@ -1272,7 +1272,7 @@
"gB" = (
/obj/machinery/mech_bay_recharge_port,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gC" = (
@@ -1284,7 +1284,7 @@
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/glasses/material,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gG" = (
@@ -1300,12 +1300,12 @@
"gI" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gJ" = (
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gK" = (
@@ -1323,19 +1323,19 @@
"gN" = (
/obj/structure/holohoop,
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gO" = (
/obj/structure/closet/emcloset,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gP" = (
/obj/item/toy/beach_ball/holoball,
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gU" = (
@@ -1343,7 +1343,7 @@
dir = 1
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"gX" = (
@@ -1354,7 +1354,7 @@
/obj/effect/baseturf_helper/lava,
/turf/open/lava/smooth{
desc = "Looks hot.";
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7";
+ initial_gas = "n2=23;o2=14;TEMP=2.7";
luminosity = 5
},
/area/awaymission/caves/bmp_asteroid/level_four)
@@ -1372,19 +1372,19 @@
/area/awaymission/caves/northblock)
"hq" = (
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"hr" = (
/obj/structure/spider/stickyweb,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"hw" = (
/obj/structure/barricade/wooden,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"hQ" = (
@@ -1394,19 +1394,19 @@
"hT" = (
/obj/structure/flora/rock,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"jH" = (
/obj/structure/spawner/mining/basilisk,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"jU" = (
/obj/structure/spawner/mining/basilisk,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"ki" = (
@@ -1418,7 +1418,7 @@
/obj/item/gun/energy/laser/captain/scattershot,
/obj/item/slimepotion/fireproof,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"kw" = (
@@ -1426,7 +1426,7 @@
pixel_y = -32
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"kE" = (
@@ -1447,13 +1447,13 @@
"ml" = (
/mob/living/simple_animal/hostile/asteroid/fugu,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"ms" = (
/obj/structure/spawner/mining/goliath,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"mX" = (
@@ -1461,7 +1461,7 @@
name = "Mining cart"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"nw" = (
@@ -1475,18 +1475,18 @@
name = "rusted mine"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"nY" = (
/obj/item/slimepotion/fireproof,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"oI" = (
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"pc" = (
@@ -1498,13 +1498,13 @@
/obj/item/mjollnir,
/mob/living/simple_animal/hostile/giant_spider/nurse,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"qD" = (
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"qE" = (
@@ -1514,7 +1514,7 @@
"ra" = (
/obj/structure/glowshroom/single,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"rl" = (
@@ -1525,12 +1525,12 @@
amount = 12
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"rv" = (
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"rF" = (
@@ -1540,7 +1540,7 @@
"sl" = (
/obj/structure/spawner/mining/hivelord,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"sw" = (
@@ -1550,19 +1550,19 @@
"sE" = (
/obj/item/greentext,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"sI" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"sT" = (
/obj/structure/spawner/mining/hivelord,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"tz" = (
@@ -1573,7 +1573,7 @@
"tU" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"uN" = (
@@ -1593,13 +1593,13 @@
"vX" = (
/obj/effect/forcefield/cult,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"wl" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"ww" = (
@@ -1608,13 +1608,13 @@
"wT" = (
/obj/structure/destructible/cult/pylon,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"xs" = (
/obj/item/bedsheet/patriot,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"yS" = (
@@ -1630,50 +1630,50 @@
/obj/item/slimepotion/fireproof,
/obj/item/clothing/glasses/thermal,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"yV" = (
/obj/structure/flora/rock,
/obj/item/soulstone/anybody,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"zn" = (
/obj/effect/landmark/awaystart,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"zH" = (
/obj/structure/flora/rock,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"zN" = (
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"zR" = (
/obj/effect/decal/cleanable/ash,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"zS" = (
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Aj" = (
/obj/structure/grille,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"AN" = (
@@ -1682,13 +1682,13 @@
name = "shock rune"
},
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"AZ" = (
/obj/structure/girder,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Bd" = (
@@ -1697,54 +1697,54 @@
name = "flame rune"
},
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"Bo" = (
/obj/structure/ore_box,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Bs" = (
/obj/effect/landmark/awaystart,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Bz" = (
/mob/living/simple_animal/hostile/giant_spider/nurse,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"BH" = (
/obj/structure/spawner/skeleton,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"BK" = (
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"BL" = (
/obj/item/stack/rods,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"BQ" = (
/obj/effect/decal/remains/human,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Cc" = (
/obj/item/gun/energy/laser/captain/scattershot,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"CB" = (
@@ -1753,7 +1753,7 @@
name = "Cave Bat"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Ds" = (
@@ -1761,7 +1761,7 @@
pixel_x = 5
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"DH" = (
@@ -1772,7 +1772,7 @@
pixel_x = 5
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"DO" = (
@@ -1783,7 +1783,7 @@
},
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Fj" = (
@@ -1792,13 +1792,13 @@
desc = "It's a beachball with a face crudely drawn onto it with some soot."
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"FI" = (
/obj/machinery/light/directional/south,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"FS" = (
@@ -1810,7 +1810,7 @@
"FV" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Gt" = (
@@ -1824,31 +1824,31 @@
"HK" = (
/obj/structure/destructible/cult/pylon,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"Ik" = (
/obj/item/stack/rods,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"IN" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"IY" = (
/obj/structure/spider/cocoon,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"IZ" = (
/obj/item/clothing/head/collectable/wizard,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"Jp" = (
@@ -1859,26 +1859,26 @@
pixel_x = 32
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"JD" = (
/obj/structure/ore_box,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"Kh" = (
/obj/machinery/light/small/built/directional/west,
/turf/open/floor/wood{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/northblock)
"KY" = (
/obj/structure/table,
/obj/item/paper/crumpled/awaymissions/caves/unsafe_area,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Ls" = (
@@ -1886,7 +1886,7 @@
pixel_x = -32
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Ly" = (
@@ -1900,7 +1900,7 @@
amount = 15
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Mk" = (
@@ -1910,19 +1910,19 @@
"Mq" = (
/obj/structure/flora/rock,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Mw" = (
/obj/item/shard,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"MB" = (
/obj/item/grown/log,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"MC" = (
@@ -1935,7 +1935,7 @@
"MM" = (
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Np" = (
@@ -1944,7 +1944,7 @@
name = "rusted mine"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"NO" = (
@@ -1952,25 +1952,25 @@
/obj/structure/filingcabinet,
/obj/item/paper/fluff/awaymissions/caves/omega,
/turf/open/floor/iron{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"NX" = (
/obj/effect/decal/cleanable/blood/gibs/old,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"OA" = (
/obj/item/gun/ballistic/automatic/pistol/deagle/gold,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"OE" = (
/obj/machinery/light/directional/west,
/turf/open/floor/plating{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/research)
"OJ" = (
@@ -1979,7 +1979,7 @@
name = "Cave Bat"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"OX" = (
@@ -2001,7 +2001,7 @@
"Rm" = (
/obj/effect/decal/remains/human,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"Rp" = (
@@ -2012,38 +2012,38 @@
},
/obj/machinery/light/small/built/directional/east,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Ry" = (
/obj/structure/grille,
/obj/structure/barricade/wooden,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"RJ" = (
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"SV" = (
/obj/machinery/light/small/directional/east,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"Tj" = (
/obj/item/assembly/igniter,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"TT" = (
/obj/item/ectoplasm,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"Uu" = (
@@ -2056,7 +2056,7 @@
/obj/effect/decal/remains/human,
/obj/item/clothing/under/misc/patriotsuit,
/turf/open/misc/asteroid/basalt/lava{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_four)
"VK" = (
@@ -2064,7 +2064,7 @@
name = "spooky skeleton remains"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Wj" = (
@@ -2086,13 +2086,13 @@
pixel_x = -32
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"Xs" = (
/mob/living/simple_animal/hostile/giant_spider/hunter,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"XG" = (
@@ -2101,44 +2101,44 @@
name = "rusted mine"
},
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"XN" = (
/obj/item/grenade/syndieminibomb/concussion,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_two)
"XR" = (
/obj/structure/spider/stickyweb,
/mob/living/simple_animal/hostile/giant_spider/hunter,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"YG" = (
/obj/item/organ/brain/alien,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"YZ" = (
/mob/living/simple_animal/hostile/skeleton,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
"Zj" = (
/obj/effect/decal/remains/human,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid)
"ZS" = (
/obj/structure/barricade/wooden,
/turf/open/misc/asteroid/basalt{
- initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
+ initial_gas = "n2=23;o2=14;TEMP=2.7"
},
/area/awaymission/caves/bmp_asteroid/level_three)
diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm
index 6189d9d5e58..dc8acaa83f5 100644
--- a/_maps/RandomZLevels/challenge.dmm
+++ b/_maps/RandomZLevels/challenge.dmm
@@ -450,18 +450,18 @@
/area/awaymission/challenge/main)
"bF" = (
/turf/open/floor/iron/white/corner{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/challenge/main)
"bG" = (
/turf/open/floor/iron/white/side{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/challenge/main)
"bH" = (
/turf/open/floor/iron/white/corner{
dir = 8;
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/challenge/main)
"bI" = (
@@ -529,7 +529,7 @@
"bQ" = (
/obj/item/gun/ballistic/revolver/russian,
/turf/open/floor/iron/white/side{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/challenge/main)
"bR" = (
@@ -560,7 +560,7 @@
"bU" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/white{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/challenge/main)
"bV" = (
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 3d405d7d6ae..0687985225b 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -549,7 +549,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -563,7 +563,7 @@
/obj/structure/alien/weeds,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"bZ" = (
@@ -576,7 +576,7 @@
/obj/structure/alien/weeds,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -584,7 +584,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -597,7 +597,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -611,7 +611,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -626,7 +626,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "floorscorched2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -640,7 +640,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -652,7 +652,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -665,7 +665,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -678,7 +678,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -748,14 +748,14 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
"cp" = (
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"cq" = (
@@ -765,7 +765,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -783,7 +783,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"cs" = (
@@ -795,7 +795,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -803,7 +803,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"cu" = (
@@ -811,7 +811,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -823,7 +823,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -880,7 +880,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -897,7 +897,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -909,7 +909,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -921,7 +921,7 @@
/obj/structure/alien/weeds,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"cH" = (
@@ -934,7 +934,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -946,7 +946,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -957,7 +957,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -975,7 +975,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -990,7 +990,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1045,7 +1045,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1054,7 +1054,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged4";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1071,7 +1071,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1088,7 +1088,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"cU" = (
@@ -1107,7 +1107,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1116,7 +1116,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1125,7 +1125,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged3";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1142,7 +1142,7 @@
/turf/open/floor/iron{
dir = 1;
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1161,14 +1161,14 @@
},
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"da" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"db" = (
@@ -1200,7 +1200,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1222,7 +1222,7 @@
/turf/open/floor/iron{
dir = 1;
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1236,14 +1236,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"di" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"dj" = (
@@ -1268,7 +1268,7 @@
/obj/structure/alien/weeds,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1279,7 +1279,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1289,7 +1289,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1298,7 +1298,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1312,7 +1312,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg3";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1325,7 +1325,7 @@
},
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"dr" = (
@@ -1337,7 +1337,7 @@
/obj/item/suppressor,
/turf/open/floor/wood{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"ds" = (
@@ -1374,7 +1374,7 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"dw" = (
@@ -1387,7 +1387,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1395,7 +1395,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/syndicate)
"dy" = (
@@ -1409,7 +1409,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1428,7 +1428,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1436,7 +1436,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1448,7 +1448,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1467,7 +1467,7 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1476,7 +1476,7 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/syndicate)
@@ -1484,7 +1484,7 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -1840,7 +1840,7 @@
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/research)
"fc" = (
@@ -2306,7 +2306,7 @@
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"gf" = (
@@ -3611,7 +3611,7 @@
/obj/item/shard,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"iU" = (
@@ -3886,7 +3886,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -3894,14 +3894,14 @@
/obj/structure/grille,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"jC" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"jD" = (
@@ -4105,7 +4105,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "floorscorched2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4115,7 +4115,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4125,7 +4125,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4135,7 +4135,7 @@
/obj/structure/cable,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4145,7 +4145,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "floorscorched1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4154,7 +4154,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4164,7 +4164,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged3";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4329,14 +4329,14 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
"kC" = (
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"kD" = (
@@ -4348,7 +4348,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged4";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4356,7 +4356,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4365,7 +4365,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged5";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4374,7 +4374,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4455,7 +4455,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"kQ" = (
@@ -4464,7 +4464,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg3";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4618,7 +4618,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4630,7 +4630,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4770,7 +4770,7 @@
dir = 8
},
/turf/open/floor/plating{
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4804,7 +4804,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4814,7 +4814,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -4943,7 +4943,7 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5084,7 +5084,7 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5226,7 +5226,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5240,7 +5240,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "floorscorched2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5311,7 +5311,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5366,7 +5366,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "floorscorched2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5376,7 +5376,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5407,7 +5407,7 @@
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"no" = (
@@ -5432,7 +5432,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5463,7 +5463,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5471,7 +5471,7 @@
/obj/item/pickaxe/drill,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"nw" = (
@@ -5484,7 +5484,7 @@
},
/turf/open/floor/iron/cafeteria{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5506,7 +5506,7 @@
},
/turf/open/floor/iron/cafeteria{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5519,7 +5519,7 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5555,7 +5555,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5568,7 +5568,7 @@
/turf/open/floor/plating{
heat_capacity = 1e+006;
icon_state = "platingdmg3";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5581,7 +5581,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5594,7 +5594,7 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5659,7 +5659,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5670,7 +5670,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5714,7 +5714,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "damaged1";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5749,7 +5749,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5761,7 +5761,7 @@
dir = 8;
heat_capacity = 1e+006;
icon_state = "floorscorched2";
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5771,7 +5771,7 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5784,7 +5784,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -5792,7 +5792,7 @@
/obj/structure/chair/comfy/black,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"ob" = (
@@ -5806,7 +5806,7 @@
},
/turf/open/floor/iron{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -5818,7 +5818,7 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -5830,7 +5830,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"oz" = (
@@ -5838,7 +5838,7 @@
/obj/structure/alien/egg/burst,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"oJ" = (
@@ -5848,7 +5848,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"oT" = (
@@ -5886,7 +5886,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"qw" = (
@@ -5897,7 +5897,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"qD" = (
@@ -5907,7 +5907,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"qK" = (
@@ -5915,7 +5915,7 @@
/obj/effect/turf_decal/stripes/asteroid/line,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -5929,7 +5929,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"rk" = (
@@ -5943,7 +5943,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -5953,14 +5953,14 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"rD" = (
/obj/item/trash/candy,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"sb" = (
@@ -5970,7 +5970,7 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"si" = (
@@ -5978,7 +5978,7 @@
/mob/living/simple_animal/hostile/alien/sentinel,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"sy" = (
@@ -5988,7 +5988,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"sM" = (
@@ -5998,7 +5998,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"tb" = (
@@ -6006,7 +6006,7 @@
/obj/effect/decal/cleanable/blood,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"tK" = (
@@ -6019,7 +6019,7 @@
/obj/item/clothing/glasses/night,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"uf" = (
@@ -6033,14 +6033,14 @@
/obj/structure/alien/egg,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"uR" = (
/obj/structure/alien/weeds,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"vm" = (
@@ -6048,7 +6048,7 @@
/obj/structure/alien/resin/wall,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"vJ" = (
@@ -6058,7 +6058,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6073,7 +6073,7 @@
/obj/item/clothing/mask/facehugger/impregnated,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"vV" = (
@@ -6088,7 +6088,7 @@
"wq" = (
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"wx" = (
@@ -6097,7 +6097,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"wT" = (
@@ -6107,14 +6107,14 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"xI" = (
/obj/item/storage/bag/ore,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"yz" = (
@@ -6123,7 +6123,7 @@
/obj/structure/alien/resin/wall,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"zp" = (
@@ -6132,7 +6132,7 @@
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"zF" = (
@@ -6154,7 +6154,7 @@
/obj/effect/decal/cleanable/blood,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"BH" = (
@@ -6162,7 +6162,7 @@
/obj/structure/bed/nest,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"CY" = (
@@ -6170,7 +6170,7 @@
/obj/effect/decal/cleanable/blood/gibs,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"DF" = (
@@ -6187,7 +6187,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6225,7 +6225,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6243,7 +6243,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6256,7 +6256,7 @@
/obj/item/mining_scanner,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"Ku" = (
@@ -6264,7 +6264,7 @@
/mob/living/simple_animal/hostile/alien,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"KG" = (
@@ -6275,7 +6275,7 @@
/obj/item/gun/ballistic/automatic/pistol,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"Li" = (
@@ -6315,7 +6315,7 @@
/obj/item/clothing/head/helmet,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"OO" = (
@@ -6323,7 +6323,7 @@
/obj/structure/alien/resin/wall,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"Pn" = (
@@ -6348,14 +6348,14 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"PS" = (
/obj/structure/alien/weeds,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"Rm" = (
@@ -6369,14 +6369,14 @@
/obj/structure/alien/resin/wall,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"Sg" = (
/obj/machinery/light/small/directional/east,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"SE" = (
@@ -6390,7 +6390,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6406,7 +6406,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"Uq" = (
@@ -6414,14 +6414,14 @@
/obj/structure/alien/resin/wall,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"UY" = (
/obj/structure/alien/weeds/node,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"VE" = (
@@ -6432,7 +6432,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/arrivals)
@@ -6440,7 +6440,7 @@
/obj/structure/alien/weeds/node,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
"Wf" = (
@@ -6457,7 +6457,7 @@
/mob/living/simple_animal/hostile/alien,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"Yn" = (
@@ -6467,7 +6467,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6477,7 +6477,7 @@
/obj/effect/decal/cleanable/blood,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/hive)
"Zf" = (
@@ -6487,7 +6487,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251";
temperature = 251
},
/area/awaymission/moonoutpost19/main)
@@ -6514,14 +6514,14 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"Zz" = (
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/arrivals)
"ZZ" = (
@@ -6531,7 +6531,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
+ initial_gas = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"
},
/area/awaymission/moonoutpost19/main)
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 7b90f38797a..123f4959e96 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -2083,7 +2083,7 @@
/area/awaymission/snowdin/outside)
"gc" = (
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -2379,14 +2379,14 @@
"gU" = (
/obj/effect/decal/remains/human,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gV" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -2611,7 +2611,7 @@
"hF" = (
/obj/structure/destructible/cult/pylon,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -2873,7 +2873,7 @@
max_mobs = 5
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -2883,7 +2883,7 @@
name = "Caleb Reed"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -3594,7 +3594,7 @@
name = "Jacob Ullman"
},
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -6002,7 +6002,7 @@
"qg" = (
/obj/structure/flora/rock/pile/icy,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -7165,7 +7165,7 @@
/obj/structure/closet/crate/wooden,
/obj/effect/spawner/random/exotic/antag_gear_strong,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -7516,7 +7516,7 @@
/area/awaymission/snowdin/cave)
"xl" = (
/turf/open/floor/plating/elevatorshaft{
- initial_gas_mix = "o2=22;n2=82;TEMP=180"
+ initial_gas = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/cave)
"xn" = (
@@ -7688,7 +7688,7 @@
width = 6
},
/turf/open/floor/plating/elevatorshaft{
- initial_gas_mix = "o2=22;n2=82;TEMP=180"
+ initial_gas = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/cave)
"xL" = (
@@ -8481,7 +8481,7 @@
/area/awaymission/snowdin/outside)
"AD" = (
/turf/open/floor/plating{
- initial_gas_mix = "o2=22;n2=82;TEMP=180"
+ initial_gas = "o2=22;n2=82;TEMP=180"
},
/area/awaymission/snowdin/outside)
"AE" = (
@@ -9404,7 +9404,7 @@
state_open = 1
},
/turf/open/floor/mineral/plastitanium{
- initial_gas_mix = "o2=22;n2=82;TEMP=180";
+ initial_gas = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
},
@@ -9416,7 +9416,7 @@
/obj/effect/turf_decal/weather/snow,
/obj/machinery/suit_storage_unit/syndicate,
/turf/open/floor/mineral/plastitanium{
- initial_gas_mix = "o2=22;n2=82;TEMP=180";
+ initial_gas = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
},
@@ -9430,7 +9430,7 @@
state_open = 1
},
/turf/open/floor/mineral/plastitanium{
- initial_gas_mix = "o2=22;n2=82;TEMP=180";
+ initial_gas = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
},
@@ -11157,7 +11157,7 @@
/obj/structure/closet/crate/wooden,
/obj/effect/spawner/random/exotic/antag_gear,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -11452,7 +11452,7 @@
/obj/structure/closet/crate/wooden,
/obj/effect/spawner/random/exotic/antag_gear_weak,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
@@ -13465,7 +13465,7 @@
"XP" = (
/obj/effect/spawner/random/structure/crate_abandoned,
/turf/open/floor/engine/cult{
- initial_gas_mix = "n2=82;plasma=24;TEMP=120";
+ initial_gas = "n2=82;plasma=24;TEMP=120";
temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index ebf98cfda57..1f0f9c58969 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -29,7 +29,7 @@
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
@@ -827,7 +827,7 @@
/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -4187,7 +4187,7 @@
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11484,7 +11484,7 @@
/obj/structure/alien/resin/wall,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11492,7 +11492,7 @@
"zq" = (
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11522,7 +11522,7 @@
/obj/structure/bed/nest,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11531,7 +11531,7 @@
/obj/effect/decal/cleanable/blood/gibs/up,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11566,7 +11566,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11598,7 +11598,7 @@
/obj/effect/mob_spawn/corpse/human,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11618,7 +11618,7 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11629,7 +11629,7 @@
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11638,7 +11638,7 @@
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11656,7 +11656,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11702,7 +11702,7 @@
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11723,7 +11723,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
@@ -11787,7 +11787,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11798,7 +11798,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11816,7 +11816,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11825,7 +11825,7 @@
/obj/structure/alien/weeds,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11862,7 +11862,7 @@
/obj/structure/glowshroom/single,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11892,7 +11892,7 @@
/obj/effect/mob_spawn/corpse/human,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11932,7 +11932,7 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11941,7 +11941,7 @@
/obj/structure/closet/crate,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11958,7 +11958,7 @@
/obj/effect/mob_spawn/corpse/human,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11968,7 +11968,7 @@
/obj/effect/mob_spawn/corpse/human,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -11976,7 +11976,7 @@
"Lz" = (
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 351.9
},
@@ -11991,7 +11991,7 @@
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12014,7 +12014,7 @@
/obj/machinery/light/small/directional/east,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12023,7 +12023,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12032,7 +12032,7 @@
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12041,7 +12041,7 @@
/obj/machinery/light/small/directional/west,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12086,7 +12086,7 @@
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12095,7 +12095,7 @@
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12127,7 +12127,7 @@
/obj/effect/turf_decal/stripes/asteroid/line,
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
@@ -12191,7 +12191,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12226,7 +12226,7 @@
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12256,7 +12256,7 @@
/obj/machinery/light/small/directional/south,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12268,7 +12268,7 @@
},
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12284,7 +12284,7 @@
/obj/structure/alien/resin/membrane,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12301,7 +12301,7 @@
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12311,7 +12311,7 @@
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12323,7 +12323,7 @@
},
/turf/open/floor/plating{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
temperature = 363.9
},
/area/awaymission/undergroundoutpost45/caves)
@@ -12332,7 +12332,7 @@
/obj/structure/alien/weeds,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12353,7 +12353,7 @@
/obj/structure/glowshroom/single,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 351.9
},
@@ -12376,7 +12376,7 @@
/obj/structure/ore_box,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12407,7 +12407,7 @@
/obj/structure/glowshroom/single,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12418,7 +12418,7 @@
/obj/effect/mob_spawn/corpse/human,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12458,7 +12458,7 @@
/obj/machinery/light/small/directional/north,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
@@ -12468,7 +12468,7 @@
/obj/effect/decal/cleanable/blood/gibs/core,
/turf/open/misc/asteroid{
heat_capacity = 1e+006;
- initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
+ initial_gas = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9";
name = "Cave Floor";
temperature = 363.9
},
diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm
index 9a56772f448..ee8a08708c7 100644
--- a/_maps/RandomZLevels/wildwest.dmm
+++ b/_maps/RandomZLevels/wildwest.dmm
@@ -52,7 +52,7 @@
/area/awaymission/wildwest/vault)
"an" = (
/turf/open/floor/cult{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/wildwest/vault)
"ao" = (
@@ -131,7 +131,7 @@
"aL" = (
/obj/item/paper/fluff/awaymissions/wildwest/grinder,
/turf/open/floor/cult{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/wildwest/vault)
"aM" = (
@@ -143,7 +143,7 @@
"aO" = (
/obj/effect/mob_spawn/corpse/human/syndicatecommando,
/turf/open/floor/cult{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/awaymission/wildwest/vault)
"aP" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index ec58427dbd3..65c82e57c34 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -4066,7 +4066,7 @@
dir = 4
},
/turf/open/floor/plating{
- initial_gas_mix = "o2=0.01;n2=0.01;TEMP=2.7";
+ initial_gas = "o2=0.01;n2=0.01;TEMP=2.7";
luminosity = 2;
temperature = 2.7
},
@@ -4323,7 +4323,7 @@
dir = 4
},
/turf/open/floor/plating{
- initial_gas_mix = "o2=0.01;n2=0.01;TEMP=2.7";
+ initial_gas = "o2=0.01;n2=0.01;TEMP=2.7";
luminosity = 2;
temperature = 2.7
},
diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm
index 61c914cfd8e..d7d11e59677 100644
--- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm
+++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm
@@ -471,7 +471,7 @@
/area/medical/virology)
"bE" = (
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"bF" = (
@@ -1246,7 +1246,7 @@
dir = 9
},
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"dP" = (
@@ -2194,7 +2194,7 @@
"gv" = (
/obj/effect/turf_decal/weather/snow/corner,
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"gw" = (
@@ -4768,7 +4768,7 @@
/area/medical/virology)
"nB" = (
/turf/open/misc/dirt/dark{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"nC" = (
@@ -5720,7 +5720,7 @@
dir = 8
},
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"qq" = (
@@ -5776,7 +5776,7 @@
dir = 6
},
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"qy" = (
@@ -7268,7 +7268,7 @@
dir = 5
},
/turf/open/misc/dirt/dark{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"ux" = (
@@ -9524,7 +9524,7 @@
dir = 4
},
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"Bv" = (
@@ -9562,7 +9562,7 @@
"BA" = (
/obj/structure/closet/crate/grave,
/turf/open/misc/dirt/dark{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"BB" = (
@@ -13350,7 +13350,7 @@
dir = 10
},
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"LO" = (
@@ -14362,7 +14362,7 @@
"ON" = (
/obj/structure/closet/crate/grave,
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"OO" = (
@@ -17211,7 +17211,7 @@
pixel_y = 32
},
/turf/open/misc/dirt{
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
},
/area/icemoon/underground/explored)
"Wt" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 991d082eb75..25d0e048ad4 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -17790,7 +17790,7 @@
"ffP" = (
/obj/effect/spawner/random/structure/grille,
/turf/open/floor/plating/foam{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/space/nearstation)
"ffR" = (
@@ -31103,7 +31103,7 @@
"kiE" = (
/obj/item/book/manual/nuclear,
/turf/open/floor/plating/foam{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/space/nearstation)
"kiM" = (
@@ -51852,7 +51852,7 @@
/area/security/checkpoint/supply)
"rLv" = (
/turf/open/floor/plating/foam{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/space/nearstation)
"rLz" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 0684d3dc817..d1a641f467a 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -170,7 +170,7 @@
"aU" = (
/obj/structure/flora/tree/dead,
/turf/open/misc/asteroid/basalt/wasteland{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/centcom/holding)
"aV" = (
@@ -1540,7 +1540,7 @@
invisibility = 100
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
@@ -2031,7 +2031,7 @@
/area/centcom/briefing)
"hs" = (
/turf/open/misc/asteroid/basalt/wasteland{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/centcom/holding)
"ht" = (
@@ -2295,7 +2295,7 @@
/area/tdome/administration)
"ik" = (
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
@@ -4403,7 +4403,7 @@
pixel_y = 4
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"pi" = (
@@ -4667,7 +4667,7 @@
/area/tdome/administration)
"qe" = (
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"qf" = (
@@ -7395,7 +7395,7 @@
"zi" = (
/obj/item/rupee,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
@@ -7750,7 +7750,7 @@
pixel_y = -4
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"Am" = (
@@ -9226,7 +9226,7 @@
dir = 8
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"Hj" = (
@@ -9679,7 +9679,7 @@
/obj/item/flashlight/lantern,
/turf/open/misc/ironsand{
color = "#525252";
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/centcom/holding)
"Kd" = (
@@ -9843,7 +9843,7 @@
pixel_y = -3
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"KU" = (
@@ -10536,7 +10536,7 @@
"NS" = (
/turf/open/misc/ironsand{
color = "#525252";
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/centcom/holding)
"NU" = (
@@ -10795,7 +10795,7 @@
"OC" = (
/obj/structure/flora/rock/pile,
/turf/open/misc/asteroid/basalt/wasteland{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/centcom/holding)
"OD" = (
@@ -11022,7 +11022,7 @@
pixel_y = -4
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"Pq" = (
@@ -11647,7 +11647,7 @@
/area/centcom/evacuation)
"Rt" = (
/turf/open/water{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"Ru" = (
@@ -12585,7 +12585,7 @@
pixel_y = 4
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
+ initial_gas = "o2=22;n2=82;TEMP=293.15"
},
/area/centcom/holding)
"UM" = (
@@ -12696,7 +12696,7 @@
/obj/structure/flora/rock/pile,
/turf/open/misc/ironsand{
color = "#525252";
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/centcom/holding)
"Vg" = (
@@ -14020,7 +14020,7 @@
"ZE" = (
/obj/effect/landmark/error,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
diff --git a/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_3.dmm b/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_3.dmm
index 58060d7c320..79b829540f0 100644
--- a/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_3.dmm
+++ b/_maps/map_files/tramstation/modular_pieces/maintenance_miningsolar_3.dmm
@@ -35,7 +35,7 @@
"z" = (
/obj/structure/mecha_wreckage/ripley,
/turf/open/floor/iron/recharge_floor/asteroid{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/mine/explored)
"B" = (
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index 9d1d6a721f8..8cc0f305110 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -79,7 +79,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"ct" = (
@@ -98,7 +98,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"cX" = (
@@ -108,7 +108,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"ec" = (
@@ -170,7 +170,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"gw" = (
@@ -182,7 +182,7 @@
/obj/effect/decal/cleanable/blood,
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"gH" = (
@@ -207,7 +207,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/showroomfloor{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"kv" = (
@@ -282,7 +282,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"mZ" = (
@@ -300,7 +300,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"od" = (
@@ -355,7 +355,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"qp" = (
@@ -366,7 +366,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"qM" = (
@@ -504,7 +504,7 @@
specialfunctions = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"zd" = (
@@ -596,7 +596,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"DQ" = (
@@ -625,7 +625,7 @@
},
/mob/living/simple_animal/hostile/syndicate/melee/sword/space/stormtrooper,
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"EQ" = (
@@ -640,7 +640,7 @@
},
/mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"EW" = (
@@ -657,7 +657,7 @@
dir = 4
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"Fv" = (
@@ -727,7 +727,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"Ko" = (
@@ -739,7 +739,7 @@
dir = 4
},
/turf/open/floor/iron{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"KC" = (
@@ -817,7 +817,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"Ov" = (
@@ -839,7 +839,7 @@
dir = 8
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "TEMP=2.7"
+ initial_gas = "TEMP=2.7"
},
/area/shuttle/caravan/freighter1)
"OK" = (
diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index 260ca72400d..90095876f35 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -34,7 +34,7 @@
},
/obj/machinery/computer/med_data/syndie,
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=100;TEMP=80";
+ initial_gas = "n2=100;TEMP=80";
temperature = 80
},
/area/shuttle/sbc_starfury)
@@ -158,7 +158,7 @@
dir = 4
},
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=100;TEMP=80";
+ initial_gas = "n2=100;TEMP=80";
temperature = 80
},
/area/shuttle/sbc_starfury)
@@ -2054,7 +2054,7 @@
},
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark{
- initial_gas_mix = "n2=100;TEMP=80";
+ initial_gas = "n2=100;TEMP=80";
temperature = 80
},
/area/shuttle/sbc_starfury)
diff --git a/_maps/templates/heretic_sacrifice_template.dmm b/_maps/templates/heretic_sacrifice_template.dmm
index 5c58d7d3aa6..c11ea116bc0 100644
--- a/_maps/templates/heretic_sacrifice_template.dmm
+++ b/_maps/templates/heretic_sacrifice_template.dmm
@@ -25,7 +25,7 @@
"dX" = (
/obj/effect/decal/cleanable/oil,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -63,7 +63,7 @@
"lz" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -106,7 +106,7 @@
dir = 10
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -141,7 +141,7 @@
},
/obj/effect/decal/cleanable/oil,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -153,7 +153,7 @@
"qu" = (
/obj/effect/turf_decal/weather/dirt,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -165,7 +165,7 @@
dir = 5
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -178,7 +178,7 @@
"sb" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -188,7 +188,7 @@
dir = 9
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -220,7 +220,7 @@
dir = 4
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -262,7 +262,7 @@
/obj/structure/stone_tile/slab,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -294,7 +294,7 @@
/area/heretic_sacrifice/rust)
"Bw" = (
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -351,7 +351,7 @@
dir = 1
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -378,7 +378,7 @@
},
/obj/effect/decal/cleanable/blood/old,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -388,7 +388,7 @@
dir = 5
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -402,7 +402,7 @@
dir = 1
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -440,7 +440,7 @@
"KP" = (
/obj/structure/stone_tile/surrounding_tile,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -476,7 +476,7 @@
"NA" = (
/obj/structure/stone_tile/burnt,
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -486,7 +486,7 @@
dir = 1
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -503,7 +503,7 @@
dir = 10
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
@@ -513,7 +513,7 @@
dir = 6
},
/turf/open/misc/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ initial_gas = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0;
slowdown = 0
},
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index d678d9885f5..f3b847cab8f 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -66,6 +66,10 @@ SUBSYSTEM_DEF(zas)
priority = FIRE_PRIORITY_AIR
init_order = INIT_ORDER_AIR
flags = SS_POST_FIRE_TIMING
+ runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+ wait = 0.5 SECONDS
+
+ var/cached_cost = 0
//The variable setting controller
var/datum/zas_controller/settings
@@ -101,17 +105,8 @@ SUBSYSTEM_DEF(zas)
var/tmp/list/processing_zones
//Currently processing
- var/list/curr_tiles
- var/list/curr_defer
- var/list/curr_edges
- var/list/curr_fire
- var/list/curr_hotspot
- var/list/curr_zones
- var/list/curr_machines
- var/list/curr_atoms
-
-
- var/current_process = SSZAS_TILES
+ var/list/currentrun = list()
+ var/current_process = SSZAS_PIPENETS
var/active_zones = 0
var/next_id = 1
@@ -189,64 +184,270 @@ SUBSYSTEM_DEF(zas)
..(timeofday)
/datum/controller/subsystem/zas/fire(resumed = FALSE)
+ var/timer = TICK_USAGE_REAL
if (!resumed)
processing_edges = active_edges.Copy()
processing_fires = active_fire_zones.Copy()
processing_hotspots = active_hotspots.Copy()
+ // Every time we fire, we want to make sure pipenets are rebuilt. The game state could have changed between each fire() proc call
+ // and anything missing a pipenet can lead to unintended behaviour at worse and various runtimes at best.
+ if(length(rebuild_queue) || length(expansion_queue))
+ timer = TICK_USAGE_REAL
+ process_rebuilds()
+ //This does mean that the apperent rebuild costs fluctuate very quickly, this is just the cost of having them always process, no matter what
+ if(state != SS_RUNNING)
+ return
+
+ if(current_process == SSZAS_PIPENETS || !resumed)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_pipenets(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_MACHINES
- curr_machines = atmos_machinery
if(current_process == SSZAS_MACHINES)
- while (curr_machines.len)
- var/obj/machinery/atmospherics/current_machine = curr_machines[curr_machines.len]
- curr_machines.len--
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_atmos_machinery(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_TILES
+
+ if(current_process == SSZAS_TILES)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_tiles(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_DEFERED_TILES
+
+ if(current_process == SSZAS_DEFERED_TILES)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_deferred_tiles(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_EDGES
- if(!current_machine)
- atmos_machinery -= current_machine
- if(current_machine.process_atmos() == PROCESS_KILL)
- stop_processing_machine(current_machine)
+ if(current_process == SSZAS_EDGES)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_edges(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_FIRES
- if(MC_TICK_CHECK)
- return
+ if(current_process == SSZAS_FIRES)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_fires(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_HOTSPOTS
- current_process = SSZAS_TILES
- curr_tiles = tiles_to_update
- if(current_process == SSZAS_TILES || !resumed)
- while (curr_tiles.len)
- var/turf/T = curr_tiles[curr_tiles.len]
- curr_tiles.len--
+ if(current_process == SSZAS_HOTSPOTS)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_hotspots(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_ZONES
- if (!T)
- if (MC_TICK_CHECK)
- return
+ if(current_process == SSZAS_ZONES)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_zones(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+ current_process = SSZAS_ATOMS
+
+ if(current_process == SSZAS_ATOMS)
+ timer = TICK_USAGE_REAL
+ if(!resumed)
+ cached_cost = 0
+ process_atoms(resumed)
+ cached_cost += TICK_USAGE_REAL - timer
+ if(state != SS_RUNNING)
+ return
+ //cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(cached_cost))
+ resumed = FALSE
+
+
+ current_process = SSZAS_PIPENETS
+
+/datum/controller/subsystem/zas/proc/process_rebuilds()
+ //Yes this does mean rebuilding pipenets can freeze up the subsystem forever, but if we're in that situation something else is very wrong
+ var/list/currentrun = rebuild_queue
+ while(currentrun.len || length(expansion_queue))
+ while(currentrun.len && !length(expansion_queue)) //If we found anything, process that first
+ var/obj/machinery/atmospherics/remake = currentrun[currentrun.len]
+ currentrun.len--
+ if (!remake)
continue
+ remake.rebuild_pipes()
+ if (MC_TICK_CHECK)
+ return
- //check if the turf is self-zone-blocked
- var/c_airblock
- ATMOS_CANPASS_TURF(c_airblock, T, T)
- if(c_airblock & ZONE_BLOCKED)
- deferred += T
- if (MC_TICK_CHECK)
- return
+ var/list/queue = expansion_queue
+ while(queue.len)
+ var/list/pack = queue[queue.len]
+ //We operate directly with the pipeline like this because we can trust any rebuilds to remake it properly
+ var/datum/pipeline/linepipe = pack[SSAIR_REBUILD_PIPELINE]
+ var/list/border = pack[SSAIR_REBUILD_QUEUE]
+ expand_pipeline(linepipe, border)
+ if(state != SS_RUNNING) //expand_pipeline can fail a tick check, we shouldn't let things get too fucky here
+ return
+
+ linepipe.building = FALSE
+ queue.len--
+ if (MC_TICK_CHECK)
+ return
+
+///Rebuilds a pipeline by expanding outwards, while yielding when sane
+/datum/controller/subsystem/zas/proc/expand_pipeline(datum/pipeline/net, list/border)
+ while(border.len)
+ var/obj/machinery/atmospherics/borderline = border[border.len]
+ border.len--
+
+ var/list/result = borderline.pipeline_expansion(net)
+ if(!length(result))
+ continue
+ for(var/obj/machinery/atmospherics/considered_device in result)
+ if(!istype(considered_device, /obj/machinery/atmospherics/pipe))
+ considered_device.set_pipenet(net, borderline)
+ net.add_machinery_member(considered_device)
continue
+ var/obj/machinery/atmospherics/pipe/item = considered_device
+ if(net.members.Find(item))
+ continue
+ if(item.parent)
+ var/static/pipenetwarnings = 10
+ if(pipenetwarnings > 0)
+ log_mapping("build_pipeline(): [item.type] added to a pipenet while still having one. (pipes leading to the same spot stacking in one turf) around [AREACOORD(item)].")
+ pipenetwarnings--
+ if(pipenetwarnings == 0)
+ log_mapping("build_pipeline(): further messages about pipenets will be suppressed")
- T.update_air_properties()
- T.post_update_air_properties()
- T.needs_air_update = 0
- #ifdef ZASDBG
- T.overlays -= mark
- //updated++
- #endif
+ net.members += item
+ border += item
+
+ net.air.volume += item.volume
+ item.parent = net
+
+ if(item.air_temporary)
+ net.air.merge(item.air_temporary)
+ item.air_temporary = null
+
+ if (MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/zas/proc/process_pipenets(resumed = FALSE)
+ if (!resumed)
+ src.currentrun = networks.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/datum/thing = currentrun[currentrun.len]
+ currentrun.len--
+ if(thing)
+ thing.process()
+ else
+ networks.Remove(thing)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/zas/proc/process_atmos_machinery(resumed = FALSE)
+ if (!resumed)
+ src.currentrun = atmos_machinery.Copy()
+ //cache for sanic speed (lists are references anyways)
+ var/list/currentrun = src.currentrun
+ while(currentrun.len)
+ var/obj/machinery/M = currentrun[currentrun.len]
+ currentrun.len--
+ if(!M)
+ atmos_machinery -= M
+ if(M.process_atmos() == PROCESS_KILL)
+ stop_processing_machine(M)
+ if(MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/zas/proc/process_tiles(resumed = FALSE)
+ if(!resumed)
+ src.currentrun = tiles_to_update.Copy()
+
+ var/list/currentrun = src.currentrun
+ while (currentrun.len)
+ var/turf/T = currentrun[currentrun.len]
+ currentrun.len--
+
+ if (!T)
+ if (MC_TICK_CHECK)
+ return
+ continue
+ //check if the turf is self-zone-blocked
+ var/c_airblock
+ ATMOS_CANPASS_TURF(c_airblock, T, T)
+ if(c_airblock & ZONE_BLOCKED)
+ deferred += T
if (MC_TICK_CHECK)
return
+ continue
+
+ T.update_air_properties()
+ T.post_update_air_properties()
+ T.needs_air_update = 0
+ #ifdef ZASDBG
+ T.overlays -= mark
+ //updated++
+ #endif
+
+ if (MC_TICK_CHECK)
+ return
+
+/datum/controller/subsystem/zas/proc/process_deferred_tiles(resumed)
+ if(!resumed)
+ src.currentrun = deferred.Copy()
+ var/list/currentrun = src.currentrun
- current_process = SSZAS_DEFERED_TILES
- curr_defer = deferred
if(current_process == SSZAS_DEFERED_TILES)
- while (curr_defer.len)
- var/turf/T = curr_defer[curr_defer.len]
- curr_defer.len--
+ while (currentrun.len)
+ var/turf/T = currentrun[currentrun.len]
+ currentrun.len--
T.update_air_properties()
T.post_update_air_properties()
@@ -259,12 +460,15 @@ SUBSYSTEM_DEF(zas)
if (MC_TICK_CHECK)
return
- current_process = SSZAS_EDGES
- curr_edges = processing_edges
+/datum/controller/subsystem/zas/proc/process_edges(resumed)
+ if(!resumed)
+ src.currentrun = active_edges.Copy()
+ var/list/currentrun = src.currentrun
+
if(current_process == SSZAS_EDGES)
- while (curr_edges.len)
- var/connection_edge/edge = curr_edges[curr_edges.len]
- curr_edges.len--
+ while (currentrun.len)
+ var/connection_edge/edge = currentrun[currentrun.len]
+ currentrun.len--
if (!edge)
if (MC_TICK_CHECK)
@@ -275,36 +479,45 @@ SUBSYSTEM_DEF(zas)
if (MC_TICK_CHECK)
return
- current_process = SSZAS_FIRES
- curr_fire = processing_fires
+/datum/controller/subsystem/zas/proc/process_fires(resumed)
+ if(!resumed)
+ src.currentrun = active_fire_zones.Copy()
+ var/list/currentrun = src.currentrun
+
if(current_process == SSZAS_FIRES)
- while (curr_fire.len)
- var/zone/Z = curr_fire[curr_fire.len]
- curr_fire.len--
+ while (currentrun.len)
+ var/zone/Z = currentrun[currentrun.len]
+ currentrun.len--
Z.process_fire()
if (MC_TICK_CHECK)
return
- current_process = SSZAS_HOTSPOTS
- curr_hotspot = processing_hotspots
+/datum/controller/subsystem/zas/proc/process_hotspots(resumed)
+ if(!resumed)
+ src.currentrun = active_hotspots.Copy()
+ var/list/currentrun = src.currentrun
+
if(current_process == SSZAS_HOTSPOTS)
- while (curr_hotspot.len)
- var/obj/effect/hotspot/F = curr_hotspot[curr_hotspot.len]
- curr_hotspot.len--
+ while (currentrun.len)
+ var/obj/effect/hotspot/F = currentrun[currentrun.len]
+ currentrun.len--
F.process()
if (MC_TICK_CHECK)
return
- current_process = SSZAS_ZONES
- curr_zones = processing_zones
+/datum/controller/subsystem/zas/proc/process_zones(resumed)
+ if(!resumed)
+ src.currentrun = zones_to_update.Copy()
+ var/list/currentrun = src.currentrun
+
if(current_process == SSZAS_ZONES)
- while (curr_zones.len)
- var/zone/Z = curr_zones[curr_zones.len]
- curr_zones.len--
+ while (currentrun.len)
+ var/zone/Z = currentrun[currentrun.len]
+ currentrun.len--
Z.tick()
Z.needs_update = FALSE
@@ -312,20 +525,22 @@ SUBSYSTEM_DEF(zas)
if (MC_TICK_CHECK)
return
- current_process = SSZAS_ATOMS
- curr_atoms = atom_process
+/datum/controller/subsystem/zas/proc/process_atoms(resumed)
+ if(!resumed)
+ src.currentrun = atom_process.Copy()
+
+ var/list/currentrun = src.currentrun
+
if(current_process == SSZAS_ATOMS)
- while(curr_atoms.len)
- var/atom/talk_to = curr_atoms[curr_atoms.len]
- curr_atoms.len--
+ while(currentrun.len)
+ var/atom/talk_to = currentrun[currentrun.len]
+ currentrun.len--
if(!talk_to)
return
talk_to.process_exposure()
if(MC_TICK_CHECK)
return
- current_process = SSZAS_MACHINES
-
/**
* Adds a given machine to the processing system for SSAIR_ATMOSMACHINERY processing.
*
@@ -357,7 +572,7 @@ SUBSYSTEM_DEF(zas)
// the currentrun list, which is a cache of atmos_machinery. Remove it from that list
// as well to prevent processing qdeleted objects in the cache.
if(current_process == SSZAS_MACHINES)
- curr_machines -= machine
+ currentrun -= machine
/datum/controller/subsystem/zas/proc/add_to_rebuild_queue(obj/machinery/atmospherics/atmos_machine)
if(istype(atmos_machine, /obj/machinery/atmospherics) && !atmos_machine.rebuilding)
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 001b8ff266d..a300002430b 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -10,7 +10,7 @@
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
baseturfs = /turf/open/misc/asteroid/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
opacity = TRUE
density = TRUE
layer = EDGED_TURF_LAYER
@@ -224,7 +224,7 @@
/turf/closed/mineral/random/high_chance/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = TRUE
mineralSpawnChanceList = list(
/obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45,
@@ -249,7 +249,7 @@
/turf/closed/mineral/random/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = TRUE
mineralChance = 10
@@ -269,7 +269,7 @@
defer_change = TRUE
turf_type = /turf/open/misc/asteroid/snow/icemoon
baseturfs = /turf/open/misc/asteroid/snow/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
weak_turf = TRUE
/turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0)
@@ -311,7 +311,7 @@
/turf/closed/mineral/random/labormineral/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = TRUE
mineralSpawnChanceList = list(
/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 8, /obj/item/stack/ore/titanium = 8,
@@ -330,7 +330,7 @@
defer_change = TRUE
turf_type = /turf/open/misc/asteroid/snow/icemoon
baseturfs = /turf/open/misc/asteroid/snow/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
defer_change = TRUE
mineralSpawnChanceList = list(
/obj/item/stack/ore/uranium = 3, /obj/item/stack/ore/diamond = 1, /obj/item/stack/ore/gold = 8, /obj/item/stack/ore/titanium = 8,
@@ -385,7 +385,7 @@
/turf/closed/mineral/gold/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = TRUE
/turf/closed/mineral/silver
@@ -395,7 +395,7 @@
/turf/closed/mineral/silver/ice/icemoon
turf_type = /turf/open/misc/asteroid/snow/ice/icemoon
baseturfs = /turf/open/misc/asteroid/snow/ice/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/closed/mineral/titanium
mineralType = /obj/item/stack/ore/titanium
@@ -428,13 +428,13 @@
/turf/closed/mineral/bscrystal/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = TRUE
/turf/closed/mineral/volcanic
turf_type = /turf/open/misc/asteroid/basalt
baseturfs = /turf/open/misc/asteroid/basalt
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
/turf/closed/mineral/volcanic/lava_land_surface
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
@@ -450,7 +450,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS)
baseturfs = /turf/open/misc/ashplanet/wateryrock
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
turf_type = /turf/open/misc/ashplanet/rocky
defer_change = TRUE
@@ -470,7 +470,7 @@
/turf/closed/mineral/snowmountain/icemoon
turf_type = /turf/open/misc/asteroid/snow/icemoon
baseturfs = /turf/open/misc/asteroid/snow/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/closed/mineral/snowmountain/cavern
name = "ice cavern rock"
@@ -485,7 +485,7 @@
/turf/closed/mineral/snowmountain/cavern/icemoon
baseturfs = /turf/open/misc/asteroid/snow/ice/icemoon
turf_type = /turf/open/misc/asteroid/snow/ice/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
//yoo RED ROCK RED ROCK
@@ -606,7 +606,7 @@
/turf/closed/mineral/gibtonite/volcanic
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = TRUE
/turf/closed/mineral/gibtonite/ice
@@ -622,14 +622,14 @@
/turf/closed/mineral/gibtonite/ice/icemoon
turf_type = /turf/open/misc/asteroid/snow/ice/icemoon
baseturfs = /turf/open/misc/asteroid/snow/ice/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/closed/mineral/strong
name = "Very strong rock"
desc = "Seems to be stronger than the other rocks in the area. Only a master of mining techniques could destroy this."
turf_type = /turf/open/misc/asteroid/basalt/lava_land_surface
baseturfs = /turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
defer_change = 1
smooth_icon = 'icons/turf/walls/rock_wall.dmi'
base_icon_state = "rock_wall"
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 5f12102a624..3a7e3da9931 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -1,7 +1,7 @@
/turf/open
plane = FLOOR_PLANE
var/slowdown = 0 //negative for faster, positive for slower
-
+ initial_gas = OPENTURF_DEFAULT_ATMOS
var/footstep = null
var/barefootstep = null
var/clawfootstep = null
@@ -97,7 +97,7 @@
icon = 'icons/turf/floors.dmi'
icon_state = "necro1"
baseturfs = /turf/open/indestructible/necropolis
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
footstep = FOOTSTEP_LAVA
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
@@ -110,7 +110,7 @@
icon_state = "necro[rand(2,3)]"
/turf/open/indestructible/necropolis/air
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
/turf/open/indestructible/boss //you put stone tiles on this and use it as a base
name = "necropolis floor"
@@ -118,15 +118,15 @@
icon_state = "boss"
baseturfs = /turf/open/indestructible/boss
planetary_atmos = TRUE
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
/turf/open/indestructible/boss/air
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
/turf/open/indestructible/hierophant
icon = 'icons/turf/floors/hierophant_floor.dmi'
planetary_atmos = TRUE
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
baseturfs = /turf/open/indestructible/hierophant
smoothing_flags = SMOOTH_CORNERS
tiled_dirt = FALSE
diff --git a/code/game/turfs/open/ashplanet.dm b/code/game/turfs/open/ashplanet.dm
index 920728f1cf9..a83fd860e3f 100644
--- a/code/game/turfs/open/ashplanet.dm
+++ b/code/game/turfs/open/ashplanet.dm
@@ -7,7 +7,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
desc = "The ground is covered in volcanic ash."
baseturfs = /turf/open/misc/ashplanet/wateryrock //I assume this will be a chasm eventually, once this becomes an actual surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
footstep = FOOTSTEP_SAND
diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm
index 0b5cff08629..054f171f03c 100644
--- a/code/game/turfs/open/asteroid.dm
+++ b/code/game/turfs/open/asteroid.dm
@@ -119,7 +119,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
baseturfs = /turf/open/lava/smooth
/turf/open/misc/asteroid/basalt/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/misc/asteroid/basalt/Initialize(mapload)
. = ..()
@@ -135,17 +135,17 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
/turf/open/misc/asteroid/basalt/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/lava/smooth/lava_land_surface
/turf/open/misc/asteroid/lowpressure
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
baseturfs = /turf/open/misc/asteroid/lowpressure
turf_type = /turf/open/misc/asteroid/lowpressure
/turf/open/misc/asteroid/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
baseturfs = /turf/open/misc/asteroid/airless
turf_type = /turf/open/misc/asteroid/airless
@@ -178,11 +178,11 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
/turf/open/misc/asteroid/snow/icemoon
baseturfs = /turf/open/openspace/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
slowdown = 0
/turf/open/lava/plasma/ice_moon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
baseturfs = /turf/open/lava/plasma/ice_moon
planetary_atmos = TRUE
@@ -190,7 +190,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
name = "icy snow"
desc = "Looks colder."
baseturfs = /turf/open/misc/asteroid/snow/ice
- initial_gas_mix = "n2=82;plasma=24;TEMP=120"
+ initial_gas = "n2=82;plasma=24;TEMP=120"
floor_variance = 0
icon_state = "snow-ice"
base_icon_state = "snow-ice"
@@ -204,7 +204,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
/turf/open/misc/asteroid/snow/ice/icemoon
baseturfs = /turf/open/misc/asteroid/snow/ice/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
planetary_atmos = TRUE
slowdown = 0
@@ -212,10 +212,10 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
return FALSE
/turf/open/misc/asteroid/snow/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/misc/asteroid/snow/temperatre
- initial_gas_mix = "o2=22;n2=82;TEMP=255.37"
+ initial_gas = "o2=22;n2=82;TEMP=255.37"
//Used in SnowCabin.dm
/turf/open/misc/asteroid/snow/snow_cabin
@@ -226,5 +226,5 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
planetary_atmos = FALSE
/turf/open/misc/asteroid/snow/standard_air
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
planetary_atmos = FALSE
diff --git a/code/game/turfs/open/basalt.dm b/code/game/turfs/open/basalt.dm
index ce1b547fdcc..fd4f2f327cf 100644
--- a/code/game/turfs/open/basalt.dm
+++ b/code/game/turfs/open/basalt.dm
@@ -4,7 +4,7 @@
desc = "Rough volcanic floor that can be dug up for basalt."
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
/turf/open/misc/basalt/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm
index 7fbc2a0e82d..693a5965a68 100644
--- a/code/game/turfs/open/chasm.dm
+++ b/code/game/turfs/open/chasm.dm
@@ -77,7 +77,7 @@
// Chasms for Lavaland, with planetary atmos and lava glow
/turf/open/chasm/lavaland
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/chasm/lavaland
light_range = 1.9 //slightly less range than lava
@@ -89,7 +89,7 @@
icon = 'icons/turf/floors/icechasms.dmi'
icon_state = "icechasms-255"
base_icon_state = "icechasms"
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/chasm/icemoon
light_range = 1.9
@@ -101,7 +101,7 @@
icon = 'icons/turf/floors/junglechasm.dmi'
icon_state = "junglechasm-255"
base_icon_state = "junglechasm"
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
planetary_atmos = TRUE
baseturfs = /turf/open/chasm/jungle
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 9757cceb226..b0f342ff46d 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -72,7 +72,7 @@
temperature = 180
/turf/open/floor/wood/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/wood/tile
icon_state = "wood_tile"
@@ -353,34 +353,34 @@
//*****Airless versions of all of the above.*****
/turf/open/floor/carpet/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/black/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/blue/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/cyan/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/green/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/orange/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/purple/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/red/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/royalblack/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/royalblue/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/narsie_act(force, ignore_mobs, probability = 20)
. = (prob(probability) || force)
@@ -670,91 +670,91 @@
canSmoothWith = list(SMOOTH_GROUP_CARPET_SIMPLE_NEON_PINK_NODOTS)
/turf/open/floor/carpet/neon/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/white/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/black/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/red/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/orange/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/yellow/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/lime/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/green/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/teal/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/cyan/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/blue/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/purple/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/violet/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/pink/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/white/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/black/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/red/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/orange/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/yellow/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/lime/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/green/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/teal/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/cyan/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/blue/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/purple/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/violet/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/carpet/neon/simple/pink/nodots/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/fakepit
desc = "A clever illusion designed to look like a bottomless pit."
diff --git a/code/game/turfs/open/floor/hull.dm b/code/game/turfs/open/floor/hull.dm
index de34e3a2d7f..c65e96f6ad6 100644
--- a/code/game/turfs/open/floor/hull.dm
+++ b/code/game/turfs/open/floor/hull.dm
@@ -3,7 +3,7 @@
name = "exterior hull plating"
desc = "Sturdy exterior hull plating that separates you from the uncaring vacuum of space."
icon_state = "regular_hull"
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
temperature = TCMB
/turf/open/floor/engine/hull/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) //no rcd destroying this flooring
diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm
index af4f1fa0772..af92db181a7 100644
--- a/code/game/turfs/open/floor/iron_floor.dm
+++ b/code/game/turfs/open/floor/iron_floor.dm
@@ -27,14 +27,14 @@
/turf/open/floor/iron/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
/turf/open/floor/iron/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
temperature = 80
/turf/open/floor/iron/edge
icon_state = "floor_edge"
@@ -147,19 +147,19 @@
floor_tile = /obj/item/stack/tile/iron/dark/textured_large
/turf/open/floor/iron/dark/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/dark/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
/turf/open/floor/iron/dark/side/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/dark/corner/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/checker/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/white
icon_state = "white"
@@ -227,19 +227,19 @@
floor_tile = /obj/item/stack/tile/iron/white/textured_large
/turf/open/floor/iron/white/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/white/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
/turf/open/floor/iron/white/side/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/white/corner/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/cafeteria/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/recharge_floor
icon_state = "recharge_floor"
@@ -286,7 +286,7 @@
floor_tile = /obj/item/stack/tile/iron/showroomfloor
/turf/open/floor/iron/showroomfloor/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/solarpanel
icon_state = "solarpanel"
@@ -294,7 +294,7 @@
floor_tile = /obj/item/stack/tile/iron/solarpanel
/turf/open/floor/iron/solarpanel/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/freezer
@@ -303,7 +303,7 @@
floor_tile = /obj/item/stack/tile/iron/freezer
/turf/open/floor/iron/freezer/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/iron/kitchen_coldroom
name = "cold room floor"
diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
index d816680006f..8157fce2dc2 100644
--- a/code/game/turfs/open/floor/mineral_floor.dm
+++ b/code/game/turfs/open/floor/mineral_floor.dm
@@ -77,35 +77,35 @@
return // titanium does not rust
/turf/open/floor/mineral/titanium/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/yellow
icon_state = "titanium_yellow"
floor_tile = /obj/item/stack/tile/mineral/titanium/yellow
/turf/open/floor/mineral/titanium/yellow/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/blue
icon_state = "titanium_blue"
floor_tile = /obj/item/stack/tile/mineral/titanium/blue
/turf/open/floor/mineral/titanium/blue/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/white
icon_state = "titanium_white"
floor_tile = /obj/item/stack/tile/mineral/titanium/white
/turf/open/floor/mineral/titanium/white/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/purple
icon_state = "titanium_purple"
floor_tile = /obj/item/stack/tile/mineral/titanium/purple
/turf/open/floor/mineral/titanium/purple/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
// OLD TITANIUM (titanium floor tiles before PR #50454)
/turf/open/floor/mineral/titanium/tiled
@@ -117,35 +117,35 @@
return list("titanium_dam1_old","titanium_dam2_old","titanium_dam3_old","titanium_dam4_old","titanium_dam5_old")
/turf/open/floor/mineral/titanium/tiled/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/tiled/yellow
icon_state = "titanium_tiled_yellow"
floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/yellow
/turf/open/floor/mineral/titanium/tiled/yellow/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/tiled/blue
icon_state = "titanium_tiled_blue"
floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/blue
/turf/open/floor/mineral/titanium/tiled/blue/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/tiled/white
icon_state = "titanium_tiled_white"
floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/white
/turf/open/floor/mineral/titanium/tiled/white/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/titanium/tiled/purple
icon_state = "titanium_tiled_purple"
floor_tile = /obj/item/stack/tile/mineral/titanium/tiled/purple
/turf/open/floor/mineral/titanium/tiled/purple/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
//PLASTITANIUM (syndieshuttle)
/turf/open/floor/mineral/plastitanium
@@ -161,14 +161,14 @@
return // plastitanium does not rust
/turf/open/floor/mineral/plastitanium/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/mineral/plastitanium/red
icon_state = "plastitanium_red"
floor_tile = /obj/item/stack/tile/mineral/plastitanium/red
/turf/open/floor/mineral/plastitanium/red/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
//Used in SnowCabin.dm
/turf/open/floor/mineral/plastitanium/red/snow_cabin
@@ -221,7 +221,7 @@
sound_cooldown = world.time + 10
/turf/open/floor/mineral/bananium/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
//DIAMOND
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index d92d26dd145..3879144366b 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -34,10 +34,10 @@
on = FALSE
/turf/open/floor/circuit/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/circuit/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
/turf/open/floor/circuit/telecomms/mainframe
@@ -62,10 +62,10 @@
floor_tile = /obj/item/stack/tile/circuit/green/anim
/turf/open/floor/circuit/green/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/circuit/green/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
/turf/open/floor/circuit/green/telecomms/mainframe
@@ -87,10 +87,10 @@
floor_tile = /obj/item/stack/tile/circuit/red/anim
/turf/open/floor/circuit/red/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/circuit/red/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
/turf/open/floor/pod
@@ -157,11 +157,11 @@
/turf/open/floor/bronze/filled/lavaland
planetary_atmos = TRUE
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
/turf/open/floor/bronze/filled/icemoon
planetary_atmos = TRUE
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/open/floor/white
name = "white floor"
@@ -216,7 +216,7 @@
AddElement(/datum/element/rust)
/turf/open/floor/plating/plasma
- initial_gas_mix = ATMOSTANK_PLASMA
+ initial_gas = ATMOSTANK_PLASMA
/turf/open/floor/plating/plasma/rust/Initialize(mapload)
. = ..()
@@ -266,4 +266,4 @@
return
/turf/open/floor/cult/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index e3e2ba87426..c0b6e9cb9d6 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -1,14 +1,14 @@
/turf/open/floor/plating/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/plating/lowpressure
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
baseturfs = /turf/open/floor/plating/lowpressure
/turf/open/floor/plating/icemoon
icon_state = "plating"
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/open/floor/plating/abductor
name = "alien floor"
@@ -54,10 +54,10 @@
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/open/floor/plating/snowed/cavern
- initial_gas_mix = "n2=82;plasma=24;TEMP=120"
+ initial_gas = "n2=82;plasma=24;TEMP=120"
/turf/open/floor/plating/snowed/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/open/floor/plating/snowed/smoothed
icon = 'icons/turf/floors/snow_turf.dmi'
@@ -76,12 +76,12 @@
temperature = 180
/turf/open/floor/plating/snowed/smoothed/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/open/floor/plating/lavaland_atmos
planetary_atmos = TRUE
baseturfs = /turf/open/lava/smooth/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
/turf/open/floor/plating/elevatorshaft
name = "elevator shaft"
diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm
index 4b08509ec6c..0b9c2394b3c 100644
--- a/code/game/turfs/open/floor/reinf_floor.dm
+++ b/code/game/turfs/open/floor/reinf_floor.dm
@@ -19,7 +19,7 @@
. += span_notice("The reinforcement rods are wrenched firmly in place.")
/turf/open/floor/engine/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/engine/break_tile()
return //unbreakable
@@ -100,92 +100,92 @@
/turf/open/floor/engine/n2o
article = "an"
name = "\improper N2O floor"
- initial_gas_mix = ATMOSTANK_NITROUSOXIDE
+ initial_gas = ATMOSTANK_NITROUSOXIDE
/turf/open/floor/engine/co2
name = "\improper CO2 floor"
- initial_gas_mix = ATMOSTANK_CO2
+ initial_gas = ATMOSTANK_CO2
/turf/open/floor/engine/plasma
name = "plasma floor"
- initial_gas_mix = ATMOSTANK_PLASMA
+ initial_gas = ATMOSTANK_PLASMA
/turf/open/floor/engine/o2
name = "\improper O2 floor"
- initial_gas_mix = ATMOSTANK_OXYGEN
+ initial_gas = ATMOSTANK_OXYGEN
/turf/open/floor/engine/n2
article = "an"
name = "\improper N2 floor"
- initial_gas_mix = ATMOSTANK_NITROGEN
+ initial_gas = ATMOSTANK_NITROGEN
/*/turf/open/floor/engine/bz
name = "\improper BZ floor"
- initial_gas_mix = ATMOS_TANK_BZ
+ initial_gas = ATMOS_TANK_BZ
/turf/open/floor/engine/freon
name = "\improper Freon floor"
- initial_gas_mix = ATMOS_TANK_FREON
+ initial_gas = ATMOS_TANK_FREON
/turf/open/floor/engine/halon
name = "\improper Halon floor"
- initial_gas_mix = ATMOS_TANK_HALON
+ initial_gas = ATMOS_TANK_HALON
/turf/open/floor/engine/healium
name = "\improper Healium floor"
- initial_gas_mix = ATMOS_TANK_HEALIUM
+ initial_gas = ATMOS_TANK_HEALIUM
*/
/turf/open/floor/engine/h2
article = "an"
name = "\improper H2 floor"
- initial_gas_mix = ATMOSTANK_HYDROGEN
+ initial_gas = ATMOSTANK_HYDROGEN
/*
/turf/open/floor/engine/hypernoblium
name = "\improper Hypernoblium floor"
- initial_gas_mix = ATMOS_TANK_HYPERNOBLIUM
+ initial_gas = ATMOS_TANK_HYPERNOBLIUM
/turf/open/floor/engine/miasma
name = "\improper Miasma floor"
- initial_gas_mix = ATMOS_TANK_MIASMA
+ initial_gas = ATMOS_TANK_MIASMA
/turf/open/floor/engine/nitrium
name = "\improper nitrium floor"
- initial_gas_mix = ATMOS_TANK_NITRIUM
+ initial_gas = ATMOS_TANK_NITRIUM
/turf/open/floor/engine/pluoxium
name = "\improper Pluoxium floor"
- initial_gas_mix = ATMOS_TANK_PLUOXIUM
+ initial_gas = ATMOS_TANK_PLUOXIUM
/turf/open/floor/engine/proto_nitrate
name = "\improper Proto-Nitrate floor"
- initial_gas_mix = ATMOS_TANK_PROTO_NITRATE
+ initial_gas = ATMOS_TANK_PROTO_NITRATE
/turf/open/floor/engine/tritium
name = "\improper Tritium floor"
- initial_gas_mix = ATMOS_TANK_TRITIUM
+ initial_gas = ATMOS_TANK_TRITIUM
/turf/open/floor/engine/h2o
article = "an"
name = "\improper H2O floor"
- initial_gas_mix = ATMOS_TANK_H2O
+ initial_gas = ATMOS_TANK_H2O
/turf/open/floor/engine/zauker
name = "\improper Zauker floor"
- initial_gas_mix = ATMOS_TANK_ZAUKER
+ initial_gas = ATMOS_TANK_ZAUKER
/turf/open/floor/engine/helium
name = "\improper Helium floor"
- initial_gas_mix = ATMOS_TANK_HELIUM
+ initial_gas = ATMOS_TANK_HELIUM
/turf/open/floor/engine/antinoblium
name = "\improper Antinoblium floor"
- initial_gas_mix = ATMOS_TANK_ANTINOBLIUM
+ initial_gas = ATMOS_TANK_ANTINOBLIUM
*/
/turf/open/floor/engine/air
name = "air floor"
- initial_gas_mix = ATMOSTANK_AIRMIX
+ initial_gas = ATMOSTANK_AIRMIX
@@ -217,12 +217,12 @@
QDEL_NULL(realappearance)
/turf/open/floor/engine/cult/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/engine/vacuum
name = "vacuum floor"
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/floor/engine/telecomms
- initial_gas_mix = TCOMMS_ATMOS
+ initial_gas = TCOMMS_ATMOS
temperature = 80
diff --git a/code/game/turfs/open/glass.dm b/code/game/turfs/open/glass.dm
index 30af15393c9..cfb6b2a0c4d 100644
--- a/code/game/turfs/open/glass.dm
+++ b/code/game/turfs/open/glass.dm
@@ -42,7 +42,7 @@
icon_state = "reinf_glass-0"
base_icon_state = "reinf_glass"
floor_tile = /obj/item/stack/tile/rglass
- initial_gas_mix = "ICEMOON_ATMOS"
+ initial_gas = "ICEMOON_ATMOS"
/turf/open/floor/glass/reinforced/setup_broken_states()
return list("reinf_glass-damaged1", "reinf_glass-damaged2", "reinf_glass-damaged3")
diff --git a/code/game/turfs/open/grass.dm b/code/game/turfs/open/grass.dm
index b1ecd34165d..1f65573db01 100644
--- a/code/game/turfs/open/grass.dm
+++ b/code/game/turfs/open/grass.dm
@@ -29,4 +29,4 @@
icon = smooth_icon
/turf/open/misc/grass/lavaland
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
diff --git a/code/game/turfs/open/ice.dm b/code/game/turfs/open/ice.dm
index da29593d3a8..8cd466fcefb 100644
--- a/code/game/turfs/open/ice.dm
+++ b/code/game/turfs/open/ice.dm
@@ -34,7 +34,7 @@
/turf/open/misc/ice/icemoon
baseturfs = /turf/open/openspace/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
slowdown = 0
/turf/open/misc/ice/icemoon/no_planet_atmos
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index 5c82669420f..37c2f2b7815 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -44,7 +44,7 @@
return
/turf/open/lava/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/lava/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
if(burn_stuff(arrived))
@@ -233,9 +233,9 @@
canSmoothWith = list(SMOOTH_GROUP_FLOOR_LAVA)
/turf/open/lava/smooth/lava_land_surface
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/lava/smooth/lava_land_surface
/turf/open/lava/smooth/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm
index f2d890b5c63..154e956b95f 100644
--- a/code/game/turfs/open/openspace.dm
+++ b/code/game/turfs/open/openspace.dm
@@ -24,7 +24,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
var/can_build_on = TRUE
/turf/open/openspace/airless
- initial_gas_mix = AIRLESS_ATMOS
+ initial_gas = AIRLESS_ATMOS
/turf/open/openspace/airless/planetary
planetary_atmos = TRUE
@@ -166,7 +166,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
/turf/open/openspace/icemoon
name = "ice chasm"
baseturfs = /turf/open/openspace/icemoon
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
planetary_atmos = TRUE
var/replacement_turf = /turf/open/misc/asteroid/snow/icemoon
/// Replaces itself with replacement_turf if the turf below this one is in a no ruins allowed area (usually ruins themselves)
diff --git a/code/game/turfs/open/planet.dm b/code/game/turfs/open/planet.dm
index 6c1ae311ae9..30e7a430020 100644
--- a/code/game/turfs/open/planet.dm
+++ b/code/game/turfs/open/planet.dm
@@ -6,7 +6,7 @@
icon_state = "dirt"
base_icon_state = "dirt"
baseturfs = /turf/open/chasm/jungle
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
planetary_atmos = TRUE
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
@@ -20,7 +20,7 @@
/turf/open/misc/dirt/jungle
slowdown = 0.5
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
/turf/open/misc/dirt/jungle/dark
icon_state = "greenerdirt"
@@ -46,7 +46,7 @@
/turf/open/misc/grass/jungle
name = "jungle grass"
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/misc/dirt
desc = "Greener on the other side."
diff --git a/code/game/turfs/open/snow.dm b/code/game/turfs/open/snow.dm
index 66d1bfc571a..c1504c049cd 100644
--- a/code/game/turfs/open/snow.dm
+++ b/code/game/turfs/open/snow.dm
@@ -24,4 +24,4 @@
/turf/open/misc/snow/actually_safe
slowdown = 0
planetary_atmos = FALSE
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 02e19e94890..37003cc214d 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -4,7 +4,7 @@
icon = 'icons/turf/floors.dmi'
icon_state = "riverwater_motion"
baseturfs = /turf/open/chasm/lavaland
- initial_gas_mix = OPENTURF_LOW_PRESSURE
+ initial_gas = OPENTURF_LOW_PRESSURE
planetary_atmos = TRUE
slowdown = 1
bullet_sizzle = TRUE
@@ -17,7 +17,7 @@
heavyfootstep = FOOTSTEP_WATER
/turf/open/water/jungle
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
/turf/open/water/beach
planetary_atmos = FALSE
@@ -30,4 +30,4 @@
//Same turf, but instead used in the Beach Biodome
/turf/open/water/beach/biodome
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index afbe60689b3..09799615bdd 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -5,10 +5,9 @@
/turf
var/needs_air_update = 0
var/datum/gas_mixture/air
- var/list/initial_gas
var/heat_capacity = 1
var/thermal_conductivity = 0.05
- var/list/initial_gas_mix
+ var/list/initial_gas
var/planetary_atmos //Let's just let this exist for now.
///turf/simulated/proc/update_graphic(list/graphic_add = null, list/graphic_remove = null) ZASTURF
diff --git a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
index 0ea9c9697f9..1d520237b4b 100644
--- a/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
+++ b/code/modules/atmospherics/ZAS/XGM/xgm_gas_mixture.dm
@@ -481,6 +481,7 @@
return temperature
/datum/gas_mixture/proc/total_moles()
+ update_values()
return total_moles
/datum/gas_mixture/proc/has_gas(gas_id, required_amount)
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 6887aa8ca32..be85db9b29a 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -23,7 +23,7 @@
* approximation of MOLES_O2STANDARD and MOLES_N2STANDARD pending byond allowing constant expressions to be embedded in constant strings
* If someone will place 0 of some gas there, SHIT WILL BREAK. Do not do that.
**/
- var/initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ var/initial_gas = OPENTURF_DEFAULT_ATMOS
/turf/open
//used for spacewind
@@ -41,7 +41,7 @@
///If there is an active hotspot on us store a reference to it here
var/obj/effect/hotspot/active_hotspot
- /// air will slowly revert to initial_gas_mix
+ /// air will slowly revert to initial_gas
var/planetary_atmos = FALSE
/// once our paired turfs are finished with all other shares, do one 100% share
/// exists so things like space can ask to take 100% of a tile's gas
@@ -59,10 +59,10 @@
air = new
air.copy_from_turf(src)
if(planetary_atmos)
- if(!SSair.planetary[initial_gas_mix])
+ if(!SSair.planetary[initial_gas])
var/datum/gas_mixture/immutable/planetary/mix = new
- mix.parse_string_immutable(initial_gas_mix)
- SSair.planetary[initial_gas_mix] = mix
+ mix.parse_string_immutable(initial_gas)
+ SSair.planetary[initial_gas] = mix
. = ..()
/turf/open/Destroy()
@@ -317,7 +317,7 @@
/******************* GROUP HANDLING FINISH *********************************************************************/
if (planetary_atmos) //share our air with the "atmosphere" "above" the turf
- var/datum/gas_mixture/planetary_mix = SSair.planetary[initial_gas_mix]
+ var/datum/gas_mixture/planetary_mix = SSair.planetary[initial_gas]
// archive ourself again so we don't accidentally share more gas than we currently have
LINDA_CYCLE_ARCHIVE(src)
if(our_air.compare(planetary_mix))
@@ -484,7 +484,7 @@
for(var/turf/open/group_member as anything in turf_list)
if(group_member.planetary_atmos) //We do this as a hack to try and minimize unneeded excited group spread over planetary turfs
- group_member.air.copy_from(SSair.planetary[group_member.initial_gas_mix]) //Comes with a cost of "slower" drains, but it's worth it
+ group_member.air.copy_from(SSair.planetary[group_member.initial_gas]) //Comes with a cost of "slower" drains, but it's worth it
else
group_member.air.copy_from(shared_mix) //Otherwise just set the mix to a copy of our equalized mix
group_member.update_visuals()
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index c7d96d7c721..7e8146e6a88 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -307,7 +307,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
///Copies all gas info from the turf into the gas list along with temperature
///Returns: TRUE if we are mutable, FALSE otherwise
/datum/gas_mixture/proc/copy_from_turf(turf/model)
- parse_gas_string(model.initial_gas_mix)
+ parse_gas_string(model.initial_gas)
//acounts for changes in temperature
var/turf/model_parent = model.parent_type
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 551d8ca3596..126a92bd4f7 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -165,7 +165,7 @@
name = "liquid plasma"
desc = "A flowing stream of chilled liquid plasma. You probably shouldn't get in."
icon_state = "liquidplasma"
- initial_gas_mix = "n2=82;plasma=24;TEMP=120"
+ initial_gas = "n2=82;plasma=24;TEMP=120"
baseturfs = /turf/open/lava/plasma
light_range = 3
@@ -226,7 +226,7 @@
//mafia specific tame happy plasma (normal atmos, no slowdown)
/turf/open/lava/plasma/mafia
- initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ initial_gas = OPENTURF_DEFAULT_ATMOS
baseturfs = /turf/open/lava/plasma/mafia
slowdown = 0
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index a78fb3f85e4..3e10c363752 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -47,7 +47,7 @@
/turf/open/floor/holofloor/plating/burnmix
name = "burn-mix floor"
- // initial_gas_mix = BURNMIX_ATMOS
+ // initial_gas = BURNMIX_ATMOS
//TODO: cause warcrimes later
/turf/open/floor/holofloor/grass
gender = PLURAL
@@ -167,7 +167,7 @@
tiled_dirt = FALSE
/turf/open/floor/holofloor/snow/cold
- initial_gas_mix = "nob=7500;TEMP=2.7"
+ initial_gas = "nob=7500;TEMP=2.7"
/turf/open/floor/holofloor/dark
icon_state = "darkfull"
diff --git a/code/modules/ruins/icemoonruin_code/hotsprings.dm b/code/modules/ruins/icemoonruin_code/hotsprings.dm
index e396f872980..af9be4f5989 100644
--- a/code/modules/ruins/icemoonruin_code/hotsprings.dm
+++ b/code/modules/ruins/icemoonruin_code/hotsprings.dm
@@ -13,7 +13,7 @@
/turf/open/water/cursed_spring
baseturfs = /turf/open/water/cursed_spring
planetary_atmos = TRUE
- initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ initial_gas = ICEMOON_DEFAULT_ATMOS
/turf/open/water/cursed_spring/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
. = ..()
diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
index 88a6560770d..cb457ecab3e 100644
--- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
+++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm
@@ -37,7 +37,7 @@
base_icon_state = "wasteland"
baseturfs = /turf/open/misc/asteroid/basalt/wasteland
digResult = /obj/item/stack/ore/glass/basalt
- initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ initial_gas = LAVALAND_DEFAULT_ATMOS
slowdown = 0.5
floor_variance = 30
diff --git a/code/modules/unit_tests/breath.dm b/code/modules/unit_tests/breath.dm
index 4a88ca40646..02224722411 100644
--- a/code/modules/unit_tests/breath.dm
+++ b/code/modules/unit_tests/breath.dm
@@ -24,13 +24,13 @@
var/turf/open/to_fill = run_loc_floor_bottom_left
//Prep the floor
- to_fill.initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ to_fill.initial_gas = OPENTURF_DEFAULT_ATMOS
to_fill.air = new
to_fill.air.copy_from(to_fill.return_air())
lab_rat.breathe()
- TEST_ASSERT(!lab_rat.has_alert(ALERT_NOT_ENOUGH_OXYGEN), "Humans can't get a full breath from the standard initial_gas_mix on a turf")
+ TEST_ASSERT(!lab_rat.has_alert(ALERT_NOT_ENOUGH_OXYGEN), "Humans can't get a full breath from the standard initial_gas on a turf")
/// Tests to make sure plasmaman can breath from their internal tanks
/datum/unit_test/breath_sanity_plasmamen
@@ -64,16 +64,16 @@
var/turf/open/to_fill = run_loc_floor_bottom_left
//Prep the floor
- to_fill.initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ to_fill.initial_gas = LAVALAND_DEFAULT_ATMOS
to_fill.air = new
to_fill.air.copy_from(to_fill.return_air())
lab_rat.breathe()
- TEST_ASSERT(!lab_rat.has_alert(ALERT_NOT_ENOUGH_OXYGEN), "Ashwalkers can't get a full breath from the Lavaland's initial_gas_mix on a turf")
+ TEST_ASSERT(!lab_rat.has_alert(ALERT_NOT_ENOUGH_OXYGEN), "Ashwalkers can't get a full breath from the Lavaland's initial_gas on a turf")
/datum/unit_test/breath_sanity_ashwalker/Destroy()
- //Reset initial_gas_mix to avoid future issues on other tests
+ //Reset initial_gas to avoid future issues on other tests
var/turf/open/to_fill = run_loc_floor_bottom_left
- to_fill.initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ to_fill.initial_gas = OPENTURF_DEFAULT_ATMOS
return ..()
From bccff85f2f7ac55f0485126f803eb40df79d3676 Mon Sep 17 00:00:00 2001
From: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Date: Mon, 18 Apr 2022 22:18:45 -0400
Subject: [PATCH 016/200] Space wind tweaks
---
code/__DEFINES/atmospherics/temperature.dm | 6 +++-
code/controllers/subsystem/zas.dm | 30 +++++++++---------
.../atmospherics/ZAS/ConnectionGroup.dm | 1 +
code/modules/atmospherics/ZAS/Turf.dm | 22 +++++++++----
.../master_files/sound/effects/space_wind.ogg | Bin 0 -> 22791 bytes
.../sound/effects/space_wind_big.ogg | Bin 0 -> 37047 bytes
6 files changed, 36 insertions(+), 23 deletions(-)
create mode 100644 modular_pariah/master_files/sound/effects/space_wind.ogg
create mode 100644 modular_pariah/master_files/sound/effects/space_wind_big.ogg
diff --git a/code/__DEFINES/atmospherics/temperature.dm b/code/__DEFINES/atmospherics/temperature.dm
index d86e844aab9..bac65da5b79 100644
--- a/code/__DEFINES/atmospherics/temperature.dm
+++ b/code/__DEFINES/atmospherics/temperature.dm
@@ -2,11 +2,15 @@
#define ATOM_TEMPERATURE_EQUILIBRIUM_THRESHOLD 5
#define ATOM_TEMPERATURE_EQUILIBRIUM_CONSTANT 0.25
-#define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
+/*#define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
_atom.temperature = _temp; \
if(_atom.reagents) { \
START_PROCESSING(SSreagents, _atom.reagents); \
} \
+ QUEUE_TEMPERATURE_ATOMS(_atom);*/
+
+#define ADJUST_ATOM_TEMPERATURE(_atom, _temp) \
+ _atom.temperature = _temp; \
QUEUE_TEMPERATURE_ATOMS(_atom);
#define QUEUE_TEMPERATURE_ATOMS(_atoms) \
diff --git a/code/controllers/subsystem/zas.dm b/code/controllers/subsystem/zas.dm
index f3b847cab8f..04e57f1353a 100644
--- a/code/controllers/subsystem/zas.dm
+++ b/code/controllers/subsystem/zas.dm
@@ -144,10 +144,10 @@ SUBSYSTEM_DEF(zas)
if(!can_fire)
msg += "REBOOTING..."
else
- msg += "TtU: [length(tiles_to_update)]"
- msg += "ZtU: [length(zones_to_update)]"
- msg += "AFZ: [length(active_fire_zones)]"
- msg += "AH: [length(active_hotspots)]"
+ msg += "TtU: [length(tiles_to_update)] "
+ msg += "ZtU: [length(zones_to_update)] "
+ msg += "AFZ: [length(active_fire_zones)] "
+ msg += "AH: [length(active_hotspots)] "
msg += "AE: [length(active_edges)]"
return ..()
@@ -407,7 +407,7 @@ SUBSYSTEM_DEF(zas)
/datum/controller/subsystem/zas/proc/process_tiles(resumed = FALSE)
if(!resumed)
- src.currentrun = tiles_to_update.Copy()
+ src.currentrun = tiles_to_update
var/list/currentrun = src.currentrun
while (currentrun.len)
@@ -441,7 +441,7 @@ SUBSYSTEM_DEF(zas)
/datum/controller/subsystem/zas/proc/process_deferred_tiles(resumed)
if(!resumed)
- src.currentrun = deferred.Copy()
+ src.currentrun = deferred
var/list/currentrun = src.currentrun
if(current_process == SSZAS_DEFERED_TILES)
@@ -511,7 +511,7 @@ SUBSYSTEM_DEF(zas)
/datum/controller/subsystem/zas/proc/process_zones(resumed)
if(!resumed)
- src.currentrun = zones_to_update.Copy()
+ src.currentrun = zones_to_update
var/list/currentrun = src.currentrun
if(current_process == SSZAS_ZONES)
@@ -527,19 +527,19 @@ SUBSYSTEM_DEF(zas)
/datum/controller/subsystem/zas/proc/process_atoms(resumed)
if(!resumed)
- src.currentrun = atom_process.Copy()
+ src.currentrun = atom_process
var/list/currentrun = src.currentrun
if(current_process == SSZAS_ATOMS)
while(currentrun.len)
- var/atom/talk_to = currentrun[currentrun.len]
- currentrun.len--
- if(!talk_to)
- return
- talk_to.process_exposure()
- if(MC_TICK_CHECK)
- return
+ var/atom/talk_to = currentrun[currentrun.len]
+ currentrun.len--
+ if(!talk_to)
+ return
+ talk_to.process_exposure()
+ if(MC_TICK_CHECK)
+ return
/**
* Adds a given machine to the processing system for SSAIR_ATMOSMACHINERY processing.
diff --git a/code/modules/atmospherics/ZAS/ConnectionGroup.dm b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
index 66b88abfc1e..fcc71024f78 100644
--- a/code/modules/atmospherics/ZAS/ConnectionGroup.dm
+++ b/code/modules/atmospherics/ZAS/ConnectionGroup.dm
@@ -168,6 +168,7 @@ Class Procs:
attracted = B.movables()
repelled = A.movables()
+ playsound(pick(connecting_turfs), 'modular_pariah/master_files/sound/effects/space_wind_big.ogg', 100, TRUE, null, pressure_affected = FALSE)
flow(attracted, abs(differential), 0)
flow(repelled, abs(differential), 1)
diff --git a/code/modules/atmospherics/ZAS/Turf.dm b/code/modules/atmospherics/ZAS/Turf.dm
index 09799615bdd..ecd4a9cf8d6 100644
--- a/code/modules/atmospherics/ZAS/Turf.dm
+++ b/code/modules/atmospherics/ZAS/Turf.dm
@@ -257,14 +257,22 @@
/turf/return_air()
RETURN_TYPE(/datum/gas_mixture)
//Create gas mixture to hold data for passing
- var/datum/gas_mixture/GM = new
-
- if(initial_gas)
- GM.gas = initial_gas.Copy()
- GM.temperature = temperature
- GM.update_values()
+ if(zone)
+ if(!zone.invalid)
+ SSzas.mark_zone_update(zone)
+ return zone.air
+ else
+ if(!air)
+ make_air()
+ c_copy_air()
+ return air
+ else
+ if(!air)
+ make_air()
+ return air
- return GM
+/turf/open/space/return_air()
+ return air
/turf/remove_air(amount as num)
var/datum/gas_mixture/GM = return_air()
diff --git a/modular_pariah/master_files/sound/effects/space_wind.ogg b/modular_pariah/master_files/sound/effects/space_wind.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..3709cdb05575345259e84a219111f6ffd8cdbd38
GIT binary patch
literal 22791
zcmagG1yo$k(l$B-x8N2eXkf4e4{pH*3-0djE`eadZE%;t2lpUJ2oT)e-7UBT?vVGK
z@0|PHyZ(Q#rdRK-?yBypr+Qa6dyk@pg$m#W;9pmW#Xp6fG%Ra43OIKMXJadu=PI}l
z75{4D0r$7i45#?q^M9`Ap3js4=te9y|I`2L>VyA>5fhBAY2|3is_1M%X=`Py{+B(a
z3?=(JHuiVy?>HzK6z%M-9G%Tv%KuLUuE
zjB_rpmBRaCO5_NoRbJE|mv2n$i|UJP?1zDLD41G^0GM7xq^Uyim7g=?FI1t#uq=$s
z`4?4jrZXC2N$zJf_Ft4ia_oDBi3)ssB?U2j`waD?V(2XO;~+V|P=v{{x5r_UO-T19sKc~M_r-TFK
z((op40Q0F|<*)PR!v}{}ya1R!tAr9Yff|@lAX8*+U1^okXj$H9H&DwwP>b=m3CyMl
z&!Yk4TBR5Lf0DUYvf2MViCF$(1c<qIM|Oxx?sjQm%_zW^|siYPO8J9A38
zaQ3<{fhd!{}(1je=tPiFQWtItNE)5sK85j8(m@1w%@_)Vp
z|KbHU5vnZnWa|JFjyR*gY6*a`CC)<;$M{DQtihMOP0IAq^z$L!m+4!%rT7^W-@{ci
z=vzutGyYo8c9>)XW=mjyT6b>RXu8X=3`RQSpOP1D1~RmC99BoNlliiT#0b{TYCIje
zbWRi2S8FtVyQBplRtg7a&^NTG{=@HIuqf5f9RAL`2I~<%pJCI2ss}6Gnr0pkp+49B
zZ}^D7>}E7e+>`a0(k}+d7@w+$Dv`o9_GMx&+b>`tMRbfLs5I!KG6_Az_4D7EQvv|N
z*nd&{@9Zy>|3PtKLIh(!L){?z0P}NJ(KXC>P~C+sj==^)F*6qo#nBDh*)Em5(l(HW
zX>BG5SQ!L_{NqtDqf(m2i6W8wb&}9j=YC)@%q#xeaHq5*IOJphl}66UlyK=_X^fpk
zg+owHRZYX)PAkQ2p(#Xf)@^0RZ)GOhfGG5T1M7c02LN-L;J-czHjZNJ%?wfyL;c6V
z|Mnaw{N8x7zIa;MT3Y#W=Aqx5iszhTcoIsS@+t&+V+3v!gk~z-dJ|k`6KZBt?q+k1
zW;#uNT8;m5n19@6WybBlJm=X(sCi>Hq!SSS<2ktuG3)PRXk-#-wG!TVC0m52m!@U!
zmFA=UFVC@zC{B$i{t~hCC59n9*(yA}tR>&Jzw)5<|C;{CbEKSUVF~6r63(>$&QKT!g^&SPb>>&V@0Du6tUu-{#orh)maz6~Sp=N=9@zO&Q$7O&l
z$;2E$x*}YYjm&~^nZ80Wv1~+EA+AX{6xIoV4EsaR8;v7?6Tt@nj4_nafFWSzVc>S0
zazEP^nKFpCI8$Yq7lk~ypA9K12pb3?QyB*Kk_8WnZe<3IiZTEIl;7ZBe_{-rrV;>b
zdcdk9?MNc0EIyqqp2P^g*$kfiOcLi1Czq0{+5n!~l&abSp}blnojjhr{DrC-o`f2K
z+C;LvT7%sPr`epU+7hAKRHNAfp}$75+X{!g7VLH!Ms=G>_A{8a(@XsqD|!6Cthm)?
z8o88Q)s)oCv{co!+|9JE)ikF4WMNbl`8fhLwMMnMOFOk>zcp7iJq@$DYc(xGf1R0-
zwJX0h;%Ck?Q*JP-(X^RSliLb|Rl1dReo0w6Ls?mAS)*N9B~&MWw=BP`zt*CxvZBAX
zs=U(n07k7WDXV2JD`PINt++2^K4>f{YlZgLR%cX}A2gnzcQGHdI+j&dme(FWQ(K`2
zJx&L$?|h4Z14ZTgt);E4_6My_gN=4%1!emki~~Qa`)f}QTHn^YQ7NgpErInmG+^_v
zGw{gPxelqdUz$ZgpJBQ1kwl$9UU+B0=k
z9Ed5Y`ROH@t?=k+5!tWs#OTaK=a=obG7faW1hFmlIFNmPN2a&H4I^aLLec$9eqE!E
z*evuo-Scf+xfN7lp!UYXumSgs4ZMDlJSwIa0q@}eNK`xcD%gzOl&;vy`;>*MY)Dit
z3ZQN>@JEm}6?l@dhf+00=2vDSF31uH9#=-rgM0+p#@P_MJl0VHs3N{WAf^YA3hwr5FfOh%XCbQ6Gc>xnNvWy0j2iMW(a?#tKqM
zC<|h1#MiNBnIA?8L;_IFa-WxwXSWsoqC6~Ph3!1Z%ZMsA$V*@9EGGs8
zstt;w&@~M60)gGryeM=KLRm(ZZgm?V5H<@ISlsc~ZIR@|yW!9cU|!rq30rrN
zNFc;Pqr`>yCfL*vVwhbZ_$Dyj61%(W*=6ZqP%wx7
zOx1=(u!pb#9sXTM=m2rZ01@H>m|R{9Y~w-RT{2GC%19RclCdW<=%pA60c;qsXVoAt
zEW;Lq5n%CNUJxvUfXAN+%Ah?;SRD}J`b+>TqX7Vnj>d_VlLAy0=DybmT#uZ#M
zFc3Fvr`v#F1e>820ALXj8Bh&RD#1-pjLOJq`galmlrS|$v4!FrN3iW=ilYF#Q(-Yq
z5%F{A0ei?k#~)EJ0_?U2M&R8cd(JXlV*V4D{HKKa|1*hFSe%8U4trYn5R;<(6O~Ki
z{=GG^{a28l`p@lu#q9ry-v3V}9UCYNa{rwHL^{!s0Z+)J>Qe84uh5yF=ZO6h7U*@Q
z!bXfl9vlkXEewX4Cr=#2%RmQ12@nW_56q*%+MqNSWo1S>Nb>X2F{uq=f$>JBgG?)1
z!=&(`KMqqstqVNJScjVss+$CY9JNo-O9b0BRS*wAfQ
zfDO~eQ4KKt!&ZoC<4CS)ZFIn@y(1t%y4oo;sj%+H*y>+fQ^A65vA^1W-WVvuY?1qn
z7OD>*7^o-G<-jn`|I~qTVKV-PcVOjbM8Z__O!y1cza>jBU({qa492RbwVi(oH-C
zW`p3XDBJ928b>K9W|@H4x+=ixAcpwQj3@h_O5U<4o_
zxBA;Cn=S&vCN4V~23l{h%eWOh06X{>M*J5|3|zdjz=;-=L^j-FE
zhz;NknxJ^D8M|}q(#+3{UiE!l^2T_2S>)TZ<
ztIWqg8PmtBWJ25(f{>^{b#>xp6zp_F)D7YZ_G!yv;JaCsrn4N44f)|hy1QWy1>kfi
zZ-Y(2S~9Wv`e$+HOa(p(VGhc%l%Gs_aXj_$SFfz)Ioc+0j6)Siv_+dN2F6Fasn!G4
zQwr!qa6
z4(e+?#ADr-jQu~-MdX(Zc%n0xSd*4+&Hl&<8!)zn295Sxs9U&K45&Uu5Pb3ht-K-c
z;KCoXNco~q%G`FHmHYk0M;RePD<+)uK#jW8AzAcfHc{6<=Wp~^ek*LJ?s%-LPPY4Y
zafmO*=VZL`oxE9y>|&N>BGmM;oPrN~i>)f(oAFaUpXiSXSXuXv@q~dxe*;15avqF9?==qWqMM`h+pHh)fiJh+eLN}`l*{?;3!)@|;{p?-tAQiT_1t5U+s
zQ*w7Awo4Ys@o{qrqc+31GnO7Op9l0$Z%OugF#=H%1N4i^;g@^oQX6l`&&_s|s
zBweTIX-(htzc^8|eW7m8`bt$>E&H@VJ>o|ueePD&k#OhUX_&nQ(kGpR=?|S`L^9;I
zw0CX$fE<}DlTv8DV)derr+0Yx=yvzLp3a#L_-sHy)HTiN
zciX%)>4J8ZC*5)Q3)jbxD>IWDANLb-@o(5XBd8j1DP}J9(PebLB!wFz^ua=>`tzXI
zALa?fjTmsp6SaM>g+{w{!z!BR3|$?J&Da-6R@2(vkyq0V$Ur-;B_t0-bU#<$*>dW=
zUzF>Rl9L@wz+Nl}J0Z*?z$NZYO`fi-pT^hVfTA{d8D3wWD>hYT{rThT)~Hvw<(CPv
zm!o@4M3an(v$1+>?8RrsE@Pm^s-3x_sw68s8}UVZY22)-YeW+Wq2pU8ju`v7)HI(F
z=n71b_-VOkVk4g#!p8l6VE4`Q}{A9AI4pOTfIK6*E;$w)fjotcJ<+>^IAw{
z^KgYn$H*v7T`SH4Bxy@ifmb>*+|{Qzs6Bnm_)~7-@zIiFZ$X6%%T%BxW~+5xg@1hM
z{&`H%@yMG13y_FKj>m@Z{&nvDNDZl8O~5ReRS-<$Qwe!KI@8yPn3%?y_u8
z9lM>$M}*x^vC#Zs_5AE73(imD@HeY7kxj#lVHZeUuC}Hm6$b|J-(OqAN^8h2#{^4X
zOg+3|bHTrBv%J82Ia+@Y&dwU_$MtL%sPjlq&1#hR}j&T__
zs`Gb$)(ky5O&D@mlSNeA=g}!&ch6#Zfl*HJvs3i?Z=BnmlqnW5`Ti0nZA1Q
z4c)TxtjMvrZ_|Qc`WcV?L=2QD1@6H#Fuj&8eSj{UT0~L3(11V
zK`z5=yW*Ou@TL*P3eQ^+D*9@BFR}q^Yo~xv#K#4pb2KQJq|y$Tvzb$z{O|7Ckz^VqFfEg$Ge6#$`J4o7X%5O!S>G~r>s;l)Q=Pln+qLpp&3uY#1AM~jPrWS^%
zQg&I>QbSR!mXwH6xMiM;A<+qB{C2LDj29yC)i3JR2tvj{95g&tW{W0-y2(oY^(kGv
z828BR%2F9aJ062pxI$i};+&&-ZxDXeRu9R6(K+T
z2_pfz`~pt`=O+&)+aJRc-oN|wXNK8inX~Aw5BWCRqpWx)<(pV}I{d`wA6qSK85Xj3
zl^O}jKC#DTBkL^s?W+$oSJ7sbu_2heo8(v$4t
z%z#>`^_!l`A=WXEPs{0tdHwOJP(W$rRxRER>{zQ&DKZm?6_(B?_10NQA}V!2U;6|0
z`1rhKL*m$U(^*tYv$w`=^8o(Y#SiohmKPQ-#8YFeGh1C@WDwg;aMW9FifkTNC9y9=
zeWRs6e6HcfMiH=j>c51mC@|#_9CPOn|0&;FlUqnXOzM-xd);+3q(AcW&d86lJW?B8
zg59pDBKgTyQ&m&-&2WAAhCJJSB6QNM;F5KkI;98g1j;0E)mRTHibe{=`$^#QI)>!~
zCe;^uvSU#Ad`WOKkHC8Rb;`60B91X7)uilb^<8@YE_z@m6r&^K{l
znX#u@|I{1!dx*g)siW;h$T5B8imYtWiSd$8`S*S-UCHVhh
znF6CZS@+svPV?g3LIdgzz2;A_|3v+%aW22Q+BF*_z`b2H5x1K2)^)S`njf=;rqkai
zZ1#c&V?0N%3*@IGItSU@qs&uV@e%oW-R7xQL4#LRFQ?~$7`3N$QLErWSYN|1q^$87rws|SSl!YL~PY!KjA`=3va}cD3}JfREA9V
ziJ5K3_O46Lh=qQ=IGQP3`gkeC2VZkq#Gkkg(R_z)=I-M>8>Z>dsBJm}aHbVNY87e(
zUqUp7MKg^YUr;by$ct-mh7RxrMZCj^}!|mk$c&
zkUj}z9B(-P!WW)_s8*PrH*g^xbpHg=PQ)c}OaB>=4vv0@Rpop2Caplr_Pe6D@u-mK
zB6_!n(@uy^CXDL+tpVc6=$#2aW||oCDUM;SiMo`wmZXgPkkGIu
zlB!{D21u6{^f$@ay2Y0db=k6LIB2`&2y+T%Ep
zz6^TKNb3I5_uJ06%}QZ;F&?hfuuk{H#kyQgi}VMyZ(wzUg6IYg=uM02I+b=#|;$Y7SM&v}zXeARDfJwF&{_JPk;X0-%Ej+!xo+
zjKt4!+Ijt=MJB=3umZ%yHwXNVHdivpx#PpwMa3D)oO;ntwj+>9_9*Y8JtQZVzc+q2
zo2~a?`#?%s=5N~VpF1ieio8V?PxXCL51)35vK8;Eu`WxH;H}c~fs(*G+wMte$s1Dw
z@%09ZF)0J7kYuc5GRN;Y{FlOXMp`#nlD}&{-#L@QHDvVpyT}T*RQ2eGX@$Mr#Pe#kJ26xp=?KfZE5>NN|NHCTZIH8^nJzKKZ)76
zXpBkVO5A@PAte9j2mu~eTpg3k!kb@TSXrOjSzlY7Szce?+TGjS*8jy65;)&y7=~_S
zk5@JJC|bqHoER|)vMQQhd}3MhzCK1CSYBRDRu^7Odm>vtxf1lFb{73SH&-c9cBpDz
zvCYlKyx2A}O6*~)lj`yIgl&X?Qakvd8H?C6zY~6>=PkuyJpOho#d$a^V7NC
z($QR;zeUMty7R_#RBR27Q-ninV9a1Y596D}^+H
zL>Uujn?FdrXj
zY-W~(uUvI{?+uK$^&(FBAwNu~jE~=HpQPQ>Y_LLG^{ci1U|;SZ$72*DEekv_VZR*t
zlJ&)$!kQz*^UEYBX-%%$piNUo#7FV8wZUYal?a!TEM_jBn|kNeXtsvW5F6#!y>uMg
zT`dIradQkVR+Noybymjh@Bsh!QHcS#$XRoQo+nwM_`yhq%5=PE()qA|xL!P-qBOOu
z*-#`RajmoWSy;X8PuOm-fNnYSvgULBB64+bFlE~+q1FrWkISwQv1jfpupY_hYkiXK
z^xM@nx81;KrI-YAL)^8S{r5NLmhf_Jjvbn|C0gz$Jd1n4Wj`P7q+jFnv4>dHrHbx`
zU?=1@-pOlkIlV@zx2~xx@LXf$xkI$43e(SE=>|_yY~g~JU+mAn-7|!EqPx_mNVryt
zxv@1w%jI!0WLZl1R-(@Nh}i8g@ieg5krpbxXe!aJdK@t0
z)Cli5$3FD&?H6Ia5cG*y*6oJP>&RyD6kP)<1MudOI#@@d432kxSJF~`(0dB{h|?Ne
z7LYwUhQt&x?^_M0e-oJ`HWxa;z;sy7;7oxWm2{FcQL8S-0edxOM{$bUvT
z(SS_uW4TF=boK=W(UQn>`$xr9{`WF;ebjUb{n$^uZ+F$<6!8%dGe%Us^w5;hNf^5t
zBC0#qN7WQPAJGS_SmoTB!^ibv5we?t6b#duv!?{rSCIjR7{pzCx;=co+Dxs;oTviw
zi9Qm?bJ-&nySx^^x`5?tJ8_w_R0{
z6uzkA6Q305D&9hW?eE@)eg62Ts9%-(l4c^*PIx`+_cSF_V(X}`MN7V}^SsT3%}EDi
zjn33jzMSNp;k81MQLbmum7sB(6|1qJzmgjZWB=innpo`qwhakO&qj&H#z3XOc%hHB
zgvIzvy==8vTtVlViFIsrql{i8Po?Cd!BBE8J_n%Z+%i!&J~V}>3d`2$jSy-D6FgD$
z5XGuKq88o@;)$|dFK90arLiNsemk_Y64G+hptpW{fUNJ|?q(^|5CeQ|dgrUSegB$_
z&v$|ucZ$!F4-2zJ)8;gq)oah1_6TgtNT_&{g%UvFneFw1Q{T!UgY)`>R*(CsW76j@
zaT^^mjbEFRXqXEoY3?8dZUy5+@KdfDCh)$R9~maz%Kb57C&K^kwS)3K?Q6xgu!=})
zu0%Zo!0A+L=Z2i84cruFzIRuoSG7K*)nJhooIFi4iSrTr$-(B+n|h)4>b=vkej~{u
zv2G8B6zed}J|sNAGD-za5PQ~G%fyR&N!#fsig%%Ij9)+S5`xBjXRtD;&S$BEp@ezVaRC3U&-Bvzv6Q9nq{|gc52_lryrf8&YGzbr(1}s1tXa2>;&b^o0T}X
zRqbU4byKb_LS=&QWhEAa61nmiP!8A6Ek|mi0{Ok&9`Zw-Q-i-7L(P{#rlKygicyQF
zk3D$
zy0#4;FVC7hPyb$zQ@xQYj^I|Jo%WmXx~xsv%m(v{G2WtaDBA`EDAA%sEg#9sx+OV?4hR{qZMo3hzO?%(wUl1zS~f5
z$xtf?AoeB>v|^Eu`W!mcIa;x`z`W?iyYf;uIV4ovf*;P#xK_{5>c9?&db)fQNfVSG
zXcy=w9x$GaV2DAw;_^m&T5RlWZQurUwN3kIJD0WHF>5>ckTW|psL)iozoe$Mvz|+?
zy}UVDHhs=+O`dF6$)_p6X$dRWlFBzhiAF<}GjZxdu1Ov3tUC1P*vHAAUfb9~_irwej9
z;Dl~CVt#-TBhasWP%SYJ9KUh0w3v2L*gzS0sNYS!qd5wh{7F%XW;`6E@7x#iJ>@0$
zkTz|HJbfSypQgo*{g5(`^C;?XBpfOQVcj@<
z1Rqq{ZkXH2Y4QtF`_|!rmJ`Ar_^veiz+1QPyV@DgNrU}dt~Eo@pwN5<677JE>B
zF7iDm!&A{!3qx-k1j+^QzljVLO+nN&@-vBkhb)a?TFezMXky9&HiqXdSi4+bb+`T1
zfIO7hmfDI&guGSc);?E4x1Dve9Evuflq2xdZs-dsQR$Wq(6KAy>~pedc~}EEPmMyf
za^8b9HVU(o1@FrxRj1d
z1%Q?S*XOFNXpwS!`8pp+?y#)*scZRCg7aivOes-V
zDth`E6|c^aq;pr+O7F23ueb8i)`YX|i=cLM?PemPDLotyi!07(1>*bHN%rK|Im6|8
zsm5NBBthP6%Z%WZu8mPQD3389Dys~vNF}xUndTX2H7YVwFT0CxTy|TywXPTQz4<}$
z7Wtmkh2@VlZS1!(Fy6BHu3xJIo&hH-hC`cf{`aZR`JQbgbRIQI$(2T_f`nVnZ3@aKz{gOw)qZb8#cEC56l($}M)ibT0HabqukyXT!n@l>SQ53?nV{_vy$6lrM_JtY=rbHk_iis|#k73hO07~4nOUWNO$$2_DdYYT
zO9=@)$paEJ3IdoY`Sdc`8~3=mB63(_T<0a6%nEr2K5`-NLGq}DAK?ixT+ll>p=J(L
zfMh@*o97hX5=d+#kd0*}?vXf2{WG$s%7e90p2pd}7j3?GH%eA(}PETya!2%k{
zqG*L^AKRom@v*McFC5+gc>Zpx=N_P~xVA%+Bi%yDRJM{oQ0&ctYEKek0lD^b&
zsR6%U2iQJ{F>%{wv3}z{)>bT?SctsC@S|yWRLLlf(!K2}mV7zD4BOcMbY3wl&H4~T
z72cyh#6Ml3tGgCZMJ$9sWJpd5==ddzDV`Xi&qQ>p|9!m6+S0JX8gGTSSBxpfzw`V2
z;9dA$@5=eTtL{Yccwt9Vs<(?##|UXS7el|3x*`7C81=a(7uf}$^NMhMFZgEk{HB@R
zX?^n}i>2>**UFf?Iwl_3LJmM+=1W?nkjYGcEW0p!-N#1$NI?*~9Y#98k>Q@IbGo_P
z;t#pdMSlfzOBQMJe8GMNwC^A0i}fsiYbjIJ4O1ufRp==O)`E#=jwgLYH@nE&>V*HC
zVSwU2P>!n)m&NRp%CGg_h}TxC!t01uB{|fTI;!Umyg%u_Q`mY51Z0?+Ol}
zEpE4gS}6i*jGOa!qHxpa?!L2*eKL4sa{QjBjnQQ%Tli+g`;&rqx(`j#9GZ{|Z9RQ)
zfaKOG(#gXR(;e5J1E*bK_Td^8r40m~H;J`(Rs#`;83a;NM}xrhxt!>HQtS&9`;1^H
zFCLWStHY}0cFCa@UrSr>?CNgmgA4=8A?7)dudpF2d`U)+hm*$fNHw&IQphe)sw-&I
zD8UM-Z#r^^;;@`gf~f;FKTNLAZOn70DMi6ZXIzMG__#thJ+ZIT7OyeuwW68lMI3Ih
zPgf_@ICc0#MD!Z)uM>{-|D13c
zi+4otlD1n5*_cO`7IZ?bF3?WfT4%mGz0LL?nrB&_My_3?b?}Oavf1!H%RMHScQBaX
zTcS(qK58s3V!oc;;M5>R>U8W|im>z&t=F3=KY2fe(~(kCeLbFJx6{qKwE*wE_2W^!
z={1>YqKSin(q+GMc1q`uRRVu~Wn3h^UPB#r-Glb^I_Z3{+@~m2=N*RHIS%LoXd~b9
zZn9_;MGm0fR~{`|5@e2;9Ep4J~?lvkgm#9Xg*%GAI3LoEFq^~?tmTAZPRn2onv6-~$pxe4pj
z+T=uxTGio?6mJfZJ~+pzIK`Ls6}fg#zdXv;W>ji)5wAgZK*{Pr(>yZ&k)i>)&69E~
zN|eqCRG5aFmmNp(!g8B*`8c5P`v3(wspA@NZsY<1$7T1E{zSTYm7)n1B^rJ-TVqE?
ziwA8q)i{Zzz@g~-OgiD4{ATzbjtdh0ZSK4bfWIfFw%B=yrB40&;
zzIIgl<+)rcX5o^*6df}0?7v`Uwm!lO-7XCX>qQHC%tn}Z^IZw0{UUCIU
zzJca!s~uI5(K8(`k@qf8^{8HScD2VcItQ^E%dak*8
z*9_wgTgwlAcbrlu@1X&6E|u`{HcpsWkE9MP9;gty9g(V)2@s-~+(hV|r=67{M$v~tZBjA|XZ80>LkdXMhX_-V^<3R5ed1Vk8ms}#O
z&Y-K$l_q4@^Xrdv`Cca<|2lO$t~fmY^3#R6Zr3;3S?4E;vwC^6y6o+X`tU6;X6fKW
zTzJ(ib7XRhrWr8}fqB=XZ=Q|Ej}k{;N4b+S71Fz0Wf%O`r_nbk
z1x@wvE;x7%@*1hQk(rd@06Wbk+jaD-q`91UI
z!3?HyPfr@xa1!rsBPiY^Hk8+>R>LnJ&@7Z)Oz88?FHtM-L=NbSxKK`#lHyC?=qaN`
z`JGWJc|RPkAs5sNoDsCw&1)VSMSf-s9xS#-<=ep~`&<;oDv1b0E%Dr&1dn_tAIO|M
z3$G=)i(bdN{t$ZSkLO~pBqO($AT;#%7i29Lt
z8BDuNOX1)hmx*gsKbQ4=J;q^((zsLo=I0qHR^e*YClWg$7G;E=jwU|QD&w_#5HO=g
z%f1eCv2I9#s-F?=oTC`tB>F31qTStP1bxlPc+tq0_N(pI=7Y}FGVmp|0>C3Wb|$E$
zdC7Y_Ppv<^)61!GGODzPeehj|ofSF3Yb`tW_g^1Qu3vR>Y`1^hYjJg(@~Gs>gUo8{nveu~
z)(71|Irxkt6Gk8;`)F9jx_P*$6=dUa*+uBfqD%GN41+3aQ)_uPCrX~Xv6-+si(G;~
z^=VuAh+yMo(9~+GyP?zsq
zsPE(#7)Nj#rnD!RW;)5RUfUDB%wAqXi?s#$=x*v*Oy*D!H@L~-SYU6?2{t(LFnUhZ
zMvu5RE3D+YKlE73Ej^xo`&pP%I`*0l3&(W4Z#qq8qFdAZ*nZ7Sp8v~(b+FE;)Wue$
zl}D~K!No3scpvR?0zwi}Q
zr&1?oi#ubJPM5OhKUTH!D^Y?)oi3lbejBbm#&6||dYg{uhZ2`%rIw4ZVoI7?KbfIR
zwG#HqkD%^=SPVujfa#AjyzgpRKi{PUAe~|}y(tq&qTC~lC|~{aZTjwuBK60%kMAo_
z1-6TRatwYNN@5n^6O1*pZjvc2S~v^(<$V93jIEmP5-p3m>S1SbkACnuCzUZew=0;P
z5PdztRxu{5&$ygfh5?ha3S-`+8Xd4KEtf5J{t`)gMd&&JP~S+a@kNz@pe}!>5He=K
zGK^M20Wp8YVcf4s@H+qT^k6|TRWGLE!5fW4Kz8&&jQQScpxgkytG+cN5r4Ou^k!&7
z^Q#qLq#N<#bzMkWJF-jjp8CS6JGP4C=NgGN6zzQ5RP91~Hox3R$5WCcWxJ$Ww|gYJ
zUvJImQdF;BOEpyylh$9g{vPYG?;Wk98r+Yy<;Tf6vKHmz+-B~@;Cf2F=wjB3TB$R-$Dn>ln
zIzqJhyvw*?eUpc?F1VwthD|*o*V8mVUG33udG>wb#5dZt$1fCSO8Fi7w1skhTlWoj
zYVtj1jmg~ZWzx{M>Gq0p$9W_RY7dbI00s2J6`1Fl%F^%0sWamX5=1`kE_&D<
zbGAg75p=WNDpXT*O2sC1=(BPh7gY)!%E8a)JBy3qw0sbYCiSZLq6d}jqv-06-S}X|
z7)=1?W8d*`ohPdpn#Bk<1;rAkRD39|b!d-@9?^RpFQNuNggeeK2g?HpD#HvG2fuw&#TIF{uim_T2D`;D*uqa>0tlWlgY
z>)5x7tnY9g*XY&QoQR|DYCSh*nkbUjJG2~q`220A9cly%995TJNsQ>jisrxhD%Z^)
z&%MamO%8DAe>+y2u$00v8MW!!d$}Flkln2V@84oZO4N6FTAjytBz_wbJUVt?ZORe;
z+3I!ra;$7xw64;ILCi2at1wX*0si?uYFLVXjur&*$rdxe~OWKW1L=wB)~T
zbh8?BK6&Ynnu&#Ji9CUJPq;peV0f5tnDD1WOG?z?wO7K|)03i^w^gji@=>oBw0)Y4
z$P@3C3Ec@NTvhE-C~U)0GnHqJ=BvKV8x^;O4)pZMeBoCZz~bZXFWC&)vxX~M86YZE
zla!tqw7*(nrrY_GVFjcyG2PSk-a1}yb=!kvK7HZr&S9Z}x}MTX*+YP)|V31K)J>GroMUx%J88
z`~ETfZf;r6c#!}!B%dSJ!OeJ<_eSeRzifv1)%u#}y9RAga(IqF%!(3t_;k7OK;!Tz6f~TW4D&)`l0d%ii6Rp)x+p#W`+)P4@(9(
zlP3Sq(U=`y$TC8!`RhCau9xG<5Uk)|)lZd=Pg&-1Zq#saYA%YY$c~owl?+_`nLs^n
zQrK18neB}JS;c&^3~hG=G?FSh3*}Z~aNFNP%Q?$SH<5d~<*hVW>Bt~8
zxG16NDtKZF#0D0@5gN3WV;590xUv5}s9^o)=MSF0=79Y`0N}k189Lt5=GxNq;`+wo
z{KDG&#@xdE^2{%X+(`e#!bvzb@%uPnkA4(jbR+VAgo31o+j^
z8(iLhe`_8?wZ|peTWGU_6^=^4DyoIY-?rJ-A5pI*^gE%$B%L*~#0#Y9l0ZAdMXe>i
z?Ckt4F-6C@y*f@$qKzFMpYyySp9#?|Ur#_{n%`(k2`Qx}D*t{{m<~)+Fr8PG&bzRD
zR2Z<#z>Cp+2>wcuZuntN$pe@3+=B>^O`Mq!n8ruA@Zv;BkNFcoZOt8QR?cY?D!&YE
ztCfH1NPl>+Q%LaXIbn(AX%R237)r=auazM;t7PH3C2o0}C>!R6n5PAMAmSh@ps&UR
z24Bc$kwv;r|`wT5xwE5L4ZdtQws=^Tt=0a6jp;DyfDY!;yPWXs}q^qZ()i%E{Am1SkJ=Iil7*ddbVP9olhP5{{YfhlaaHg1M`dSXCj*2F~=a
zPHq&TYn;ns`iJeBtvD>V_T5;vS23+)C1pV0@Dg9^Sw76vOSMk0H-S2wJ~5eKP|_Q9
zc$zc6Zj4u=|16TjwXHq7Y9?A(emR)#&hX?)o=DR=vJ~r1yi`GbKY56R*}z)j`l<5K##xiMV-R
z?X0XK*+E0_5R%Y)TS@9z!NYEZ<9j+OO4>lAlCp?eRUln35`r&NpQG^GsXICGwS~S;
zZ)XM%Kj9+Jqa3YaL(7W36W3jP4_d;X$tzNIbu(=MbZrXV<<73!{(ochwEG
zv)Xn}$*xGFNkIO9_9_Zkzczl06eO1SRf%$-X!^Z&iCgJVfO`Me)bXLl1TGGX`fS0-
zpU9CqdyI1HIZg!MB~JNpg|I;cY_ACckN-~qFci=0SX>qd%`Pm49=@xD&<{XcX`2|~
zloo>N(YLv_OWKQmdwsKY>a~mE@R5wmMt1Par<)EYV`j47&voAJ37M8fNmZiG=f$&#
z=>c52pnv2Jdo2Nu0;6P&@26)$D52%eT1Ux&{UiW5q8QU}Drt=2hD}}LYT7CV^J)DX
zK{e{_KhxxTafHUTF*dZ*3qDDczM?g;28VjZfqT^AlbYdorll$BG$1iuvULEIFDpLk
zii(9v@x)~rU*b+F2KwC{sN8DbVy(Bbg#zIz-xxetTc&nez>sHnGo|mYKt;C30z?^j3NlP03z%qXXi(
z_+qNF9j~nI^R7&i5e|WHS0O8;PUQ2|Nae`3-Bk62GaIOdm!nTLcjmO%t*aR;@2BisFCYu&<&H)@
zg+u4=r&P5tgaz_X6G*SzirFe#^O`gySZ5&Lq<^*2#gVxivdwn+g=s}emi1LHO8aQc
zr<=!wtokHKTjDAbwBD@SmbJ20kkl8#mN(vDOtOMW3;C=qP!OCIVx^Fl>}$n4{3|eG
zKBG49&$_tQ-DU6-voQf4D4dD}krrscdv`ivgAz1gtZ?}i%d<)|j6aJJ-Hn$b$FRl)pXpg5u>#NrGGvaQdt?vFi%|5-`Ef`H(Kf(<1t4_^u&sY
zt*>aBaMg`xLtd`BC6Dy;4Zc&r5Tv$9{?F13i7YFznC5FkFNH7tu=d)R`NcO;=$sug^&xRYyWK_T7jN~kl5czR=*i|
zy_FekWsZB&La$`KcApl+qtHr9HyIlL2883@?w%o3g5H>%rGWFrlJ
zi*iwdTC+h~S1z_T2UJ&VyJCCj+-%%hwl}=i#mUUog|aV<7Xg#%Ld1#$CIJ3O+$RSm
zchInwzFUB)k%tNQ=FSl_Z)xvrtXpdGbkp9v=f%q0G)WV9Tky;M
z;**An%#r?2f?|dl)43uMZ0E{o(2~UGK1@-70aJB&e__+QZqH`NSinx}y6x4j$hh!&
z9Q8?!_OepcGSgAJ|LU@Pba&Y_Z*e2*mrIF^HTG>^qx9IeDDT(dp#8)l{T{Bx
z8r(XAP-S8Ie0jIC>RrKJ=Lg~5OKh9Uo-TOTh@o-b~{Qd$3NJDfSZ
ztX&faV=g46&+d(K5O+I--{)ZDPra|zwOI0Lmo&d^c;BD2)k>RnyXm(L!s+!`t2)6TQBv4)hmy
zm@-y>*A420
ztvt+T1U9#cD-*d&IP|KjcPJd%%=_M^)%vz0OM!6!zBla7z%+-^+rWEe1fW>}#>$u0
zQPzr?;TsNodU&&IjGy!ABw%vc`bjb;Dk*
zyIF=q^nH8}GiZO^2pA%PpPDI2v^C;M5pLDq%{49BC{y7c-b67d1om8$_H*jmMcOo>
zDPxBA5v}RMsnfbWWhw8;#kME6cYR21J(@LRYA%o6_wwnnLr3n}DH+&OR}A*?Uj`ZR
zpYJmH4N=ylOpl8)5Z&B+URnPicfoq+qF&um{*Br^)_?RiZfWQ2Wdr_4oRWiMUMwc?
z-l!wdNHBph)unZn)0!2X{fLc8i|m13MIHE=vBA85n$^d}8-wM1En->;!P)%S4D21%
ziFw(rUg`NxO@f1;bcI7%#HUA0YKm3!pDF!j^wb&m$ew#k8B3xn3E@VTF#x@
zk%-^b6ZIdYI0FyqS~jvBylYLsCx!3(b>zaAO3!>50n5P2Cg8tqM*pLJ=k;dj
zZKdsB0iy$*0G>x|(L<9r*ua0A3OUh%vBI)kvev8>#1Do~fB=3|f=`
zV3O(_h+)aCL_hI>!k6g?9Nt_bIbACnLn=EtJq#c&;9O+}Ge=pUs?D&s?@nxQytr~`
zPj;%NBWCpW6*KQ`Xa9T^+Pu6XwCx|&BlS27^{1fLwnLqHT-aTi4@<@AlE;|2kW=5f
z7QQoI3t_@5C?$zoJ~M=Tyk~B%_=IYgD`L@h;ti_&m?8(cVk?=-_}h6XMJ8<;1jIWF
z8J3Zorqg09ZGAy8P5
zf9!1f>65ecVKU|W+0$k>G1Z)mEl=x5D$_lRF0r```C(*i$rAN8=WoHp6pE3Ir3vK%+O?&S*X~8r;z%-Yzd=EOj@Gyoqpl|q=Y6fQ
ziB}3rW2I^4oO_rSF6jt3Y~dES(J?I7#BC-C0A5F|$-|N_dN=T1MX(ZrqySY_rRAu#
zPz>?SzpWp~e23OhveRZ4Zv98Kquyenoi}g;TZNc~SB@%!k`oRPvBSKdDfT)=w5aqFA#n
z-PW~!ECICNoK$~4NfJh6A09$|trhRQl@oSy
zCF6|>MGDiVGd@;vCAsNpD_`K;;i5pT(5)1!IZ-e=Zdt>s+@AoRSDcFjUQ`|;r9HA#xF;L+i?_D
ztV6j14$|ZFsxS6jDt=w
z=C_bKpLOl`naTLypk<2rjv=qY%w|Ov2|C*Vh)}%z4Z-Y24#cQNa!abi3Cnl+>T8HU;vnAalZ9Hl#t{|?-
z(hqnMz$u(|CS-9qGq{&&s`^0X|1uqKBSd
zurbE>{scg30LHeot|%L!6@@_Ei|y9F>z}bP)4$IybG76%E)5vB+e?*sBR8FB62E*o
z`|RXoAzK&d1JvUMV&w?5
zrcal9wr8%5{M|xKR9{9j&Yv+k?THoIJ>CpGac{R7_1;+(1!>ly#;_ZE|hiC_p
z&YQ#@;RlI5dI@Q{%zL#IRTf(MJZ%SEmpLH28;U!lyNz+Tj%Q_7BZIhT`Ief(yfCLy
zKBqWs+f+rFl26Q-^{GBLyHCSGD9_w1TaD2!J4lc+3vOPKFnZ(x-x<4?9c}JYFA5U?
z{zhC&gb+V6NW^<13$2&N1jaZGm#pQ;N>G@)Pi}SgY|p$u=$zy3ur~(J@1@?2c|6@W
zH;SpAmO<<2*qsXG=f8X~P&&Cm@>itNkk0fLczu3
zn>p{D{j_TTJu`E%o?8=<^@?oyA-gHu#SIzU5buoI>^?w8Znx%8x}O)Q{Y<}X=?ULZ
zVdFM;i7>wPv4WTr6eJBo2i`VZorh&U+NuEey#Uf8ga>0)#gesS!N5bjo^Q;#US-l{
z-%2|+xgK+$CU1M2QcL5C+_D*Ebc=?m8y%G#M$OyWy)UMO-3}Vj4(}jOM^ZNZbB>bK
zX7$WxnwcYwva+b7kLoxz!zNMw(6L^;ju_e&wNZ(kbmGhQxbtD#Z)f4zH5fWY10wS?5LT^0TB6K32qDvBUDDv&NORl3op2%nc*
z@nJfqFV#Z66+*~%Ko+}r0RA>yQiUmh4jb6FVaP5TU~H?Rk)0NrDQu6vr-$K-Io1>A
zWcJZpY5th(UC}AqVM5}1{S2caxLKw3bW6>+l^j=-DdJ@%BcPw@PS|iaBZp4Bvt<@e
zeYN^NE{E#$^oOGhasQnV7;bOzzt|IFLfDlg3;J{!(%2PdE6Y$e&zSW0Z8DKOHS+Me
zGWQTwqxIfq+;2vk)!&^;x=+;PIOM(GkfjL_&F?G!^}%e0wn>Ws4Ib>|yY@GcY#N2a
z0@Jm!PLYR~D`5@VQa2>5?vexu0A4m+Qb`9v0p_cqS_HsYRdQ(^(wYIw<$K0PIMsi-
z=P9~jHRNVuG1*>Il{jd%S;fV$a(}Hm_jWYr^nrl5p$G%Za?#<<(R+*N`EEx!Ru9dm
zUM7=YXCD;w-=@FtnlE$bni-}cRX8So73Ov9j6WXG
zbxLpbieq1W7ZclmrM1lXt}nWHGOt<7={@^5jZXi7zUs+6PylV+uKgP|F&3_3vvGx;
zoWHUHgz+)?|MQ>)u462_mVSZBEaY
z#>@ndzNritkzM$;(WydtMfED>+UKm}sI+T&@%M9DpA*F;7D!zP?2T$Qgvv)Lsjq9eH
zy@J7cmYWdLEwFuVpcg)7e6$j90N|20pAJ-8Y1Bq&ttfC~ykcXm4JDA{5)8!>ovue`nx`V9cSWqj|`
zXR3m&fcx;Z1pw&tqfCahwhRE(h7GUC+V~1x)Z-;oe429!C;_yZ9AQiamc806|gWI4)Yc5w%-{5rzW}
D;Syu-
literal 0
HcmV?d00001
diff --git a/modular_pariah/master_files/sound/effects/space_wind_big.ogg b/modular_pariah/master_files/sound/effects/space_wind_big.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..6e8934bb6038cee722bccb22b8a07ee62e55d6f6
GIT binary patch
literal 37047
zcmb@tby!?I_b56*aW7EZ-Q69E``}*OihI!(DemqzNO6baEmqv!T8djK?q}1!@Av!e
zx%WBepSvfMC&^k_D@&6d1{EtSbr3Y@pNEY4Z)1bzJ027Xl!v2>sg3LN5Y+36e^8wN
zBDX-PJkR{k^E?v@=%vyvhhY{x{Xd^sn7@=50R$ZzCuy-
zuyL?)lF_NyJJ>k6Sh!j^xY0jz5(mEOj+SnoCN37j;^vN~7G&b?<~D9Njt*p8ENsAs
zosXTHj7~>M^|hm!ij%8`g}sxbi^*F74mLJE7Itzb02><=>_01%kko<#AprR7ie!C(6LFd#5C#bJhKe37(Nc~cl9W&9
zot7l~-0EWsPfH5#!!wIw@Bgz@koj~rycS|s4`
z%`qepp2>&N7pJ)Zr2dLU1_}hk1j)o>%hh5J*Ak6RQmOoAQp4h&a`6D_R6ey39KV_4?fP$dl2Y&%f
zaA*ZI$oyF)WQYkA^a+J>#g?{JHknP<woI`NMBt1w
z`J7H+oi48Kr1{c
zleV!{<1f8`+@j1VYpjR=J1`@BDbubM(GY0em}ec2B0i7(@9rZ8*v(`CuRr?(nO_W?
zDK>dAc_N8hELvh7`yhQ0Npy^~d|8kx7@rp6_Ti7@WFSy5#vd>KxBBDCf4#UUA%bCu
zu6~4LnCZEy_&O$VQ1cZ-5``V`VkU0Di=!L2b6l(VW$hr1b9#)BB(OX^nB>
z1^4xNzxDZOW8BdH-Ld`?IUpctg8#&1l4%tCKvs~l1ma%<{~I~Z*aPuI-{Pqh>Zp{a
zm_~ndshn|5Vo9lSDXHTaPU5&vzp_y0F`VYMnAWtI^{`lMve0k#({1`EVE%^9`n>yp
zMb2}GQ1HiW$|k({pUBChi}}G9Ln)U)rJF$GonjT9QI?*wS5|=ZzeSF9L`hmiNm#^A
zSPWfwicNUNr`CeELsbW#|F7jgkt5?m1r#81q+F=}D{{Koi6nt&s$)_*`zxdHB%n|?
zDct`y00`6_hobN&kEnr}XTjXFU}jAX;s0~Q0MJ=3rD-levB@A1J_xki2WTB5p)f@c
zqf>i`pN{*=h}{yqcg+WqCLZJRE8SF{pRTcFj2#jdZ=lZ@Ptj|FCZMTIUn;&cCx^fc
z52U>pAT=P|B*NHx@l2z{2gzPXu_NFIhq1$v2Th10P=_ROAdn}=fqU_Q?l-dFBndhE
zq&ToF1Oy5M!2@69{E0XmD6uRM=tG=q7&`)v8HNBtnHvW96JAgpKP|N@nmipf1VdgP
z0C4P3nUBdKQWs&%%asMif$1O+Re4)_2%fq;vj+wk2?79Y=o_*1<(c~<*b&lQ!5lk9
z!C*ZAkit(30cODGCnbRGAVqTkz->Zqk1Pocwkb=R(W9eo1OU{@b9#2{#dD@8e@Imp
z&6wKKH_ho){9#`7%={T3$Ly*s4^N&vCQc8`0M=qL_DpI@oDNbnr6&hzRFzkthRjLO
zS2oU>DwZ`8$jbqw^yJDKXY?v78}S4Y=tG`Y)sUhW!47$4MhE%B90D+JY6yfus0$h=Rf32n=up`%YGn
zs=RzMSdo4EdCay9EYIHmXROR3>Uj(Upxg*-{aHa667=+qbHH3TfExs|AOOq-SOWUi
z1Ly&G5XhYA!5=(o$c$bjc`#UBjvA6;8p#f{0K6o#2^(^VqP#41(JOwy&%hk?`4Ckw4Rw)*9z6(j2&nh4TY`?uoEj7d
z5A0q=*ubGCGzm~cKar$7pk=ctz^8$+og^?Ia+)hp5dr%JaP9%LM`ShvsLM45&;>9y
z@C?|=GW)xmAc8;)PQd0{qh{{?zN#_H6urx^}=?p1XL0f1q~kp?|w(D9;PGW1rLe1GO7z{HJRt
z4@8_@CHGDe5ZZHku4AwuGA=$)An`(tz!$kmoj3X9j8K6>AdoEmpMxb3UC&B?w#L8b
zO!ngcwEk!8Piy-hz{s<4qWHIop66z{Dg*BS9tI>97)_Ch74-t=Sw;lF)KMmX+&@mf
zFzJtileGvSSwSzKJsL<*)DXb)nVUxV>FJXJQJ6hm0$spKD{6tvWmnet$}E}~$Yv4D
z{RFN@fNB7F0RIG%-~xa$mmx|2i~D@O_n^(*17j^hXaXAdoaYAOYGxmP-B`rhg5`07U#Bmw4`)KgX}zUx38m
ze*uCgo&)<2KvjYs0?dH_V|4OhRr!AbFXibVN&k|9JjdlfC@-HK3oP*0P5z!q{*wCR
zabS7Gzj%KRD@iY(7x{Mv;DFC~`F{am`9FU9OzN2);JoDj0suyTnEwHQB@n3p1AqVo
zfK~kk0F3@^JyQXJCjQtHGx?Qi3BESTdrBmHn!oY&9oYW<#kHmScRnSMXa1q|?<)TP
z@BV+X0F@4-z<2K=5?blV2{00&viym`S3tylO*4xTrv<`T&o1qQs>E(l(Ukn#T5fsq
zXJvtbFqz}nElo<0m#^%5Wfqkl1O_tz85GEeb7&Is%#E+~BWt(y?BMf@fDHQVU{xJK
zaq@PRTX<$Q{5wnHbo7l2rcvDUdOm1n4FG}0O9Q)6{xBfJv(FK@j&fhEC;*f*?5eoo
zb6qitAq%$A+&fu57y{QbdeN=hByJPpJ0x!MmB21ICJayR`>VB4$8MB+XDtX_0Aby>
z9B^#A6XC0zAP089lP7wfQN&yD?8f=8h=S1su1QcpgV9bPF$1=QIDz4ssW3v7ZjARp
zenA3-0UKHrkbr{!+Qc;CZ>axQFas|MGx8P&+-Hy^c}f^Y->Y-qq+4n`QD5!V=uq&d^0RtvIfAhpmh|?3bZ%N+>lVc>SJsyzzXP1#K_5UM7)%Z<1Z=VQ?@>T}VzP12
zAS7fI;;&L-Vl3o^-FZ%me6-m-z?*s42u65V9~pZ-0UbjzOkf{us4r-6VnMd8C6EQi
zV4}|uUIIY^WwOEi8g43ewXzcYj@j5Haz|
z>Dl?k<=vVD5FH_@Zt8tZ%f0_iEkuv(-~h{ic?}WDZegOi|3KR;6(L<+sLx;k(g_)gEFL
z9G^O=yWGN{IJ>&D_3mgtzE#fD%L8KWR~p}4ToRk_q=icT8tt*pp}r!wE@o$XRFF=2
z?>{mSYDW&I>Ip_lz3cE6n(YZW+Sgz9H>Euiv_HDhLAC6RrP4U_A+z4D6{K)jA8}n@
zR_L$}s%6Y(dmr;kcw2W|?nl>tU+jA+XpkQ6ixoj#LMTG7e$%Hm(e2+yZL`G}g$|>2
z%Vk37^o>?k8J0$y+v=_U)V;Tqj#ojKYqsws8Yju{u5Es82YvO-JmVj2BgIWB8)vT9
z8T3-Qqx
zIF@Rz$#h!knTo8TMH9bWm^g|exn+Q}Jvd>k9I{3uefvmET4_Df<(|kgpg(@M7$qWT
zROz2;>5VPLUjlg@5$U{^O6wgdjc;$ejv?p$
zaK1CE8>cx!4=~2wNwjNCdf6C!G_Q1YB0J9N3pc8MRVt7oQN{*Obgsd9uU!<`X_0*8
z(~Ojh$Ak)c#o`9JQ?h6GLGzA^6KR7@kvfWb3G=ucw8FVf)ct}-y5^^SYBoy!k`wCf
zd9{_fQQPS-Sw7kQ_a*RNM6@IW%Dvb@&D?In
ztjSj)b%$`7F%_}6F2ujxOTzVNnQU0cw58E@goj6q*(2nT0${~e+`Z<|Jy+z1am(k0
zZp~UVU9ai*-@II7%}LE&Us18!s(;zcr7h&gk#`s?cwfm@7R&NOwHc0g_!^m7C~4GL
zXtP6w)HO(@7qw2shune}g%qP)saYGRh)$<^P~Nx@QwZ9$q*WkazisAsMeaA_vzHYi
z#cVp%t{&}&1~JDQv5S6`p_YzImfju#k80fNW7~A01uxGXgk#tNzkYfnK|i!~Tp;k*6-g9btY8QF66%9J954iny`>@f~>vX<#Meyk?a
z_2JYHzi?=t;bXJO58O$YD)xCzn3D2J^$kp{2EO>O<@+K`o#fLN8O*(^z#%x&rCllV7OZMh#
zeR10l$Z+t&
zl!mV>Rs~BHxg&4;VDmnoAmiA_7@sF2n%YS8-s&X}yyIA^dWVGk$|J*}GP7{&Jwe82
zP9IhD{rB#lsgrMckHKxL_7oKF`nu$YsTS{u6R^@^ijSnp1oHa(V@@wZy#lia(?R-{
zPJ9&8-ZOe1)sW|)@}P+ARA})uvnft;$r*o-GHIq*nWH0hpHoDgbws^ZK9d^RP9yP7*vMhtI@AYan$ntRvGD`
zc)2{=hH15-&`Y7CnYgN;$ffc5P-T0~c%OI1tnj=rJnzkejmrv3zg-h~ZXP_eMM$rN
z^0`KJI2STC({~ttE=ZI78BeoZZ!_+fD|!i?%wl1%f}408Yg*WajP))ji`?GfOgHqs
zo+qByba%@`WMALQbiq63yE5iTSCdxr$-twB>8eyCjhE}%FZV@Koi8s?(xYNv4noRD
z<0lem9O`kx@hA1$G=RcC5I
zt(C)-Z+br{`O|v2f=_=CoS5!up|g~<3)a2%c-Mau5ZmWbc5FwHEsuo=4@=pL@Mgt`
z(vZRc^r+jrL99<1f*7~s*XrwbRtYg1CsmM4e*dzCZ>zr2d`ul|qkpDFL!UPh;L3HG
z-n5!gPQ4$rO4&({jq_dq`t84HysdF
z&5yK`y{XP={NwG~?cdwI+x6vQCFi2d-m}B~NLIPfGT{0~6{lQSDO+P67?;&9ilHD?
z^hI{hAS2bhn>G%n0@wBPgzev(N2?lhbl66-$v6
zfPFAImZ)3R`vqp$LQTvqEHuI!*QcU1_)Ql#?Kq64m8o%>X!j6eoE5axx$?|CDs4+x
zOGk*bfS$1i3&k`$vQZ?n#m5H42WH`bymRB@2H$pz#&+P4!Hf+CE<}kT6qa;w76?G$|a10}R{z%4CS>Xbnbu<@{FyvAgSM;Qy>wu`~i6Jh$T@Jqmw
z-|#Wo51GHY%hY~y{{DSOCnFX68|YO2`Dw(^}rUZ4U}ihN%8FUx<_i
zJ>CRe6D+~NZnF90*c%_rP9E5k_xm)}dn$?OW4wz=xh%HVk(UAo-ibm!1s$EE!kW3
zW}9ks1?i~!1@YnF)AiDTd6kMqzL+`QuFlfLlMemJvg6x;ekzE9|5J?Qe#B4}{91J3
zWMe+p*v^sgw|;>whXLou{;RNLW6kn16Do&+t=*sCliRAyLappK4O7e|*iU&@bor@a
zk-l;`-EQ@aVK@)gky9;n0wThZW`(@J@PxTIB{rGx^VrxYOPlaYj3kjwWkC@yuM;^d
z`E2gbl+{gC>5dcx(O6zlXCXmB&Eat-mg{-$XKX4nDaT0PP3G@7Veqa?EOW=1$zq
zQOF^INEnLFNtVz-3$JhU>^CU;WU-njj|b4TJeNq`rdaHMZD^WXv*S!N(paRSSC!Uw
zweUqNnV!Ny`4KDDoPD^g%$ksZl$-6>54J1Neo#yp$CSO=tgU$WvuE~g8TEETBpNCv
z1_y5!U6!C%B65ZOM}sa4xBGc63$L5zm^-c~vf0P(wclAQw2z4P#7BjbLW~JkcE%Y~
zF6z~kl^=KaDqVJ%nuFgKl1bu(RDWVZa
z>{z(4`Wa8=g9RxT_!$5fQoY6amNL)-c2PC!MxAJ#lne1Tw$qOD1QWBY*o2A6h27~o
zZ|+kz(MM(wjnLvJ9=tmISDs(dY~v`>0=8!JoJ7_oLVmx%b7j$-j($
zTvJBPIvJZ6%%3Ti10=ATBet
zlrezd{1++1?87h{;6hhXpi>Bmad&H#zgAI?fF&IERy0ta9_Z-t)9vjPGK;#0>6*4Z
z>c`93{kKwaz3beMR7LS2rUv;m!EXrmFoX(115(>;PCw3DSilulf9&u<3C-GtX?_Wv
zO?7a+gHvH~bko&$O>DQLujKMoEerub@V#Gd8_S|#V
z3<6&JbyUm4mo_#wuaca5>xc3PON`3a1LLLW_QXu+_ABYLmNeOQ^j@&}B#$1DTy`#4
zUb;C?6vD!VgEwKN2@iy;*Bsb>eaYj^pkRMY>_o@Zl|$_q={q_?F5eQ)*B%q}`q56?xoUdVQJ>Y|TX#EN4
z(Eq2yLg~?+^Sr6pEmc6W9~6>CxrA#~&>HuANY|v>>a_Mje28I~Cm0iDF0!cZ5z}H*
zzStSZpTGB>XGRqCM$cd2!P5V{oK<^(cp7(NU{UyxZ4z-cdAD!Itzye;n9#b?B@I_K
zP!@JzrexBXgh#4CU~UMR-?vDKhr+?3q-U|!I$R*8mHGFn`F!3`+Y?`9wO>-k*2hzM
z$aJka{Fn1GZtmEG^9&_S(vX}6FeOU=P2>UGA
zHhj1kHSz*0Y^5M$?iz5ltRfB~9nK`0M+zvUz;EL8a7@M(GDqwWCBc&JQyl6N9DUjIr-e7IA2Wb{X6
zm7>%g-IlsbM(rwRQMENX)`{vu4+lEJ+^MHWTIEvRFp1NhL1%)UYV;B>rEQQjYRq30zl<3e>OTM+kfMp=TCQog_aDzTVjj
z-+u=+^NML0Zca5x;+0DdwZ*AyM36@K>25vT!wr8a9Qxr@hi67p?*0*TF*QBiXvs>W
zp}N^T
z83obxn%>`T%zvxlpCWW1C19U@%n2)jy=kxyhR7iWDouX(KgXJ4%tsHkACOLT^LumH
zEy6oB5ES6!UQ|(oKL`Umts%K|YJJhNopw>`+{y2oxG`kwgE*5H)L)j4sVH_BMAG3`?x702!Xa1UwOr2S)v$fiz5@#Qb*fg(H+-nooIddg4@&Hcs4nDnOB_;#moK@@y?1VQ@D`(k!A^wLt3b2o>@^jve{!Ll^X<`t)c13DY7qky($O@t
z3i>Wlj1o*7`;sU<#_uLEe3oM_jtP&OuDkb>7+V6|9P1w>sI3_eyza&aYsa&V#oq;x
z$AVKbQ{b7V1^K<~Yce@SMy{504?4l)I&5$m`C$|0VvnL)4-?G>w<|YmwbdR592?*l
zq@CeiT}PQRS=r@sSxX7TvYHzwreBLF9d-xm-eAyvPTM?dFV=;AvaixzHer0jSYxZ$Zpj^}+$trnG$uif_QcmI!Za~N
z(+Xk#S&{|mpfEj`Rfek3ualO4E$CusjgYeF>ZFiQ#Saoee9_C(D+(gJs0?1MZnmc|
zwN;IHWs@CZMRbsGaAh#BsMOHZSm&JpZEa!hE*08#IxO=My>2`*su@-PH0r=*Cwz5@
zCULeV3il_&RMM}Q7WEZcF`1EB6_J5qUScs^@5jyxB#Hb8_J;|QnRUCfuWvtontx1l
zzMM|nL`U}-ZFDQq)iPIEX`zNQzecYaOis9@CfFl#O28j%0ONf0gyOfIVEzn=Nbtq>
zf??yC?#BA$qF7EMf4eWOR(`cmsRj9
zDKmJ^LlY8G%yinxjZk?{ihvfk%7x7nGXsvmdBxJOo{Y^`&Ww`H6kQraRbse_baf>B
zk!CnXxf!C0bUa(fNUF%6nxX8WB#wIp0zDg+_Pa*GmcsHFVdVLI9l(tnZIV>MvH
zs0`b=?3wU2m9|fs#`Kn-lpK5eB!c)>lil|oe0TrT|YppZUT_?B%p+ZqUw_A5|
zXb)>pp_3+2i#C5B^|kj!<##3gFR&)K>SUOjlP|u1Jt5SHkxLV;uM{xkY>SkdEWSIn
z6dd8*UbWw}g=5k;XAJwM^YsnsSUwWWIC#k{tYaUu6MA8YWFD6G;#ED4EQ64Mqh2)Bo-?_H`y8CdZ_F&x&*Z$hy=fAH>&JO8XBgCQ756sfU&S#N!F$R
zA^8f;q{XXkX3ye;D{}l`Z?uk?(0n(u$$cRTG|{rW7n62&3~Oa`THfRt_qr{)P`#9<
zlq2V&LAS!hrnT$lu)@@r(2FlJl*oo{jN^g*pF~+xFyznWS6H!ZwU*(kXcHZ
z+7Jzci_!X|i(jW-!8A+bQu{ZRZH(qOXO|9SplXTfjuWb75F7^Go2hZle;nGj21UO4
zY{x;^B!T;BAPhPj`kDutn5^!;>UFVco6ePo;0~TyB0fi!PEXNhBaeERIw;2Y|h=4YO*3_`Z!{vstc`}Cj8?q3h%75r<1jMUshn~N2`Oaq3Pi2A!Zl28H^;$A4wjI
z{euhD^%3I0(MS0E2nQjS$CPm_L7*v-LMy%gYsT5nTr;#TlI}t*vM;tpkOL%I37~?lGES2YbQnD>0zpSHF
zAaH@_s3`gYi~Yu5j5RAtlsE=OBhar&DH!d-RWN|5yifVD^HU?Zx(_7b@s_0ZQJp_+Gmbvp0cX0s
z26CF>i9V^clD}<GvgnmnQ^hP`Sof3c=gOI=_(-w;XBs@>OSNv~W5(Fn
zstjo-J6XTFN&hqv*YbCX`wqhAgBFqvC;}T)pNJ9ye}2wa7rxf-nq9Tl+jNtjlE(rYWX5=i
zcPauDkR`BxCC`X}$e4Lc8ZR<)TuqGyaJCXel$E{}f0I$t@7%^~!yhU%$=s0x5gPKv
zvo1k0Yu^cC^7qQGA5`R>-deDYeb~DDM!g_WyVB;pe;7^Vl}OJtYVUitky<1za#Yx0
zWyT#>{<&GN8hjwoT6euAcug=9Sazwtd46|_+@aRI-$>^jK#KiYL9;(tv14(eI1nu{
z=p=6aH{Hki*{?DI3y=Q!51-HLrjz#rR*E@XTdcWGaLZz~7qFLL@w9ty4vWk5swrQe
z@-z)hI>e`?$E2p38d^SCergI+BQXu3rPrJ2iD=g!^(L_JD;PpFK!;%*
z7-e?1$r)0^8XVik5=|iLIql!Zi0PvxWON|Mt;d96gJO&;{(!%m9X-kM0e^bjuEmk3
zb+kBxf-r>?rLf9Ta&jDVNlMgR>TLFBb3VkfxG^hyDU==h5pQNAzJlZp%<|U|=KRpU
zxMK93*7=y3p(PZa4(&`|Y~coL2Lau#l`*CQOm0W%_qW3V25W}DjcrEH#AG%c|A<+z5z%MOd#Y^<`L^bKCH?lk
zl_fITU~Db1afR=OIMGtGWX^aE*PB^Q1mi2OMr)t1ozDemoc`48ZrL(lee%rf=M8Q$7
z-Hq2OnICD2c4kgyXwZRBTU%^qR1J*{12`?$ulN}mHbttm_DeoJgoHZD+4dYB
z!VZmQ;=;^Vjxt{NPH~5eN))@jjMJ#;^@$E891nYm^?V-!EY3qCQy=iV%eQjdPlmCm
zpVhBf8mU$9#jrtP#b~mf-`ik6et2oKyh(8$hZfwQpS}sjF0n>X!^i+HN8bB^y_;x&
z33uI*8om?3?WeG}K{s46>UQ_O=DOK@74uL}^SIC`!f{8SFvSD+EhD~4xozZIxWK1<
z2P+kqJF+-bj%9ncVcNPfSg%6
zC`(QY!5i8U7UhNKu0GW(spe~>&eRfKrxx$?-@PAnHW-{@koc|<({eBO+hDFjcD>6&
zNhS`wI$M`AP_s
z0KZoO6(uV869Cs2T2CrZN>6G}3Qzh^I#1vyP2i*OByWUQ^pmp!y=Igxb?MgRq)Ncc
z#|MkS#I}H9KK@=V8FL8xQ#b`*QZz0>CA|GYlR1b?uU(aA5#88Gp~YPfb&LLD*LdXg
z$=`hI$;r2qgq1&*X8n6RV&~a_($n@*Of&(EPPIsAF>MJryctKOjG&|SOW|7v@_Y9S
z6XlN4tgO9Pb%pOt+cK*~f15NRY^c@S#I7Hkoy(d3MosxSoOzbzH&T|Ky|&Yc(|N|)
zLq{_S%~E`RC&NY^*s7G3C0glO=1uPYed>A=mb<`o$@S(FNp84*cT}rkhd)9GoT7DX
zJXP|m1da8_<<)YWnE0yJP_MhLV?GS2YmOiqKMbY5i)n{UY@;~$`DSg5`->cOI;-nf
zV}vj}evfhyY9p@~E+-8;%ss3G;Z$R1@uV9&1KtE2Y^kA4lv~ZEl?RM=%7udRoNA=g
zUh>PL;x;D4$vFq*>sEfO5j49hTdp#I1^MG8^>XSyfw1tLS5Nb6bwv;+6I<!(a6!aVtW{T-3>VVT^H6B$3Ax
zZd=Gb!aB{b*FVr18$8E@$a9TF+d@C^wD*BOVYk5n@A6$Nm4q*h&+${(Vh1d>x~gAB
zH=#fwwbsTt<(gT0kH>NLmhcx?RQv6whJDbr{nC@vh=cW3BDi(or1z|ccwEt!%n06#
zourb71VK9JgE?a&1*VDBrD9g<_X?x&y4TjDbv0+Eq7AvB3u)=;wSA@Y1|OQXtu-k*
zBiABCj1Y=8aQH>L;XEb^(tWdNJC-Nd)_hxzQvJy13)K~)zwS#A+UvMri_I2$NOF&e
zS8u78$L5kPAF=l6lB*Cu#T{jyHffm#ERHtX6hTy(ao@2e46LX-709AI<)7X!28)y?
z?suk+yceGxKg%-mXC9}Xoco>AzPcw8#j{#@e-d|Kx6DVjZb((+d)!!$%NX|4Hrl04
zXB>WX?sNEA&780BmKhvT8812l;Re|#N;^@XU!31`2NgkzoU|>Abq2pb?tAoRcdzBT
zLy-q_3*jg+45{fDKT*@UZ$t+?vY+HiwVUj0lWuFS-iHQ#hgMf5xA!h0FTe%~I=op{
zA@dK@S^P}}dUUD@Z=I8*vlL2XA2bMq7q4?5aVIS5?6!VQ>C7;KK?llNm>El!!28&Osk
zP;){JGlD*H9p)@~noZ33fk=@3YRrk?mCM1_l&W9C-n*B|b|uW}fkU6rk8&t;jcJ7z
z2P+sgM8>x)0tam)Z94HX7uy8p_OdI24Xd$T;zgjE0dt&eZ%$43e)DuBw-3crB-P|IuAJK
zq)dbRW#I8|=$<3-xyS@}d9KA7Lv_qcx|z;GqeN8|ef@3GR~Vm$SJdbrL%R$@#db#z
zltTQZeathvYUAi!&a*D_1-`q|0?8$mu$w{<2(7|tO--C%*%#7pLMav`jNVx@$8n#%
zHVv$DyKQ+i#0%rh-@oaX4kN^esbr!mK=rpcWYlJ;A!6c|!Nx*nhE$Y{-x&|%fJ6|?
ze{!Bu~Gd9GrD)47<7w5
zbC>VSR7Oo46Gji##vK%Wu@uv_$#ryGMklr+?&fhK^UE>lX<<c}pUU=0D`}MB$xw(zaW&`A|0d+?gQ{}Q$qLdX
zibK*-(ho98cfH&)w^uyO-A&iDXT(-H>w!CApCFX4A}m^Iz)s-oIT{tO(66
zK|^f+4i}DmR)Yx%R;Hh|SNotzkPwsQ$LGOiOm1|y#I`Lm;g#vNawH7({-$)^&4u;1
z`FaEKlMm;mgt|RWanA$l7yS*kBfa~Sylg6(Acl<46sP{4hVoCDx(2=3KC!0=Eu>=B
zl7z+7zk@|%7B~vA!VZX!_)G{CD)+6MCi6Yrq|-FG3z)(@Pv~FPouV~(qMhT!j-)Hm
zO9#NNq>M6CUafP-sO|=_=E18;FZz%Dc;qhXdN`4?T@CR6_AJb}hU)dMI3`@PJN&fW0D^h0M1h
zKzqa9*yN$FZfYUZscy2HOeEmfrz+Y?ntnqmUM`WIirwAU*;zIiLz;_TwDHbR>1tuW
zY5?sxOC$&5b9A3bw`F_Q3mLP3ib%WK9|no9_n!o<>ye@%I$as7{xh_^rva=6hDOvL
zEd=@ZJ9JGen4*uY{fx6g(GXvs_pBL0=N6u$W)f?!QuVG@D(y}bg?Z6BrO+>ikByq>
zZJv}o_6U;~_5FWd*B~3A(}=lRNKYk-@!UJOX3UM|9j}6)SRyP~XF94g
zrBZwF!{LUTo6N_qC}ax0%!KqvF)pjSc-NF;hMB*Y>@h|~{ov4%iRIHC4rAzcS82^O#^Fi6TZiZ2s1aU-ClUw#@9Qhmi)*NwAJ
zW-Fkp?kO4BV)`l}`OfJc`eym=5Lr2~hjUu5h~Zmit%f&8TSv+3RSbB^x@B#Lkputv
z`Q2rkt)qF;W=V-jH-y{SeCw7Ytjwu#Wi~fV&lW+uyuoPY==oy(4;d4EX!|TBu20G8
zS)R$NBd?tkpg6}oZ0eoE-5cS^RFEC-mzQZmk{=Sz{Sc`Ct=SBZRWP(jQYw!uQl$
zz@I9lKVwx#3l|B6&G!X$g&Ue?J|QpU7OnAD8tF(*TUpMhRCq4j>JHx@U0XAwE`$bL
zf@@?K814fol}0RQcN9GK4xR$6Rh)-;EqqGDa?$-t?^d5Wt$#61`e}Gn53M+b`k@)Y
zps8H4QA>g~TZe3^Gd{r-V2+-9^L=9*aA)eZV=^6#W$jVg<#XHN@hcIW8=exRW
zM+#A9wl0SsmB>L*}}?UY?~sp7dIG|pEY{q90{`FO*jmgzMp
zH+uP7-Nkc{hYN-@)72u^wzJbgS?ddbIUGfKsCRb=fu_z;w19%bmBQwUMqB?o;|z>0
z;Ymb8OXQ{1Tt&1V{c%uE55s#|etHBBg4x-}xD3$XNW%#kTKtCNh?*x6L8GTE`?u
zcDBL|>h(Gq1{5HpYu7_sOP(}`-ed3F&}08>Oy1;?4h($Gur;2mKI&0tZ36J?lHr9o
zdT93r8v4Msm(nDHiu*y=i@Z0YUXm!n1~N|vl*?-T{`<|%_fpe@3|Eau9aYuw)nVBK
zglnEb@TKda5koZUhBuid(Mv}o=pPnvsTpE!JabqBVo)R^i#(z2YG*W=-&Xb+wSM@t
zcUvqos{e?vt-2mtV5IFFw|!UCp`p+48@#13>0+O;AvfP3yZakx1Wpf!*ENke**>mpsF9ea}zXsVsTGdzPe_VkJ6*
zC`CNf-
zO=Z)PWcDG9)~W&A$xZBVWYf2F{wVah_QjK>JKyB`6E*ImJZkku$4s1YQ>O_}#(S+|
zbhVi`Xj7&$DFRZB-9vbyiMA%5NB!W5FImL#v&wI$VduuvH)EY;3xDMuH&tL_QTX$v
zHfRQdx6?<&!*boiiDq2}OISo0t{IP19K_$CufW;&|+
zypee@WxLBhh7H58&bjX5d?4=mSRX!>?ZfihP{nfHoX5DQLrSHzSoK}{)%OwEq#mw%
z_E-+^H1;dd+Lh}r=Q-S0)V1`k1{JAR4YvM$_dl+IJCxH#MOibN4oU{ID
z?Wmd(v+VeYs(*FcW>7f1oN*IXGFwg7mhstHP*Jg1C35mnh=NH-5OqX(4}I1ZAuIW7
z(g-V30FqKC13e)K=f`)fzUo5T+oQokHoqoIp`l$TWlM6>y;1$B(50`pmn*=3BZ9=V7iI~bB!P<+u_xIl
z`KQ-U;!lE4Lco_FXzAr#Vf9uIF1``m_`J$1US1U2xX1$$vN=y5xA^4{%jNoQSlM1@
zi3&vIDSaZ@7&Ck)5?^sRD}uaJ>G=JojP!0m&?B5i5}$I->Kp$eTR+C4?sa&$h7qE!
zbPK=XMJ1YT`46M3^DW70tRX<`Qt3zDcNfg7iv7uqVT1PwT#iD9j>^g%M;nKjuw)T4
zm%O_UZj0GiSn!>Oj5|X~UczzfF7|dU?DVE7tT&5^n_0`8@|dr+(ENgPHZG3YuIR4y
zBqnE!QKmlPmJuJOCZ46?NYtd5Bo~u3+KUOBiK36+y3C*bdTJGs@>4FjhBegs4xY4Y
z=a2!n89Ke8x%(g#8f$YPGj#Hk0%ZG{5w%GihHv~pE_-3|w2yy++G3oVOo9qVuP=H9
zwjg~a93o7O5f&5I_qu^^)3cZij$D-j*s&52wY-_~o#OnLsyo)7J5
zJ=KcTT2aysm}vEL3+hxQH<=1eP9lP>S&wwnBcJ14Mz-6vRKF$Ve#hk{*dDB`Nl_NH
zZ90c$6fGAtNP6LTFwiQ}3jFjCsYCmzI(sZfsAYVB_vn*e1xrAEw1tUo#_CHAF2C+_
zV@jCG1+>`VlA9C3Th)vcD+By&guSJKlmsq~9%ke0-+c8?xhcPlAR`jEs@VFm%jV7c
zR|y{sWh5{zHv4T?_Mm2!<{9Acb*#UC{w^}m6IEM_O5)KrE!Ui^HctH8FGM@JM%Vc^
zfLDI|s!++vi%j;w@y$%8?U*m32Nf&AOO}3|gtV|Z;wXHl?+|X~ahR9vqP00+g*dsW
zn3_40`B({*w6Sy!xW2G6>?hOJXt5Ob@aMhIi7-vICRQ_IFGG|NSK|C%M15m;WlhlS
zi6`d7wvCA=o{4Sa#I|RWiEZ1O*tR{fZJXzw_j~TW-~P3K?WcEjb#?XXRjarFh7es(
z9MAj{u!ETE1VeR0nPNLm(@lqyPeQO0d1+ssisMgaJw9qm%6l_XC}Cz0!jFd4Hr9BB
zM-`qLPgPc8JW~4p6zwNg{rHGl)E({%YD~SlRmb=RHIH6w(xR0UVnV?8iFarE<x4I
zT(dq?Q`by#dM*rBkf+9pUit*1Q14k9L7~o1ACdows~Tc+kSzM9Ap*seHnFRfi=UQ1
zSLZkDcmLNnxl*mwXK|s=(!iYksEK>DRkGQ@e3&KKdP%;t(hSJd*d^mIN5beJbsHwM
zz;({=V3y2N!Y==d<;?pp@3-?0HQo;gcq;0lSQED^$?2isziYLzBoWFPeNLkqI=U=(*={Z
zxtO5h0wXjsmj0cOFH6));7Oe!R;JZ=p5gOI;}Vvwd!o8Z$$l0Y)3Ze9a_-$wxAI5S
z8X@-VfSWnzC_{J|HXnjVD%{WlvofoNgnB&{q}TnmB0{+4y|Lsnr|
z$aS3G&xp5>*>#7OlB%{>JgPDUjCofQL7i%aXky+Z{%S+@6MAVXMKM|4&D-w{iyPl`
zy4{%r(iMe+c=y39pmb|QjV=?#nVY{^Ovk4M93N5^X7}|($DuBdb94{II8!FWPFL&DAmHE#!+B5c*G;*ZgidhHp@ZYJ{JwLij8UymBiC@mHZM?pr@?
zB9{*P>>FR_c110C6SW&^Bpz#6>+pn$3A)GU+EZC7
zD&|r@1~|A8Gv}l>HbbkPPgofRe$WVMJ0~Wwh57HobocY0pN+fw{H<>WqCVhrMu%_*
zA3B&I9a?*{E~RX)FC`0uc1G}0s`iEwcoU#WID&c8!tiipmQL*q!UlT-&E{R||2!M}
zF6u6zMs{*knu&VtpH)~20l7)EBm`ZI0UQrsLbhnWS?>bTtEvlv5sC4-4~xsn&aa1m
zfNq){YQzdHtz}svS1;o6Iqc3vj$XXR31ol-?7bhD>B@1%({HG(z_e6)AiNd
zDE1{?PWMBI+`MEXjONZ)R)ONm5&O0p{$32W$#wZR>jnkC5CB3?^ZVxe+C3z!TdVDl
z&yT|C)Ur}+9LNL$;4NXTo3n1{RU1mWuHNQLsEwWS&%B0-ob5%XP3
zmnQeWooaT?pQ}sr#j<~G`+PzjC`Q7pvq|Jn{tX???^P{=+|4h7
z`h?xHH>}8dCc%+T)MCXJWk~;EepDY3Z_G{9{uuOak0;Zwy7^l@{n@e@)p;iQ1EBwu
zaLw_k)gx^9uVNULf4;rh-28ns!&QPHsJWA7+4NqutvJt;;s*p2fC1V3ipRukY3Ba^
z-p4G6Scsa$?4?jEY#jS+1en1RJzz5v
z&R>2Ksoup~Ilhfi9O(A=(an21r7PU!{ubFeJ*IK#LnJ#`;QU9$5Qlo=ctV#zjHL4M
zpRU|n#yDoKf?aPHWi=gti>Gr(U6yHdh5~HKzL`s1TvoMU9bbubjyCW6c`jfq4_*Np
zuGE6Tp7^UNdNeugSvjvSi(4-hizjfn1OKyXIDfvn+cnuu#&$?O60cSYEuYme~$XC2L7xL2Hu*8!C6LA{oIkB
z0re|Uwp3ts`_%OYozD30J;{}k`Aetvbi{Q`5np)kI*#rP%bxgvducW?jHrJI+^(0wL*`nNpb^75ZRk1<7D(qhvklZ@?RuTE_}QCtAQ}5XwM|GJE*2zw=FaLk@7fWrz=kob1pz6H%=UJ~HOwQg`r=Tbq_U$ERU>
zEE*|Us~Y9@ChpRPY6lThvg%Dk%dDNf(=PEWWM_@OT#yiK+_ab$u!eBT6~bRLQ3}fD
zkN^>inzcN9IVct&E@A8A2$X*g)%c#dixoA;d)=6A0bhg8(KPkK90TLRIxIAg(!MJV
zGlS)bepY^`D*6I;x`cg=d>pUd`9JnPTa&4E({&t4-1uk7I2IKJT-~S8YDO7_fLxsl
z8O-?cfMqXi=KKXFx0Fy>s2?`w!aK;7jNDOmpkc`TN>`=>`_v0fzqoXTi=+(+Z}LgE
z6vG#nOlsIK&+?rIGT)yr)sc8Yhq|Wi;i6eaKKem9V;|vYFDDT?@n0FnT}QefczE3T
z)O_#bw6cIGF+wkIgU%!g8N!OGY>Oq8f8sl9g_o**)ZpwC!h-~K^)gW!ioI^#Kgosh
z&1lWO`QUBLb25*6rpudpJb5T(&AdUUqmH%(sZgEIBD;hLhpeP=KDE!kU&myRZKjKF
z-yUJ{{WBN*e)VI%xOvPe%2ExMvGcVcbTW3jVzK