cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 03:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes dresses

Browse Source 
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.
This commit is contained in:
Cameron653
2016-12-11 18:27:23 -05:00
committed by GitHub
parent 43519bd446
commit 475f307753
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/under/solgov.dm
+1 -1
View File
@@ -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"