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

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Ccomp5950
2014-01-23 00:19:01 -06:00
parent 23f4d34e4b c028db481e
commit 283df26fa7
22 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/ZAS/ZAS_Zones.dm
View File

@@ -27,12 +27,6 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
var/interactions_with_unsim = 0
var/progress = "nothing"
/datum/gas_mixture/zone
Del()
CRASH("Something tried to delete a zone's air!")
. = ..()
//CREATION AND DELETION
/zone/New(turf/start)
. = ..()
@@ -53,7 +47,7 @@ var/list/CounterDoorDirections = list(SOUTH,EAST) //Which directions doors turfs
//Generate the gas_mixture for use in txhis zone by using the average of the gases
//defined at startup.
//Changed to try and find the source of the error.
air = new /datum/gas_mixture/zone()
air = new
air.group_multiplier = contents.len
for(var/turf/simulated/T in contents)
if(!T.air)