Zuhayr
589aecd40e
Merge pull request #9691 from Baystation12/master
...
master into dev-freeze
2015-06-05 21:41:58 +09:30
mwerezak
8b11ad89f7
Corrects comment, multiz stub, no-zone default
2015-06-02 23:49:06 -04:00
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
mwerezak
1d5c971a45
Fixes #9452
2015-05-26 22:34:06 -04:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
mwerezak
03e88ca9a5
Updates locate(/obj/machinery/door/airlock) hack
2015-04-29 20:53:50 -04:00
mwerezak
fbede7a193
Minor ZAS-related cleanup
2015-04-28 23:00:56 -04:00
PsiOmega
1daf0abe3d
Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds.
2015-04-16 14:23:19 +02:00
Mloc-Argent
4160488ed1
fix gas overlays persisting after rebuilds
...
slight visual artifact when zones are rebuilt, overlays will be
missing until the end of the current tick. otherwise works fine.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-30 20:51:59 +01:00
Mloc-Argent
8a92fffdc2
updating turf gas overlays is now delta-based
...
Fixes issues with mine turfs and other turfs that use overlays.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-11 20:13:10 +01:00
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
Mloc-Argent
da89c36cde
atmos: fix a geometry error
...
reverse_dir is a list of reversed dir fields
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-06-23 20:58:10 +01:00
Ravensdale
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
Ravensdale
1d6655850f
Changes all appropriate instances of toxins to phoron
2014-04-10 15:11:26 -07:00
Mloc-Argent
9b19d7dacf
atmos: remove a few force-deletes in merge code
...
Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-04-07 17:28:09 +01:00
Aryn
dcc7ad33c9
Zones didn't split when a full window was placed.
2014-02-22 08:02:10 -07:00
Aryn
0089ae6282
Fixed some weird bugs concerning space and the creation thereof.
2014-02-21 08:39:04 -07:00
Aryn
4c27af0bb9
Added Z-level support.
2014-02-21 08:38:44 -07:00
Aryn
c9b9b18807
Removed debugging flag.
2014-02-19 18:28:32 -07:00
Aryn
6fbe320f88
Fixed bugs pertaining to connection updates.
...
- Unanchored windows did not split zones.
- Phantom connections left behind by closed doors.
2014-02-19 18:26:04 -07:00
Aryn
83fdc0942c
Completed arduous process of standardizing new code.
2014-02-19 16:56:53 -07:00
Aryn
bc971b01ea
New ZAS version, stable and efficient. Git broke the everything so it's in one commit.
2014-02-19 16:47:53 -07:00