Chinsky fff3622386 Merge pull request #6884 from PsiOmegaDelta/LobbyVote ...

Fixes #6881

2014-10-30 22:13:32 +03:00

..

__HELPERS

Changes dd_sortedObjectList() to use mergesort with cached sort values

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

_onclick

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

2014-10-29 19:17:35 +01:00

ATMOSPHERICS

Gas heaters heat faster

2014-10-26 15:16:28 -04:00

controllers

Fixes #6881

2014-10-29 15:19:35 +01:00

datums

Merge pull request #6857 from mwerezak/hoverpod

2014-10-29 06:31:20 +03:00

defines

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

2014-10-29 19:17:35 +01:00

FEA

…

game

Merge pull request #6882 from PsiOmegaDelta/JobController

2014-10-30 22:13:19 +03:00

js

…

modules

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

2014-10-29 19:17:35 +01: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 #6865 from PsiOmegaDelta/PDA

2014-10-29 06:30:54 +03:00

ZAS

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

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

global.dm

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

2014-10-26 22:02:24 +01:00

hub.dm

…

names.dm

…

setup.dm

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

2014-10-29 19:17:35 +01:00

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