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
@@ -46,7 +46,7 @@
/obj/item/trash/cheesie = 1,
/obj/item/trash/candy = 1,
/obj/item/trash/chips = 1,
/obj/item/trash/deadmouse = 1,
/obj/item/weapon/reagent_containers/food/snacks/deadmouse = 1,
/obj/item/trash/pistachios = 1,
/obj/item/trash/plate = 1,
/obj/item/trash/popcorn = 1,