PsiOmega e0796caf56 Fixes #6871. Fixes #6821. ...

Amended to match the formatting in #6846, to hopefully avoid merge issues.

2014-10-28 18:46:11 +01:00

..

__HELPERS

Merg resolution.

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

_onclick

Ghost following double-click fix

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

ATMOSPHERICS

fixes #6299

2014-10-13 20:35:56 +01: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

Fixes #6871. Fixes #6821.

2014-10-28 18:46:11 +01:00

js

…

modules

Merge pull request #6830 from Glloyd/fixes

2014-10-24 09:16:13 +10:30

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

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