mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
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.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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]"
|
||||
|
||||
Reference in New Issue
Block a user