cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens)

Browse Source 
Fixes #3059
This commit is contained in:
SkyMarshal
2013-06-13 18:20:42 -07:00
parent 1739ff6fec
commit 1f886448b6
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
code/ZAS/Functions.dm
View File

@@ -81,28 +81,43 @@ proc/ZMerge(zone/A,zone/B)
if(!istype(A) || !istype(B)) if(!istype(A) || !istype(B))
return return
//Merges two zones so that they are one.
var/a_size = A.air.group_multiplier
var/b_size = B.air.group_multiplier
var/c_size = a_size + b_size
var/new_contents = A.contents + B.contents var/new_contents = A.contents + B.contents
//Set air multipliers to one so air represents gas per tile.
A.air.group_multiplier = 1
B.air.group_multiplier = 1
//Remove some air proportional to the size of this zone.
A.air.remove_ratio(a_size/c_size)
B.air.remove_ratio(b_size/c_size)
//Merge the gases and set the multiplier to the sum of the old ones.
A.air.merge(B.air)
A.air.group_multiplier = c_size
//Set all the zone vars. //Set all the zone vars.
for(var/turf/simulated/T in B.contents) for(var/turf/simulated/T in B.contents)
T.zone = A T.zone = A
if(istype(A.air) && istype(B.air))
//Merges two zones so that they are one.
var/a_size = A.air.group_multiplier
var/b_size = B.air.group_multiplier
var/c_size = a_size + b_size
//Set air multipliers to one so air represents gas per tile.
A.air.group_multiplier = 1
B.air.group_multiplier = 1
//Remove some air proportional to the size of this zone.
A.air.remove_ratio(a_size/c_size)
B.air.remove_ratio(b_size/c_size)
//Merge the gases and set the multiplier to the sum of the old ones.
A.air.merge(B.air)
A.air.group_multiplier = c_size
//I hate when the air datum somehow disappears.
// Try to make it sorta work anyways. Fakit
else if(istype(B.air))
A.air = B.air
A.air.group_multiplier = A.contents.len
else if(istype(A.air))
A.air.group_multiplier = A.contents.len
//Doublefakit.
else
A.air = new
//Check for connections to merge into the new zone. //Check for connections to merge into the new zone.
for(var/connection/C in B.connections) for(var/connection/C in B.connections)
//The Cleanup proc will delete the connection if the zones are the same. //The Cleanup proc will delete the connection if the zones are the same.