From 475f307753daa4e478891e44787ebb7cdb0445b7 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 11 Dec 2016 18:27:23 -0500 Subject: [PATCH] Fixes dresses Ports over https://github.com/PolarisSS13/Polaris/commit/301f97a2b388e579fe998a95dce08b5416523834 Instead of syncing (Which would take longer) I'm just manually putting the bugfix in. This will cause a conflict with the next sync, but all that needs to be done is the comment I put in taken out (Along with the heading in github when a conflict occurs) and it'll work fine. I'll solve the conflict next time we sync next month. --- 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 cb5cbf27b2..f364a30ca5 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 +/obj/item/clothing/under/dress/plain //VORESTATION EDIT (Note: A conflict will occur here. Just remove this note & VS edit next sync.) name = "dress uniform" desc = "A dress uniform of some kind." icon_state = "greydress"