mwerezak 25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle ...

Conflicts:
	code/setup.dm

2014-06-24 00:09:17 -04:00

..

__HELPERS

Merge pull request #5297 from comma/fancy

2014-06-20 20:30:11 -05:00

_onclick

Fixes #5088

2014-06-17 20:35:48 +01:00

ATMOSPHERICS

…

controllers

Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

2014-06-24 00:09:17 -04:00

datums

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

2014-06-20 22:02:40 +01:00

defines

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

FEA

…

game

Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

2014-06-24 00:09:17 -04:00

js

…

modules

Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

2014-06-24 00:09:17 -04:00

TriDimension

…

unused

shuttle_controller now uses a shuttle datum

2014-06-22 18:10:56 -04:00

WorkInProgress

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

2014-06-23 20:57:47 +01:00

ZAS

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

2014-06-23 20:57:47 +01:00

global.dm

reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors

2014-06-19 11:06:20 +10:00

hub.dm

…

names.dm

…

setup.dm

Merge remote-tracking branch 'upstream/dev' into emergency-shuttle

2014-06-24 00:09:17 -04:00

stylesheet.dm

…

world.dm

Fixes #4756

2014-06-17 17:25:57 +01:00