From 144379af8b857296f4b8e896cd6aeae2fe76bd0f Mon Sep 17 00:00:00 2001 From: Verkister Date: Sat, 16 Dec 2023 22:03:16 +0200 Subject: [PATCH] Properly fixes swoopie neck speed and turbomode inits (#7417) --- code/modules/vore/eating/belly_obj_vr.dm | 4 +- .../simple_mob/subtypes/vore/swoopie.dm | 78 +++++++++---------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index f7f9baef4b..836af0cd2d 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -468,7 +468,7 @@ owner = loc owner.vore_organs |= src if(isliving(loc)) - if(speedy_mob_processing) //CHOMPEdit Start + if(mode_flags & DM_FLAG_TURBOMODE) //CHOMPEdit Start START_PROCESSING(SSobj, src) else START_PROCESSING(SSbellies, src) @@ -477,7 +477,7 @@ flags |= NOREACT // We dont want bellies to start bubling nonstop due to people mixing when transfering and making different reagents /obj/belly/Destroy() - if(speedy_mob_processing) + if(mode_flags & DM_FLAG_TURBOMODE) STOP_PROCESSING(SSobj, src) else STOP_PROCESSING(SSbellies, src) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm index dd4b999d3d..cf56ee3d06 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm @@ -91,45 +91,6 @@ B.sound_volume = 25 B.count_items_for_sprite = TRUE - B = new /obj/belly/longneck(src) - B.affects_vore_sprites = TRUE - B.belly_sprite_to_affect = "neck4" - B.name = "vacuum hose 4" - B.autotransferlocation = "Churno-Vac" - B.desc = "Thank you for your biofuel contribution~" - B.fancy_vore = 1 - B.vore_sound = "Stomach Move" - B.sound_volume = 20 - - B = new /obj/belly/longneck(src) - B.affects_vore_sprites = TRUE - B.belly_sprite_to_affect = "neck3" - B.name = "vacuum hose 3" - B.autotransferlocation = "vacuum hose 4" - B.desc = "Looks like it's gonna be all downhill from here..." - B.fancy_vore = 1 - B.vore_sound = "Stomach Move" - B.sound_volume = 40 - - B = new /obj/belly/longneck(src) - B.affects_vore_sprites = TRUE - B.belly_sprite_to_affect = "neck2" - B.name = "vacuum hose 2" - B.autotransferlocation = "vacuum hose 3" - B.desc = "It feels very tight in here..." - B.fancy_vore = 1 - B.vore_sound = "Stomach Move" - B.sound_volume = 80 - - B = new /obj/belly/longneck(src) - B.affects_vore_sprites = TRUE - B.belly_sprite_to_affect = "neck1" - B.name = "vacuum hose" - B.autotransferlocation = "vacuum hose 2" - B.fancy_vore = 1 - B.vore_sound = "Stomach Move" - B.sound_volume = 100 - B = new /obj/belly/longneck(src) B.affects_vore_sprites = FALSE B.name = "Vac-Beak" @@ -145,6 +106,45 @@ vore_selected = B + B = new /obj/belly/longneck(src) + B.affects_vore_sprites = TRUE + B.belly_sprite_to_affect = "neck1" + B.name = "vacuum hose" + B.autotransferlocation = "vacuum hose 2" + B.fancy_vore = 1 + B.vore_sound = "Stomach Move" + B.sound_volume = 100 + + B = new /obj/belly/longneck(src) + B.affects_vore_sprites = TRUE + B.belly_sprite_to_affect = "neck2" + B.name = "vacuum hose 2" + B.autotransferlocation = "vacuum hose 3" + B.desc = "It feels very tight in here..." + B.fancy_vore = 1 + B.vore_sound = "Stomach Move" + B.sound_volume = 80 + + B = new /obj/belly/longneck(src) + B.affects_vore_sprites = TRUE + B.belly_sprite_to_affect = "neck3" + B.name = "vacuum hose 3" + B.autotransferlocation = "vacuum hose 4" + B.desc = "Looks like it's gonna be all downhill from here..." + B.fancy_vore = 1 + B.vore_sound = "Stomach Move" + B.sound_volume = 40 + + B = new /obj/belly/longneck(src) + B.affects_vore_sprites = TRUE + B.belly_sprite_to_affect = "neck4" + B.name = "vacuum hose 4" + B.autotransferlocation = "Churno-Vac" + B.desc = "Thank you for your biofuel contribution~" + B.fancy_vore = 1 + B.vore_sound = "Stomach Move" + B.sound_volume = 20 + /obj/belly/longneck affects_vore_sprites = TRUE belly_sprite_to_affect = "neck1"