Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

__HELPERS

Replaces long check with lots of get_organ calls with shorter one.

2013-11-08 04:15:49 +04:00

_onclick

Hud icons will now also update with their usual icons and states

2013-11-23 04:43:45 -06:00

ATMOSPHERICS

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

controllers

Fix for reported issue with the transfer_controller causing a runtime error. Also included is a debug controller for the transfer_controller

2013-11-21 17:44:31 -08:00

datums

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

2013-11-24 23:37:09 +00:00

defines

Cash money.

2013-10-21 05:04:45 +03:00

FEA

…

game

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

2013-11-24 23:37:09 +00:00

js

…

modules

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

2013-11-24 23:37:09 +00:00

TriDimension

…

unused

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

WorkInProgress

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

2013-11-24 23:37:09 +00:00

ZAS

Merge pull request #3864 from comma/master

2013-11-03 08:33:03 -08:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Merge branch 'dev-freeze' into dev

2013-10-10 14:37:41 +04:00

stylesheet.dm

…

world.dm

…