Merge remote-tracking branch 'upstream/master' into tail-markings

This commit is contained in:
KasparoVy
2016-07-17 19:25:03 -04:00
255 changed files with 5258 additions and 1996 deletions
@@ -32,6 +32,7 @@
/obj/item/organ/internal/eyes/luminescent_crystal/New()
set_light(2)
..()
/obj/item/organ/internal/brain/crystal
name = "crystalized brain"