DJSnapshot 488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop ...

Conflicts:
	code/setup.dm

2014-06-23 00:25:39 -07:00

..

__HELPERS

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

2014-06-23 00:25:39 -07:00

_onclick

Fixes #5088

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

ATMOSPHERICS

…

controllers

Fix for a runtime.

2014-06-22 22:17:56 +04:00

datums

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

2014-06-23 00:25:39 -07:00

defines

Merge branch 'master' into dev

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

FEA

…

game

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

2014-06-23 00:25:39 -07:00

js

…

modules

Merge pull request #5308 from mwerezak/wound-infections

2014-06-22 22:04:25 +04:00

TriDimension

…

unused

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

WorkInProgress

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

2014-06-23 00:25:39 -07:00

ZAS

Nextgen lights #3: Fire

2014-06-19 00:16:19 +04: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 branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop

2014-06-23 00:25:39 -07:00

stylesheet.dm

…

world.dm

Fixes #4756

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