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

..

admin

Merge pull request #1050 from Erthilo/TGUpdates

2012-05-14 08:51:37 -07:00

assembly

TG: Adds the framework for randomlly loading an additional external z-level at

2012-05-10 02:12:12 +01:00

chemical

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

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

clothing

New sprites for bomb suit, in-hands for pulse rifles, advances energy guns, and laser guns. Customs for sicktrigger, lexusjjss, and roaper. Changes to the MOTD to match the server and remove the changelog link.

2012-05-14 23:09:00 +01:00

critters

TG: (Might very possibly be broken. Didn't port most of the stuff due to it having been rewritten. - Erthilo)

2012-05-06 22:53:39 +01:00

customitems

New sprites for bomb suit, in-hands for pulse rifles, advances energy guns, and laser guns. Customs for sicktrigger, lexusjjss, and roaper. Changes to the MOTD to match the server and remove the changelog link.

2012-05-14 23:09:00 +01:00

DetectiveWork

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

flufftext

Merge fixes.

2012-04-26 18:35:15 +01:00

food

TG: -Added chawanmushi recipe and beet soup recipes. Added a trash plate to metroid

2012-05-05 23:50:34 +01:00

maps

TG: Adds the framework for randomlly loading an additional external z-level at

2012-05-10 02:12:12 +01:00

mining

TG: Tonnes of stuff, please check the changelog.

2012-05-06 18:26:41 +01:00

mob

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

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

paperwork

TG: Some fixes for topic calls and inputs.

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

power

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

projectiles

Merge pull request #1059 from Erthilo/master

2012-05-14 15:20:31 -07:00

recycling

Map changes. Some improvements/adjustments to code to work with the map changes.

2012-05-09 14:36:01 -07:00

research

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

scripting

TG: More work done on Telecomms:

2012-04-24 21:13:55 +01:00

security levels

…