PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02: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

Merge branch 'dev' into PowerTwo

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

datums

Merge branch 'dev' into PowerTwo

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

defines

Merge

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

FEA

…

game

Merge branch 'dev' into PowerTwo

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

js

…

modules

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02: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

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