Fixes conflicts, conflicts.

This commit is contained in:
Mieszko Jędrzejczak
2016-07-10 12:45:36 +02:00
957 changed files with 9560 additions and 8815 deletions
@@ -13,4 +13,8 @@
/datum/gear/lipstick/red
display_name = "lipstick, red"
path = /obj/item/weapon/lipstick
path = /obj/item/weapon/lipstick
/datum/gear/monocle
display_name = "monocle"
path = /obj/item/clothing/glasses/monocle