Chinsky 44a01be13f Merge pull request #6856 from Baystation12/dev-freeze ...

Freeze - Dev

2014-10-26 09:41:07 +03:00

..

__HELPERS

Merg resolution.

2014-10-02 02:33:06 +09:30

_onclick

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

2014-10-24 09:12:02 +10:30

ATMOSPHERICS

fixes #6299

2014-10-13 20:35:56 +01:00

controllers

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

datums

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

defines

Merge

2014-10-11 13:58:16 -04:00

FEA

…

game

Merge pull request #6856 from Baystation12/dev-freeze

2014-10-26 09:41:07 +03:00

js

…

modules

Merge pull request #6856 from Baystation12/dev-freeze

2014-10-26 09:41:07 +03:00

TriDimension

…

unused

Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.

2014-10-12 11:48:54 +10:30

WorkInProgress

Merge pull request #6791 from Zuhayr/dev

2014-10-21 01:13:17 +04:00

ZAS

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

2014-10-15 22:13:44 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Bunch of xeno fixes, details in PR.

2014-10-13 17:32:13 +10:30

stylesheet.dm

…

world.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

2014-10-15 10:05:50 +10:30