Cleaning up some problems with the sync

This commit is contained in:
Cameron653
2016-12-27 08:23:46 -05:00
committed by GitHub
parent 9c359cb202
commit f9aeef7bff
+1 -1
View File
@@ -212,7 +212,7 @@
worn_state = "greenservice_com"
//Dress
/obj/item/clothing/under/dress/plain //VORESTATION EDIT (Note: A conflict will occur here. Just remove this note & VS edit next sync.)
/obj/item/clothing/under/dress/plain
name = "dress uniform"
desc = "A dress uniform of some kind."
icon_state = "greydress"