From f9aeef7bffd15a943ba2b89a5ced841f959c8a86 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 27 Dec 2016 08:23:46 -0500 Subject: [PATCH] Cleaning up some problems with the sync --- code/modules/clothing/under/solgov.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index f364a30ca50..6dc92e1238e 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -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"