Fixing conflicts

This commit is contained in:
Qustinnus
2017-07-19 11:19:52 +02:00
parent 58e5aa91da
commit 2312ff09be
14 changed files with 110 additions and 4 deletions
@@ -74,6 +74,7 @@
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
list_reagents = list("nutriment" = 5)
foodtype = RAW | MEAT | GROSS
/obj/item/organ/Destroy()