Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl

2014-07-18 13:15:30 +00:00

..

__HELPERS

…

_onclick

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

2014-07-16 19:30:41 +09:30

ATMOSPHERICS

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

controllers

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

2014-07-16 19:30:41 +09:30

datums

Now allows admin override via player panel, a small fix, and...

2014-07-14 19:02:21 -04:00

defines

Deluxe soap now has a more pleasant range of smells.

2014-07-17 12:54:51 +02:00

FEA

…

game

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

2014-07-18 13:15:30 +00:00

js

…

modules

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

2014-07-18 13:15:30 +00:00

TriDimension

…

unused

…

WorkInProgress

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

2014-07-16 19:30:41 +09:30

ZAS

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

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

2014-07-17 20:57:06 +09:30

stylesheet.dm

…

world.dm

…