From 76023710b329c566a97d7f9befa225d7e79f80e4 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 20 Jun 2021 14:14:04 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../vore/fluffstuff/custom_clothes_vr.dm      | 50 +------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index ca1692eacb..a33f549324 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2285,55 +2285,7 @@ Departamental Swimsuits, for general use
 	item_state = "veriesuit"
 
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|FEET|ARMS|HANDS
-End CHOMP Removal*/
 
-<<<<<<< HEAD
-||||||| parent of 89ed203456... Merge pull request #10635 from PastelPrinceDan/pandoracoat
-//PastelPrinceDan: Kiyoshi Maki
-/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing
-	name = "glowing cloak"
-	desc = "A fancy cloak with a RGB LED color strip along the trim, cycling through the colors of the rainbow."
-	icon = 'icons/vore/custom_clothes_vr.dmi'
-	icon_state = "rgb"
-	item_state = "rgb"
-	overlay_state = "rgb"
-	icon_override = 'icons/vore/custom_onmob_vr.dmi'
-	var/is_dark = FALSE
-
-/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/equipped()
-	..()
-	var/mob/living/carbon/human/H = loc
-	if(istype(H) && H.wear_suit == src)
-		icon_override = 'icons/vore/custom_onmob_vr.dmi'
-	update_clothing_icon()
-
-/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped()
-	icon_override = 'icons/vore/custom_onmob_vr.dmi'
-
-/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/proc/colorswap(mob/user)
-	if(user.canmove && !user.stat)
-		src.is_dark = !src.is_dark
-		if (src.is_dark)
-			icon_state = "rgbd"
-			item_state = "rgbd"
-			overlay_state = "rgbd"
-			to_chat(user, "The polychromic plates in your cloak activate, turning it black.")
-		else
-			icon_state = "rgb"
-			item_state = "rgb"
-			overlay_state = "rgb"
-			to_chat(user, "The polychromic plates in your cloak activate, turning it white.")
-		has_suit.update_clothing_icon()
-
-/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/verb/color_verb()
-	set name = "Swap color"
-	set category = "Object"
-	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
-
-	colorswap(usr)
-=======
 //PastelPrinceDan: Kiyoshi Maki
 /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing
 	name = "glowing cloak"
@@ -2425,4 +2377,4 @@ End CHOMP Removal*/
 				H.update_inv_wear_suit()
 	else
 		RemoveHood_evelyn()
->>>>>>> 89ed203456... Merge pull request #10635 from PastelPrinceDan/pandoracoat
+End CHOMP Removal*/