powder that makes you say yes

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -2478,35 +2478,6 @@ Departamental Swimsuits, for general use
 	icon_state = "champion"
 	item_state = null // i swear to god this works - hatterhat
 	icon_override = 'icons/vore/custom_onmob_vr.dmi'
-<<<<<<< HEAD
-	
-//Sudate: Shea Corbett
-/obj/item/clothing/under/fluff/greek_dress
-    name = "mytilenean dress"
-    desc = "It's a breezy, colorful two-part dress woven from linen, with the top consisting of white linen, and the skirt of rougher, sturdy fabric. It's adorned with a yellow belt and embroidered stripes in the hem, and blue highlights at the sleeves. More notably, however, it exposes the wearer's chest entirely."
-
-    icon = 'icons/vore/custom_clothes_vr.dmi'
-    icon_state = "greek_dress"
-    worn_state = "greek_dress"
-    rolled_sleeves = 0
-    rolled_down = 0
-
-    icon_override = 'icons/vore/custom_clothes_vr.dmi'
-    item_state = "greek_dress"
-    body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
-//JadeManique: Freyr
-/obj/item/clothing/mask/fluff/freyr_mask
-    name = "Freyr's Mask"
-    desc = "A pristine white mask with antlers. Its silky to the touch, like porcelain!"
-    icon = 'icons/vore/custom_clothes_vr.dmi'
-    icon_state = "freyrmask"
-    icon_override = 'icons/vore/custom_onmob_vr.dmi'
-    item_state = "freyrmask_mob"
-    item_state_slots = null
-    body_parts_covered = FACE
-
-End CHOMP Removal*/
-=======
 
 //Sudate: Shea Corbett
 /obj/item/clothing/under/fluff/greek_dress
@@ -2558,4 +2529,4 @@ End CHOMP Removal*/
 	icon_override = 'icons/vore/custom_onmob_vr.dmi'
 	item_state = "perrinrobes_s"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
->>>>>>> d581f637fe... Merge pull request #14004 from Heroman3003/perrin-fluff
+End CHOMP Removal*/