Albert Iordache dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm

2012-07-13 20:58:48 +03:00

..

admin

Fixes extra description damage values.

2012-06-29 02:32:32 +01:00

assembly

TG: Added checks for the player being dead, stunned, unconcious ect... to:

2012-06-14 17:15:58 +01:00

chemical

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

client

Abi's request

2012-06-20 13:05:06 +01:00

clothing

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

2012-06-21 13:35:34 -07:00

critters

TG: Fixes a pesky compile error in my last commit.

2012-06-23 15:10:49 +01:00

customitems

Added Jamini and Cubejackal's custom items. I hope.

2012-06-29 16:44:03 +01:00

DetectiveWork

Temp/quick/hotfix for evidence bags.

2012-06-27 23:36:55 +01:00

flufftext

TG: - Deleted ERP.dmi

2012-06-07 02:41:38 +01:00

food

TG: - Added a cookie food type, which cannot be made ingame

2012-06-23 15:49:05 +01:00

icon generation

Adding some (currently unused) icon generation stuff

2012-05-30 17:54:33 -04:00

maps

More while loop stuff, removed shitloads of unnecessary curly brackets in the map reader, fixed ED-209 projectiles

2012-06-22 14:10:48 -07:00

mining

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

mob

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

paperwork

TG: Comitting for Giacom.

2012-06-23 16:42:37 +01:00

power

Fixed bugs in the wire limb repair message.

2012-07-07 11:13:53 +02:00

projectiles

TG: Not a whole lot going on in this commit, just more work on preparation for the

2012-06-23 14:59:54 +01:00

recycling

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

research

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

2012-07-13 20:58:48 +03:00

scripting

TG: Not a whole lot going on in this commit, just more work on preparation for the

2012-06-23 14:59:54 +01:00

security levels

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

2012-06-21 13:35:34 -07:00