cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

color check that (#9150)

Browse Source
This commit is contained in:
Kashargul
2024-10-04 20:49:37 +02:00
committed by GitHub
parent 560f24a5a8
commit 2d753d59fc
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/food/glass/bottle_potion.dm
View File

@@ -90,12 +90,12 @@
/obj/item/reagent_containers/glass/bottle/potion/girljuice /obj/item/reagent_containers/glass/bottle/potion/girljuice
name = "girl transformation potion" name = "girl transformation potion"
desc = "A small green bottle containing some pretty pink liquid that claims to turn the drinker into a woman." 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 /obj/item/reagent_containers/glass/bottle/potion/boyjuice
name = "boy transformation potion" name = "boy transformation potion"
desc = "A small green bottle containing some strong blue liquid that claims to turn the drinker into a man." 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 /obj/item/reagent_containers/glass/bottle/potion/badpolymorph
name = "unstable polymorph potion" name = "unstable polymorph potion"
@@ -153,4 +153,3 @@
name = "volatile potion" name = "volatile potion"
desc = "A small green bottle containing some volatile purple liquid." desc = "A small green bottle containing some volatile purple liquid."
prefill = list("phoron" = 10) prefill = list("phoron" = 10)

6
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
View File

@@ -180,9 +180,9 @@
H.trait_injection_reagents += "macrocillin" // get BIG H.trait_injection_reagents += "macrocillin" // get BIG
H.trait_injection_reagents += "normalcillin" // normal H.trait_injection_reagents += "normalcillin" // normal
H.trait_injection_reagents += "numbenzyme" // no feelings H.trait_injection_reagents += "numbenzyme" // no feelings
H.trait_injection_reagents += "androrovir" // -> MALE H.trait_injection_reagents += "change_drug_male" // -> MALE // CHOMPEdit
H.trait_injection_reagents += "gynorovir" // -> FEMALE H.trait_injection_reagents += "change_drug_female" // -> FEMALE // CHOMPEdit
H.trait_injection_reagents += "androgynorovir" // -> PLURAL H.trait_injection_reagents += "change_drug_intersex" // -> PLURAL // CHOMPEdit
H.trait_injection_reagents += "stoxin" // night night chem H.trait_injection_reagents += "stoxin" // night night chem
H.trait_injection_reagents += "rainbowtoxin" // Funny flashing lights. H.trait_injection_reagents += "rainbowtoxin" // Funny flashing lights.
H.trait_injection_reagents += "paralysistoxin" // Paralysis! H.trait_injection_reagents += "paralysistoxin" // Paralysis!

24
code/modules/mob/living/simple_mob/subtypes/vore/goia_ch.dm
View File

@@ -277,18 +277,18 @@
add_verb(src,/mob/living/proc/injection) //Poison sting c: 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/export_style)
add_verb(src,/mob/living/simple_mob/vore/zorgoia/proc/import_style) add_verb(src,/mob/living/simple_mob/vore/zorgoia/proc/import_style)
src.trait_injection_reagents += "microcillin" // get small src.trait_injection_reagents += "microcillin" // get small
src.trait_injection_reagents += "macrocillin" // get BIG src.trait_injection_reagents += "macrocillin" // get BIG
src.trait_injection_reagents += "normalcillin" // normal src.trait_injection_reagents += "normalcillin" // normal
src.trait_injection_reagents += "numbenzyme" // no feelings src.trait_injection_reagents += "numbenzyme" // no feelings
src.trait_injection_reagents += "androrovir" // -> MALE src.trait_injection_reagents += "change_drug_male" // -> MALE
src.trait_injection_reagents += "gynorovir" // -> FEMALE src.trait_injection_reagents += "change_drug_female" // -> FEMALE
src.trait_injection_reagents += "androgynorovir" // -> PLURAL src.trait_injection_reagents += "change_drug_intersex" // -> PLURAL
src.trait_injection_reagents += "stoxin" // night night chem src.trait_injection_reagents += "stoxin" // night night chem
src.trait_injection_reagents += "rainbowtoxin" // Funny flashing lights. src.trait_injection_reagents += "rainbowtoxin" // Funny flashing lights.
src.trait_injection_reagents += "paralysistoxin" // Paralysis! src.trait_injection_reagents += "paralysistoxin" // Paralysis!
src.trait_injection_reagents += "painenzyme" // Pain INCREASER src.trait_injection_reagents += "painenzyme" // Pain INCREASER
src.trait_injection_reagents += "aphrodisiac" // Horni src.trait_injection_reagents += "aphrodisiac" // Horni
var/list/goia_colors = list("#1a00ff", "#6c5bff", "#ff00fe", "#ff0000", "#00d3ff", "#00ff7c", "#00ff35", "#e1ff00", "#ff9f00", "#393939") var/list/goia_colors = list("#1a00ff", "#6c5bff", "#ff00fe", "#ff0000", "#00d3ff", "#00ff7c", "#00ff35", "#e1ff00", "#ff9f00", "#393939")
var/bodycolor = pick(goia_colors) var/bodycolor = pick(goia_colors)

2
code/modules/persistence/effects/filth.dm
View File

@@ -49,7 +49,7 @@
// new _path(creating, token["age"]+1) // new _path(creating, token["age"]+1)
var/atom/inst var/atom/inst
if(ispath(_path, /obj/effect/decal/cleanable/crayon)) 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 return
inst = new _path(creating, token["art_color"], token["art_shade"], token["art_type"], token["age"]+1) inst = new _path(creating, token["art_color"], token["art_shade"], token["art_type"], token["age"]+1)
else else