Merge branch 'master' into upstream-merge-31737

This commit is contained in:
Poojawa
2017-10-21 07:18:14 -05:00
committed by GitHub
591 changed files with 181531 additions and 178280 deletions

View File

@@ -37,7 +37,7 @@
/obj/item/organ/zombie_infection/on_find(mob/living/finder)
to_chat(finder, "<span class='warning'>Inside the head is a disgusting black \
web of pus and vicera, bound tightly around the brain like some \
web of pus and viscera, bound tightly around the brain like some \
biological harness.</span>")
/obj/item/organ/zombie_infection/process()