DJSnapshot 4219b597b6 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/customitems/item_defines.dm

2014-01-10 13:52:07 -08:00

..

__HELPERS

Fixed a major bug. Improved speed further.

2014-01-09 10:25:48 +00:00

_onclick

Made the follow verb less buggy.

2014-01-08 19:14:15 +00:00

ATMOSPHERICS

Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.

2014-01-08 21:36:03 -07:00

controllers

Merge pull request #4234 from Mloc/bs12-quicklist

2014-01-10 11:55:33 -08:00

datums

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

defines

Optimizations of PDA NanoUI

2013-12-28 19:38:14 -06:00

FEA

…

game

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

2014-01-10 13:52:07 -08:00

js

…

modules

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

2014-01-10 13:52:07 -08:00

TriDimension

…

unused

Revert "Merge pull request #3965 from jack-fractal/dev"

2013-11-25 11:59:57 +00:00

WorkInProgress

Merge pull request #4237 from Mloc/bs12-tgstuff

2014-01-09 22:33:28 -08:00

ZAS

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2014-01-09 17:42:30 +00:00

global.dm

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

hub.dm

Uncomments books. Generifies mentions of tg or baystation.

2013-09-02 18:24:11 +01:00

names.dm

…

setup.dm

Implemented IS_SLOW.

2014-01-06 00:13:49 +10:30

stylesheet.dm

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

2014-01-10 13:52:07 -08:00

world.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00