Erthilo 496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2012-05-15 00:51:50 +01:00

..

ATMOSPHERICS

Fixes a runtime.

2012-05-14 10:17:34 -07:00

datums

TG: Some fixes for topic calls and inputs.

2012-05-10 03:02:56 +01:00

defines

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-15 00:51:50 +01:00

FEA

Bugfixes for some temperature sharing, added variable editing by reference, fixed up some wound stuff.

2012-05-13 23:18:02 -07:00

game

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-15 00:51:50 +01:00

js

…

modules

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-05-15 00:51:50 +01:00

unused

Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.

2012-05-11 18:02:30 -07:00

WorkInProgress

Add the capability for the NT chatbot pAI to use the PDA's messaging function instead of the system it had been. Also, several bugfixes for runtimes.

2012-05-14 12:19:15 -07:00

ZAS

Unreverts ZAS fix.

2012-04-11 18:32:32 +01:00

names.dm

…

setup.dm

Some more work on FEA, WIP FEA/ZAS work, does not effect the game currently.

2012-05-11 18:06:21 -07:00

stylesheet.dm

Reverts sdisability vars, centcom uniform changes, removed nuke radio colour, command colour, job shuffling.

2012-04-25 19:10:30 +01:00