Merge remote-tracking branch 'upstream/master' into lootdrop

This commit is contained in:
Fox-McCloud
2015-06-05 18:10:30 -04:00
44 changed files with 14331 additions and 382 deletions
@@ -209,6 +209,14 @@ var/global/list/image/splatter_cache=list()
break
/obj/effect/decal/cleanable/blood/old/New()
..()
dry()
/obj/effect/decal/cleanable/blood/gibs/old/New()
..()
dry()
/obj/effect/decal/cleanable/mucus
name = "mucus"
desc = "Disgusting mucus."