Commit Graph

14 Commits

Author SHA1 Message Date
PsiOmega
9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
mwerezak
17a84d9dd3 Hotfix for #9235
Hotfix for master
2015-06-13 13:37:37 -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
277103f1cd Fixes tiny door zones
Fixes #8987 by deferring the update of self-zone-blocked turfs until after non-self-zone-block turfs have updated (and thus have valid zones).
2015-04-29 13:01:26 -04:00
PsiOmega
eca7569077 Clean server start.
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
2015-04-18 15:32:25 +02:00
Mloc-Argent
debba68c44 add sleeping for ZAS connection edges
Edges will sleep and fully balance if compare() passes.
also some small small xgm tweaks.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-21 20:35:40 +00: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
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Aryn
6c91d220b8 Added code protecting against obscure merges of invalid zones.
- Usually happened when welding fuel tanks caused secondary explosions.
2014-02-22 08:45:31 -07:00
Aryn
d0c0315d53 Added documentation, split ConnectionManager.dm, removed some unused procs.
Added a proc to find the other zone in an edge for future procs.
Fixed the stupid .int again.
2014-02-21 08:39:04 -07:00
Aryn
0089ae6282 Fixed some weird bugs concerning space and the creation thereof. 2014-02-21 08:39:04 -07:00
Aryn
0814bdb36f Added some documentation. 2014-02-19 18:24:37 -07:00
Aryn
a2d992ef5c Fixed inexplicable reversions. 2014-02-19 17:11:09 -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