Merge resolution.

This commit is contained in:
Zuhayr
2014-12-13 23:10:46 +10:30
29 changed files with 411 additions and 413 deletions
+1 -1
View File
@@ -507,7 +507,7 @@ var/global/list/gear_datums = list()
/datum/gear/labcoat
display_name = "labcoat"
path = /obj/item/clothing/suit/storage/labcoat
path = /obj/item/clothing/suit/storage/toggle/labcoat
cost = 3
slot = slot_wear_suit