Chinsky 3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm

2014-10-20 04:52:45 +04:00

..

__HELPERS

Merg resolution.

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

_onclick

HUD overlay improvements

2014-10-17 20:27:40 +02:00

ATMOSPHERICS

fixes #6299

2014-10-13 20:35:56 +01:00

controllers

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-10-16 13:39:00 +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 branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev

2014-10-20 04:52:45 +04:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev

2014-10-20 04:52:45 +04: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

Non-drone silicons now have access to a basic security xor medical hud.

2014-08-28 20:01:43 +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