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

Merge pull request #2743 from SkyMarshal/bleeding-edge-freeze

Browse Source 
Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors.
This commit is contained in:
Mloc
2013-05-08 11:27:37 -07:00
parent 849ec5052a 7118add9da
commit 5b13445e95
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/ZAS/Functions.dm
View File

@@ -63,6 +63,10 @@ proc/FloodFill(turf/simulated/start)
proc/ZMerge(zone/A,zone/B) proc/ZMerge(zone/A,zone/B)
if(!istype(A) || !istype(B))
return
//Merges two zones so that they are one. //Merges two zones so that they are one.
var var
a_size = A.air.group_multiplier a_size = A.air.group_multiplier
@@ -127,8 +131,6 @@ proc/ZConnect(turf/simulated/A,turf/simulated/B)
if(!A.zone || !B.zone) return if(!A.zone || !B.zone) return
if(A.zone == B.zone) return if(A.zone == B.zone) return
if(!A.CanPass(null,B,0,0)) return
if(A.CanPass(null,B,0,1)) if(A.CanPass(null,B,0,1))
return ZMerge(A.zone,B.zone) return ZMerge(A.zone,B.zone)

2
code/ZAS/Plasma.dm
View File

@@ -155,6 +155,8 @@ turf/Entered(obj/item/I)
//Items that are in plasma, but not on a mob, can still be contaminated. //Items that are in plasma, but not on a mob, can still be contaminated.
if(istype(I) && vsc.plc.CLOTH_CONTAMINATION) if(istype(I) && vsc.plc.CLOTH_CONTAMINATION)
var/datum/gas_mixture/env = return_air(1) var/datum/gas_mixture/env = return_air(1)
if(!env)
return
if(env.toxins > MOLES_PLASMA_VISIBLE + 1) if(env.toxins > MOLES_PLASMA_VISIBLE + 1)
if(I.can_contaminate()) if(I.can_contaminate())
I.contaminate() I.contaminate()