diff --git a/code/__defines/slosh_ch.dm b/code/__defines/slosh_ch.dm deleted file mode 100644 index b501f8ffe2..0000000000 --- a/code/__defines/slosh_ch.dm +++ /dev/null @@ -1,11 +0,0 @@ -GLOBAL_LIST_INIT(slosh, list( - 'sound/vore/walkslosh2.ogg', - 'sound/vore/walkslosh3.ogg', - 'sound/vore/walkslosh4.ogg', - 'sound/vore/walkslosh5.ogg', - 'sound/vore/walkslosh6.ogg', - 'sound/vore/walkslosh7.ogg', - 'sound/vore/walkslosh8.ogg', - 'sound/vore/walkslosh9.ogg', - 'sound/vore/walkslosh10.ogg' -)) diff --git a/code/_helpers/global_lists_ch.dm b/code/_helpers/global_lists_ch.dm index d1c773a4d0..f9feb53b58 100644 --- a/code/_helpers/global_lists_ch.dm +++ b/code/_helpers/global_lists_ch.dm @@ -1,17 +1,17 @@ //Reagent Vore belly Sounds -var/global/list/vore_reagent_sounds = list( - 'sound/vore/walkslosh1.ogg', - 'sound/vore/walkslosh2.ogg', - 'sound/vore/walkslosh3.ogg', - 'sound/vore/walkslosh4.ogg', - 'sound/vore/walkslosh5.ogg', - 'sound/vore/walkslosh6.ogg', - 'sound/vore/walkslosh7.ogg', - 'sound/vore/walkslosh8.ogg', - 'sound/vore/walkslosh9.ogg', - 'sound/vore/walkslosh10.ogg', - "None" = null) +GLOBAL_LIST_INIT(slosh, list( + 'sound/vore/walkslosh1.ogg', + 'sound/vore/walkslosh2.ogg', + 'sound/vore/walkslosh3.ogg', + 'sound/vore/walkslosh4.ogg', + 'sound/vore/walkslosh5.ogg', + 'sound/vore/walkslosh6.ogg', + 'sound/vore/walkslosh7.ogg', + 'sound/vore/walkslosh8.ogg', + 'sound/vore/walkslosh9.ogg', + 'sound/vore/walkslosh10.ogg' +)) var/global/list/item_tf_spawnpoints = list() // Global variable tracking which items are item tf spawnpoints diff --git a/code/game/turfs/simulated_ch.dm b/code/game/turfs/simulated_ch.dm deleted file mode 100644 index ca03a870b3..0000000000 --- a/code/game/turfs/simulated_ch.dm +++ /dev/null @@ -1,17 +0,0 @@ -/turf/simulated - - //CHOMP reagent belly sloshing sounds - var/static/list/base_vorefootstep_sounds = list("human" = list( - 'sound/vore/walkslosh1.ogg', - 'sound/vore/walkslosh2.ogg', - 'sound/vore/walkslosh3.ogg', - 'sound/vore/walkslosh4.ogg', - 'sound/vore/walkslosh5.ogg', - 'sound/vore/walkslosh6.ogg', - 'sound/vore/walkslosh7.ogg', - 'sound/vore/walkslosh8.ogg', - 'sound/vore/walkslosh9.ogg', - 'sound/vore/walkslosh10.ogg')) - -// Removal of older code - this isn't necessary anymore as /decl/flooring/floortype and initial_flooring = /decl/flooring/floortype -// can handle this. If you're not sure how to do it, refer to flooring.dm, and read things over. It's explained there. Rykka <3 diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 23901117c3..de947af9d1 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -522,10 +522,10 @@ return thing.enter_belly(src) // Atom movable proc, does nothing by default. Overridden in children for special behavior. if(owner && istype(owner.loc,/turf/simulated) && !cycle_sloshed && reagents.total_volume > 0) - var/turf/simulated/T = owner.loc - var/S = pick(T.base_vorefootstep_sounds["human"]) //ChompEDIT + // var/turf/simulated/T = owner.loc // CHOMPEdit + var/S = pick(GLOB.slosh) //ChompEDIT if(S) - playsound(T, S, sound_volume * (reagents.total_volume / 100), FALSE, frequency = noise_freq, preference = /datum/client_preference/digestion_noises) //CHOMPEdit + playsound(owner.loc, S, sound_volume * (reagents.total_volume / 100), FALSE, frequency = noise_freq, preference = /datum/client_preference/digestion_noises) //CHOMPEdit cycle_sloshed = TRUE thing.belly_cycles = 0 //reset cycle count if(istype(thing, /mob/observer)) //Ports CHOMPStation PR#3072 diff --git a/modular_chomp/code/datums/elements/slosh.dm b/modular_chomp/code/datums/elements/slosh.dm index 06f12eed89..a14577cf08 100644 --- a/modular_chomp/code/datums/elements/slosh.dm +++ b/modular_chomp/code/datums/elements/slosh.dm @@ -19,7 +19,6 @@ /datum/element/slosh/Detach(datum/source) UnregisterSignal(source, COMSIG_MOVABLE_MOVED) - step_count -= source return ..() /datum/element/slosh/proc/handle_footstep(mob/living/source) diff --git a/vorestation.dme b/vorestation.dme index a43d3fa91d..bb6e8419fb 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -130,7 +130,6 @@ #include "code\__defines\shuttle.dm" #include "code\__defines\simple_mob.dm" #include "code\__defines\size.dm" -#include "code\__defines\slosh_ch.dm" #include "code\__defines\sound.dm" #include "code\__defines\span_vr.dm" #include "code\__defines\species_languages.dm" @@ -1803,7 +1802,6 @@ #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair.dm" #include "code\game\objects\structures\stool_bed_chair_nest\wheelchair_item.dm" #include "code\game\turfs\simulated.dm" -#include "code\game\turfs\simulated_ch.dm" #include "code\game\turfs\simulated_vr.dm" #include "code\game\turfs\turf.dm" #include "code\game\turfs\turf_changing.dm"