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

small fixes etc.

Browse Source 
-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.
This commit is contained in:
Verkister
2018-05-04 14:48:51 +03:00
parent 7b0bdccade
commit 6821d3fcae
3 changed files with 198 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

346
code/_helpers/global_lists_vr.dm
View File

@@ -162,175 +162,213 @@ var/global/list/edible_trash = list(/obj/item/trash,
/obj/item/device/aicard) /obj/item/device/aicard)
var/global/list/cont_flavors = list( var/global/list/cont_flavors = list(
"All" = cont_flavors_all, "Generic" = cont_flavors_generic,
"Acrid" = cont_flavors_acrid, "Acrid" = cont_flavors_acrid,
"Dirty" = cont_flavors_dirty, "Dirty" = cont_flavors_dirty,
"Musky" = cont_flavors_musky, "Musky" = cont_flavors_musky,
"Smelly" = cont_flavors_smelly, "Smelly" = cont_flavors_smelly,
"Wet" = cont_flavors_wet) "Wet" = cont_flavors_wet)
var/global/list/cont_flavors_all = list("soggy", var/global/list/cont_flavors_generic = list("acrid",
"soaked", "bedraggled",
"dirty",
"nasty",
"slimy",
"drenched",
"sloppy",
"grimy",
"sludgy",
"stinky",
"mucky",
"stained",
"soiled",
"filthy",
"saucy",
"foul",
"icky",
"tarnished",
"unsanitary",
"messy",
"begrimed", "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", "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", "contaminated",
"gunky", "cruddy",
"gooey", "damp",
"sticky", "digested",
"gloppy", "dirty",
"begraggled") "disgusting",
var/global/list/cont_flavors_musky = list("soggy",
"nasty",
"slimy",
"drenched", "drenched",
"sloppy", "drippy",
"musky", "filthy",
"saucy", "foul",
"messy",
"funky", "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", "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", "smelly",
"smutty", "smutty",
"gooey", "soggy",
"squashy",
"squishy",
"sticky", "sticky",
"drippy", "tainted")
"juicy")
/hook/startup/proc/init_vore_datum_ref_lists() /hook/startup/proc/init_vore_datum_ref_lists()
var/paths var/paths

5
code/modules/vore/eating/belly_obj_vr.dm
View File

@@ -33,7 +33,7 @@
var/transferlocation // Location that the prey is released if they struggle and get dropped off. 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/release_sound = TRUE // Boolean for now, maybe replace with something else later
var/mode_flags = 0 // Stripping, numbing, etc. 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. //I don't think we've ever altered these lists. making them static until someone actually overrides them somewhere.
//Actual full digest modes //Actual full digest modes
@@ -373,7 +373,7 @@
var/obj/item/I = M.get_equipped_item(slot = slot) var/obj/item/I = M.get_equipped_item(slot = slot)
if(I) if(I)
M.unEquip(I,force = TRUE) 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) if(mode_flags & DM_FLAG_ITEMWEAK)
items_preserved |= I items_preserved |= I
@@ -578,6 +578,7 @@
if(!(content in src) || !istype(target)) if(!(content in src) || !istype(target))
return return
content.forceMove(target) content.forceMove(target)
items_preserved -= content
if(!silent && target.vore_sound && !recent_sound) if(!silent && target.vore_sound && !recent_sound)
var/soundfile = vore_sounds[target.vore_sound] var/soundfile = vore_sounds[target.vore_sound]
if(soundfile) if(soundfile)

18
code/modules/vore/eating/contaminate_vr.dm
View File

@@ -5,27 +5,15 @@ var/image/gurgled_overlay = image('icons/effects/sludgeoverlay_vr.dmi')
var/cleanname var/cleanname
var/cleandesc 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()) if(!can_gurgle())
return FALSE return FALSE
if(!gurgled) if(!gurgled)
gurgled = TRUE gurgled = TRUE
overlays += gurgled_overlay overlays += gurgled_overlay
switch(cont_flavor) var/list/pickfrom = cont_flavors[cont_flavor]
if("All") var/gurgleflavor = pick(pickfrom)
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)
cleanname = src.name cleanname = src.name
cleandesc = src.desc cleandesc = src.desc
name = "[gurgleflavor] [cleanname]" name = "[gurgleflavor] [cleanname]"