Commit Graph

10 Commits

Author SHA1 Message Date
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