Merge branch 'bleeding-edge-freeze' into organ

Conflicts:
	html/changelog.html
This commit is contained in:
Chinsky
2013-06-01 18:33:58 +04:00
424 changed files with 37298 additions and 25638 deletions
+3
View File
@@ -11,6 +11,9 @@
proc/receive_chem(chemical as obj)
return 0
/datum/organ/proc/get_icon()
return icon('icons/mob/human.dmi',"blank")
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
//New are added for reagents to random organs.