cib f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12 ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm

2012-08-06 13:36:26 -07:00

..

admin

Made the adminhelps sent to the IRC lack the HTML, and made PLASMAGUARD actually work.

2012-07-23 21:32:35 -07:00

assembly

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

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

chemical

modified: code/modules/chemical/Chemistry-Recipes.dm

2012-07-20 10:40:05 -05: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

More rigidly defined ZAS zone structures, so that connections work without flaw and rebuilding a zone will always produce the same shape. Also readded spess carp and fixed a compilation error.

2012-07-20 12:35:42 -07:00

customitems

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

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

DetectiveWork

Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second.

2012-07-20 22:04:00 -07: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

Merge branch 'cib' of github.com:CIB/Baystation12

2012-08-06 13:36:26 -07:00

paperwork

TG: Comitting for Giacom.

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

power

Partially fixed the double definition of BROKEN, renamed organ definitions

2012-07-13 23:42:05 +03:00

projectiles

Minor optimization to metroid/proc/get_obstacle_ok() and re-added Sky's beam optimization

2012-07-23 18:43:43 +03:00

recycling

Merging pull request from caelaislinn-master

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

research

Re-added deletion logging

2012-07-23 10:31:14 +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