Chinsky 3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo ...

Ports /tg/'s cable and powernet code

2014-10-26 23:54:31 +03:00

..

__HELPERS

Changes dd_sortedObjectList() to use mergesort with cached sort values

2014-10-25 18:22:15 +01:00

_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

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

datums

Merge pull request #6651 from PsiOmegaDelta/PowerTwo

2014-10-26 23:54:31 +03:00

defines

Merge

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

FEA

…

game

Merge pull request #6651 from PsiOmegaDelta/PowerTwo

2014-10-26 23:54:31 +03:00

js

…

modules

Merge pull request #6651 from PsiOmegaDelta/PowerTwo

2014-10-26 23:54:31 +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 branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

ZAS

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

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

global.dm

Converts all machines relying on RandomAPCWires() to the new wire datum system.

2014-10-13 21:46:45 +02:00

hub.dm

…

names.dm

…

setup.dm

Bunch of xeno fixes, details in PR.

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

stylesheet.dm

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

2014-09-29 06:19:26 +09:30

world.dm

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

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