From 2d753d59fc83ad37aab28b44f765d06aaf1adf02 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Fri, 4 Oct 2024 20:49:37 +0200
Subject: [PATCH] color check that (#9150)

---
 code/modules/food/glass/bottle_potion.dm      |  5 ++--
 .../species/station/traits_vr/neutral.dm      |  6 ++---
 .../simple_mob/subtypes/vore/goia_ch.dm       | 24 +++++++++----------
 code/modules/persistence/effects/filth.dm     |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index d7b8f6b7aa..c85ad107d3 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -90,12 +90,12 @@
 /obj/item/reagent_containers/glass/bottle/potion/girljuice
 	name = "girl transformation potion"
 	desc = "A small green bottle containing some pretty pink liquid that claims to turn the drinker into a woman."
-	prefill = list("gynorovir" = 1)
+	prefill = list("change_drug_female" = 1) // CHOMPEdit
 
 /obj/item/reagent_containers/glass/bottle/potion/boyjuice
 	name = "boy transformation potion"
 	desc = "A small green bottle containing some strong blue liquid that claims to turn the drinker into a man."
-	prefill = list("androrovir" = 1)
+	prefill = list("change_drug_male" = 1) // CHOMPEdit
 
 /obj/item/reagent_containers/glass/bottle/potion/badpolymorph
 	name = "unstable polymorph potion"
@@ -153,4 +153,3 @@
 	name = "volatile potion"
 	desc = "A small green bottle containing some volatile purple liquid."
 	prefill = list("phoron" = 10)
-
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index e40181ea44..5d3ed2a026 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -180,9 +180,9 @@
 	H.trait_injection_reagents += "macrocillin"		// get BIG
 	H.trait_injection_reagents += "normalcillin"	// normal
 	H.trait_injection_reagents += "numbenzyme"		// no feelings
-	H.trait_injection_reagents += "androrovir" 		// -> MALE
-	H.trait_injection_reagents += "gynorovir" 		// -> FEMALE
-	H.trait_injection_reagents += "androgynorovir" 	// -> PLURAL
+	H.trait_injection_reagents += "change_drug_male"		// -> MALE // CHOMPEdit
+	H.trait_injection_reagents += "change_drug_female"		// -> FEMALE // CHOMPEdit
+	H.trait_injection_reagents += "change_drug_intersex"	// -> PLURAL // CHOMPEdit
 	H.trait_injection_reagents += "stoxin"			// night night chem
 	H.trait_injection_reagents += "rainbowtoxin" 	// Funny flashing lights.
 	H.trait_injection_reagents += "paralysistoxin" 	// Paralysis!
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm
index 80626b3e6e..5972c6940a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm
@@ -277,18 +277,18 @@
 	add_verb(src,/mob/living/proc/injection) //Poison sting c:
 	add_verb(src,/mob/living/simple_mob/vore/zorgoia/proc/export_style)
 	add_verb(src,/mob/living/simple_mob/vore/zorgoia/proc/import_style)
-	src.trait_injection_reagents += "microcillin"		// get small
-	src.trait_injection_reagents += "macrocillin"		// get BIG
-	src.trait_injection_reagents += "normalcillin"	// normal
-	src.trait_injection_reagents += "numbenzyme"		// no feelings
-	src.trait_injection_reagents += "androrovir" 		// -> MALE
-	src.trait_injection_reagents += "gynorovir" 		// -> FEMALE
-	src.trait_injection_reagents += "androgynorovir" 	// -> PLURAL
-	src.trait_injection_reagents += "stoxin"			// night night chem
-	src.trait_injection_reagents += "rainbowtoxin" 	// Funny flashing lights.
-	src.trait_injection_reagents += "paralysistoxin" 	// Paralysis!
-	src.trait_injection_reagents += "painenzyme"		// Pain INCREASER
-	src.trait_injection_reagents += "aphrodisiac"		// Horni
+	src.trait_injection_reagents += "microcillin"			// get small
+	src.trait_injection_reagents += "macrocillin"			// get BIG
+	src.trait_injection_reagents += "normalcillin"			// normal
+	src.trait_injection_reagents += "numbenzyme"			// no feelings
+	src.trait_injection_reagents += "change_drug_male"		// -> MALE
+	src.trait_injection_reagents += "change_drug_female"	// -> FEMALE
+	src.trait_injection_reagents += "change_drug_intersex"	// -> PLURAL
+	src.trait_injection_reagents += "stoxin"				// night night chem
+	src.trait_injection_reagents += "rainbowtoxin" 			// Funny flashing lights.
+	src.trait_injection_reagents += "paralysistoxin" 		// Paralysis!
+	src.trait_injection_reagents += "painenzyme"			// Pain INCREASER
+	src.trait_injection_reagents += "aphrodisiac"			// Horni
 
 	var/list/goia_colors = list("#1a00ff", "#6c5bff", "#ff00fe", "#ff0000", "#00d3ff", "#00ff7c", "#00ff35", "#e1ff00", "#ff9f00", "#393939")
 	var/bodycolor = pick(goia_colors)
diff --git a/code/modules/persistence/effects/filth.dm b/code/modules/persistence/effects/filth.dm
index 4abd684ec7..6d44edb7e3 100644
--- a/code/modules/persistence/effects/filth.dm
+++ b/code/modules/persistence/effects/filth.dm
@@ -49,7 +49,7 @@
 	// new _path(creating, token["age"]+1)
 	var/atom/inst
 	if(ispath(_path, /obj/effect/decal/cleanable/crayon))
-		if(!istext(token["art_color"]) || !istext(token["art_shade"]) || !istext(token["art_type"]))
+		if(!findtext(token["art_color"], GLOB.is_color) || !findtext(token["art_shade"], GLOB.is_color) || !istext(token["art_type"]))
 			return
 		inst = new _path(creating, token["art_color"], token["art_shade"], token["art_type"], token["age"]+1)
 	else