Ccomp5950 55ddbd10ff Merge pull request #6923 from mwerezak/climbing ...

Fixes #6660

2014-11-01 22:31:57 -04:00

..

__HELPERS

update IsGuestKey for webclient guests

2014-11-01 21:40:01 +00:00

_onclick

Ghost following double-click fix

2014-10-22 00:11:41 +01:00

ATMOSPHERICS

Merge pull request #6911 from mwerezak/he-pipes

2014-11-01 19:53:45 -04:00

controllers

Fixes chem splicing, bioluminescence and seed packets for xenobotany.

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

datums

Bunch of xeno fixes, details in PR.

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

defines

Merge

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

FEA

…

game

Merge pull request #6923 from mwerezak/climbing

2014-11-01 22:31:57 -04:00

js

…

modules

Merge pull request #6916 from Mloc/bs12-server

2014-11-02 04:47:26 +03:00

TriDimension

Merge pull request #6275 from RavingManiac/dev

2014-09-09 17:54:53 +04:00

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

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -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

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