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

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2012-07-04 09:00:59 +01: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

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

2012-06-25 01:20:08 +01: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

TG: -Wallets now have sprites for holding silver head IDs and red Centcom IDs.

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

mob

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

2012-07-04 09:00:59 +01:00

paperwork

TG: Comitting for Giacom.

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

power

De-yellows blubs sligtly.

2012-06-29 02:25:57 +01: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

"Fixes" packages wrapping crates that are too large or too small.

2012-06-26 20:35:04 +01:00

research

anomlies now have an activated and non-activated sprite

2012-06-25 09:26:50 +10: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