From 6821d3fcae255bb0bbe2e539a59d6e6e9c88eb24 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 4 May 2018 14:48:51 +0300 Subject: [PATCH] small fixes etc. -Renamed the legacy flavor list from "all" to "generic" -Added a few new/mode specific flavors. -Rearranged the flavor lists into alphabetical order. -Fixed a typo. -Applied some suggested tweaks. -Fixed oversight of the prey drop contamination not being updated for this. -Fixed belly transfers not removing transfered items from source belly items_preserved list while at it. --- code/_helpers/global_lists_vr.dm | 346 ++++++++++++--------- code/modules/vore/eating/belly_obj_vr.dm | 5 +- code/modules/vore/eating/contaminate_vr.dm | 18 +- 3 files changed, 198 insertions(+), 171 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 3f812bb09e..77abcaa617 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -162,175 +162,213 @@ var/global/list/edible_trash = list(/obj/item/trash, /obj/item/device/aicard) var/global/list/cont_flavors = list( - "All" = cont_flavors_all, + "Generic" = cont_flavors_generic, "Acrid" = cont_flavors_acrid, "Dirty" = cont_flavors_dirty, "Musky" = cont_flavors_musky, "Smelly" = cont_flavors_smelly, "Wet" = cont_flavors_wet) -var/global/list/cont_flavors_all = list("soggy", - "soaked", - "dirty", - "nasty", - "slimy", - "drenched", - "sloppy", - "grimy", - "sludgy", - "stinky", - "mucky", - "stained", - "soiled", - "filthy", - "saucy", - "foul", - "icky", - "tarnished", - "unsanitary", - "messy", +var/global/list/cont_flavors_generic = list("acrid", + "bedraggled", "begrimed", - "cruddy", - "funky", - "disgusting", - "repulsive", - "noxious", - "gruesome", - "gross", - "putrid", - "yucky", - "tainted", - "putrescent", - "unsavory", - "smelly", - "smutty", - "acrid", - "pungent", - "unclean", - "contaminated", - "gunky", - "gooey", - "sticky", - "drippy", - "oozing", - "sloshed", - "digested", - "sopping", - "damp", - "gloppy", - "begraggled", "churned", - "juicy") - -var/global/list/cont_flavors_wet = list("soggy", - "soaked", - "slimy", - "drenched", - "sloppy", - "sludgy", - "gooey", - "sticky", - "drippy", - "oozing", - "sloshed", - "sopping", - "damp", - "gloppy", - "juicy") - -var/global/list/cont_flavors_smelly = list("nasty", - "stinky", - "filthy", - "foul", - "icky", - "funky", - "disgusting", - "repulsive", - "noxious", - "gross", - "putrid", - "yucky", - "putrescent", - "unsavory", - "smelly", - "pungent") - -var/global/list/cont_flavors_acrid = list("nasty", - "slimy", - "sloppy", - "grimy", - "sludgy", - "mucky", - "stained", - "saucy", - "foul", - "icky", - "disgusting", - "repulsive", - "noxious", - "gruesome", - "gross", - "putrid", - "yucky", - "tainted", - "putrescent", - "unsavory", - "smelly", - "acrid", - "pungent", - "gooey", - "sticky", - "drippy", - "oozing", - "sloshed", - "digested", - "gloppy", - "churned") - -var/global/list/cont_flavors_dirty = list("dirty", - "nasty", - "slimy", - "sloppy", - "grimy", - "mucky", - "stained", - "soiled", - "filthy", - "saucy", - "tarnished", - "unsanitary", - "messy", - "begrimed", - "cruddy", - "gruesome", - "gross", - "tainted", - "unsavory", - "smutty", - "unclean", "contaminated", - "gunky", - "gooey", - "sticky", - "gloppy", - "begraggled") - -var/global/list/cont_flavors_musky = list("soggy", - "nasty", - "slimy", + "cruddy", + "damp", + "digested", + "dirty", + "disgusting", "drenched", - "sloppy", - "musky", - "saucy", - "messy", + "drippy", + "filthy", + "foul", "funky", + "gloppy", + "gooey", + "grimy", + "gross", + "gruesome", + "gunky", + "icky", + "juicy", + "messy", + "mucky", + "mushy", + "nasty", + "noxious", + "oozing", + "pungent", + "putrescent", + "putrid", + "repulsive", + "saucy", + "slimy", + "sloppy", + "sloshed", + "sludgy", + "smeary", + "smelly", + "smudgy", + "smutty", + "soaked", + "soggy", + "soiled", + "sopping", + "squashy", + "squishy", + "stained", + "sticky", + "stinky", "tainted", + "tarnished", + "unclean", + "unsanitary", + "unsavory", + "yucky") + +var/global/list/cont_flavors_wet = list("damp", + "drenched", + "drippy", + "gloppy", + "gooey", + "juicy", + "oozing", + "slimy", + "slobbery", + "sloppy", + "sloshed", + "sloughy", + "sludgy", + "slushy", + "soaked", + "soggy", + "sopping", + "squashy", + "squishy", + "sticky") + +var/global/list/cont_flavors_smelly = list("disgusting", + "filthy", + "foul", + "funky", + "gross", + "icky", + "malodorous", + "nasty", + "niffy", + "noxious", + "pungent", + "putrescent", + "putrid", + "rancid", + "reeking", + "repulsive", + "smelly", + "stenchy", + "stinky", + "unsavory", + "whiffy", + "yucky") + +var/global/list/cont_flavors_acrid = list("acrid", + "caustic", + "churned", + "chymous", + "digested", + "discolored", + "disgusting", + "drippy", + "foul", + "gloppy", + "gooey", + "grimy", + "gross", + "gruesome", + "icky", + "mucky", + "mushy", + "nasty", + "noxious", + "oozing", + "pungent", + "putrescent", + "putrid", + "repulsive", + "saucy", + "slimy", + "sloppy", + "sloshed", + "sludgy", + "slushy", + "smelly", + "smudgy", + "soupy", + "squashy", + "squishy", + "stained", + "sticky", + "tainted", + "unsavory", + "yucky") + +var/global/list/cont_flavors_dirty = list("bedraggled", + "begrimed", + "besmirched", + "blemished", + "contaminated", + "cruddy", + "dirty", + "discolored", + "filthy", + "gloppy", + "gooey", + "grimy", + "gross", + "grubby", + "gruesome", + "gunky", + "messy", + "mucky", + "mushy", + "nasty", + "saucy", + "slimy", + "sloppy", + "sludgy", + "smeary", + "smudgy", + "smutty", + "soiled", + "stained", + "sticky", + "tainted", + "tarnished", + "unclean", + "unsanitary", + "unsavory") + +var/global/list/cont_flavors_musky = list("drenched", + "drippy", + "funky", + "gooey", + "juicy", + "messy", + "musky", + "nasty", + "raunchy", + "saucy", + "slimy", + "sloppy", + "slushy", + "smeary", "smelly", "smutty", - "gooey", + "soggy", + "squashy", + "squishy", "sticky", - "drippy", - "juicy") + "tainted") /hook/startup/proc/init_vore_datum_ref_lists() var/paths diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index b803af0817..4b1d8ef0a5 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -33,7 +33,7 @@ var/transferlocation // Location that the prey is released if they struggle and get dropped off. var/release_sound = TRUE // Boolean for now, maybe replace with something else later var/mode_flags = 0 // Stripping, numbing, etc. - var/cont_flavor = "All" // Selected contamination mode. + var/cont_flavor = "Generic" // Selected contamination mode. //I don't think we've ever altered these lists. making them static until someone actually overrides them somewhere. //Actual full digest modes @@ -373,7 +373,7 @@ var/obj/item/I = M.get_equipped_item(slot = slot) if(I) M.unEquip(I,force = TRUE) - I.gurgle_contaminate(contents, owner) //We do an initial contamination pass to get stuff like IDs wet. + I.gurgle_contaminate(contents, cont_flavor) //We do an initial contamination pass to get stuff like IDs wet. if(mode_flags & DM_FLAG_ITEMWEAK) items_preserved |= I @@ -578,6 +578,7 @@ if(!(content in src) || !istype(target)) return content.forceMove(target) + items_preserved -= content if(!silent && target.vore_sound && !recent_sound) var/soundfile = vore_sounds[target.vore_sound] if(soundfile) diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm index f185605d81..92964b519b 100644 --- a/code/modules/vore/eating/contaminate_vr.dm +++ b/code/modules/vore/eating/contaminate_vr.dm @@ -5,27 +5,15 @@ var/image/gurgled_overlay = image('icons/effects/sludgeoverlay_vr.dmi') var/cleanname var/cleandesc -/obj/item/proc/gurgle_contaminate(var/atom/movable/item_storage = null, var/cont_flavor = "All") +/obj/item/proc/gurgle_contaminate(var/atom/movable/item_storage = null, var/cont_flavor = "Generic") if(!can_gurgle()) return FALSE if(!gurgled) gurgled = TRUE overlays += gurgled_overlay - switch(cont_flavor) - if("All") - cont_flavor = cont_flavors_all - if("Acrid") - cont_flavor = cont_flavors_acrid - if("Dirty") - cont_flavor = cont_flavors_dirty - if("Musky") - cont_flavor = cont_flavors_musky - if("Smelly") - cont_flavor = cont_flavors_smelly - if("Wet") - cont_flavor = cont_flavors_wet - var/gurgleflavor = pick(cont_flavor) + var/list/pickfrom = cont_flavors[cont_flavor] + var/gurgleflavor = pick(pickfrom) cleanname = src.name cleandesc = src.desc name = "[gurgleflavor] [cleanname]"