diff --git a/code/modules/asset_cache/assets/belly_assets.dm b/code/modules/asset_cache/assets/belly_assets.dm index 28bc2d0eb3e..98caf9da063 100644 --- a/code/modules/asset_cache/assets/belly_assets.dm +++ b/code/modules/asset_cache/assets/belly_assets.dm @@ -1,6 +1,6 @@ /datum/belly_overlays var/belly_icon - +/* /datum/belly_overlays/vbo_belly1 belly_icon = 'icons/mob/vore_fullscreens/VBO_belly1.dmi' @@ -21,6 +21,7 @@ /datum/belly_overlays/vbo_belly7 belly_icon = 'icons/mob/vore_fullscreens/VBO_belly7.dmi' +*/ /datum/belly_overlays/vbo_belly8 belly_icon = 'icons/mob/vore_fullscreens/VBO_belly8.dmi' @@ -58,6 +59,7 @@ /datum/belly_overlays/vbo_gematically_angular belly_icon = 'icons/mob/vore_fullscreens/VBO_gematically_angular.dmi' +/* /datum/belly_overlays/vbo_intestines1 belly_icon = 'icons/mob/vore_fullscreens/VBO_intestines1.dmi' @@ -81,6 +83,7 @@ /datum/belly_overlays/vbo_intestines8 belly_icon = 'icons/mob/vore_fullscreens/VBO_intestines8.dmi' +*/ /datum/belly_overlays/vbo_intestines9 belly_icon = 'icons/mob/vore_fullscreens/VBO_intestines9.dmi' @@ -88,6 +91,7 @@ /datum/belly_overlays/vbo_intestines9_fluidless belly_icon = 'icons/mob/vore_fullscreens/VBO_intestines9_fluidless.dmi' +/* /datum/belly_overlays/vbo_maw1 belly_icon = 'icons/mob/vore_fullscreens/VBO_maw1.dmi' @@ -123,6 +127,7 @@ /datum/belly_overlays/vbo_maw12 belly_icon = 'icons/mob/vore_fullscreens/VBO_maw12.dmi' +*/ /datum/belly_overlays/vbo_maw13 belly_icon = 'icons/mob/vore_fullscreens/VBO_maw13.dmi' @@ -178,11 +183,15 @@ /datum/belly_overlays/vbo_synth1 belly_icon = 'icons/mob/vore_fullscreens/VBO_synth1.dmi' +/* /datum/belly_overlays/vbo_synth2 belly_icon = 'icons/mob/vore_fullscreens/VBO_synth2.dmi' +*/ +/* /datum/belly_overlays/vbo_trash belly_icon = 'icons/mob/vore_fullscreens/VBO_trash.dmi' +*/ /datum/belly_overlays/vbo_vines belly_icon = 'icons/mob/vore_fullscreens/VBO_vines.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index baad699a977..e0b6130e359 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -57,7 +57,7 @@ holder_type = /obj/item/holder/protoblob var/hiding = FALSE vore_icons = TRUE - vore_active = TRUE + vore_active = FALSE plane = ABOVE_MOB_PLANE //Necessary for overlay based icons diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm index d4bc7394fd2..db7c8cfa361 100644 --- a/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm +++ b/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm @@ -88,7 +88,7 @@ B.absorbchance = 1 B.escapechance = 3 B.escape_stun = 5 - B.belly_fullscreen = "VBO_belly7" + B.belly_fullscreen = "VBO_belly8" B.emote_lists[DM_HOLD] = list( "The creature idly runs what feels like bony hands over your form.", diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm index a7bbed53448..a9754c4cad3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm @@ -48,7 +48,7 @@ B.name = "stomach" B.desc = "It turns out that this was not just any old statue, but some form of android waiting for its chance to ambush you. The moment that it laid its hands on you, your fate was decided. The jaws of the machine parted, if you could call them that, and immediately enveloped your head. The inside was hot and slick, but dry. The textures were startlingly realistic, the base was clearly a tongue, the top palate of the mouth was hard but somewhat pliable. Not that you had time to admire it before the rest of your body was stuffed inside. Through a short passage down through a rubbery tube of a gullet, mechanical contractions squeezing you down from behind, you're quickly deposited in something much resembling a stomach. Amid the sounds of mechanical whirrs, you can heard glorping, gurgling and burbling from unknown sources. The walls wrap firmly around your body, deliberately dramping you up into the smallest space that the machine can crush you into, whilst the synthetic lining around you ripples across your hunched up form. You can even see yourself, the gut itself is backlit by some eerie red glow, just enough to tell exactly what is happening to you. It doesn't help that you can see the drooling fluids glistening in the dim light." B.mode_flags = DM_FLAG_THICKBELLY - B.belly_fullscreen = "a_synth_flesh_mono_hole" + B.belly_fullscreen = "synth_flesh_mono_hole" B.digest_brute = 2 B.digest_burn = 2 B.digest_oxy = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm index 47cc0bd8ff0..9d3ee954d52 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm @@ -240,7 +240,7 @@ autotransfer_enabled = TRUE autotransferchance = 50 autotransferwait = 5 - belly_fullscreen = "VBO_intestines1" + belly_fullscreen = "VBOanim_intestine2" vore_sound = "Tauric Swallow" /obj/belly/gryphon/stomach diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm index 9cb35c4ccf4..2a8dce738d6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm @@ -125,7 +125,7 @@ B.belly_fullscreen_color = "#c47cb4" B.belly_fullscreen_color2 = "#C2B4B4" B.belly_fullscreen_color3 = "#FFCCFF" - B.belly_fullscreen = "VBO_maw5" + B.belly_fullscreen = "VBO_maw20" B.emote_time = 1 //Short emote time, since they wont spend long here! B.emote_lists[DM_HOLD] = list( "The drake's thick tongue presses against your form, smothering you with thick, gooey saliva as it pushes you around in it's maw.", @@ -224,7 +224,7 @@ B.belly_fullscreen_color2 = "#C2B4B4" B.belly_fullscreen_color3 = "#8D60CE" B.belly_fullscreen_color4 = "#B593F9" - B.belly_fullscreen = "VBO_maw5" + B.belly_fullscreen = "VBO_maw20" B.emote_time = 1 //Short emote time, since they wont spend long here! B.emote_lists[DM_HOLD] = list( "The drake's thick tongue presses against your form, smothering you with thick, gooey saliva as it pushes you around in it's maw.", diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index bde18ec4ddd..4a3411c4118 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -310,6 +310,7 @@ var/mob/living/simple_mob/vore/morph/parent_morph var/mob/living/carbon/human/prey_body var/prey_ckey + vore_active = FALSE /mob/living/simple_mob/vore/morph/dominated_prey/Initialize(mapload, pckey, parent, prey) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm index 543f07868d5..9ec5516ceca 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm @@ -44,7 +44,7 @@ B.name = "trap" B.desc = "As you step onto the large leaves of the mantrap, they suddenly shoot up and snap shut around you, encasing you in a fleshy-feeling gut. The saw-toothed spikes around the edge of the leaves interlock with one another and exerts a tremendous pressure on your body. Copious volumes of fluids begin to seep in from the walls themselves, rapidly coating your body and pooling around you, all of your movements only seem to speed up this process.." B.mode_flags = DM_FLAG_THICKBELLY - B.belly_fullscreen = "VBO_maw12" + B.belly_fullscreen = "VBO_maw26" B.belly_fullscreen_color = "#02a802" B.digest_brute = 2 B.digest_burn = 2 @@ -133,7 +133,7 @@ B.name = "stomach" B.desc = "Walking a little too close to the pitcher plant, you trigger its trap mechanism and a tendril shoots out towards you. Wrapping around your body, you are rapidly dragged into the open mouth of the plant, stuffing your entire body into a fleshy, green stomach filled with a pool of some sort of tingling liquid. The lid of the plant slams down over the mouth, making it far more difficult to escape, all whilst that pool steadily seems to be filling up." B.mode_flags = DM_FLAG_THICKBELLY - B.belly_fullscreen = "VBO_belly1" + B.belly_fullscreen = "VBOanim_belly3" B.belly_fullscreen_color = "#02a802" B.digest_brute = 1 B.digest_burn = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm index d638b6a6220..937d6bcb097 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm @@ -99,7 +99,7 @@ B.digest_burn = 3 B.fancy_vore = 1 B.vore_sound = "Stomach Move" - B.belly_fullscreen = "VBO_trash" + B.belly_fullscreen = "VBO_belly9" B.belly_fullscreen_color = "#555B34" B.sound_volume = 25 B.count_items_for_sprite = TRUE @@ -115,7 +115,7 @@ B.belly_fullscreen_color2 = "#1C1C1C" B.belly_fullscreen_color3 = "#292929" B.belly_fullscreen_color4 = "#CCFFFF" - B.belly_fullscreen = "VBO_maw8" //Swoopies have beaks!! + B.belly_fullscreen = "VBO_maw25" //Swoopies have beaks!! vore_selected = B diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index dfafa724fd8..e59dc270211 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -105,6 +105,7 @@ #include "map_tests.dm" #include "mapping.dm" #include "material_tests.dm" +#include "mob_vbo_test.dm" // #include "nuke_cinematic.dm" // TODO: This is probably fixed later on #include "poster_tests.dm" // #include "preferences.dm" // This unit test is missing some other stuff diff --git a/code/modules/unit_tests/mob_vbo_test.dm b/code/modules/unit_tests/mob_vbo_test.dm new file mode 100644 index 00000000000..7c1908c66c7 --- /dev/null +++ b/code/modules/unit_tests/mob_vbo_test.dm @@ -0,0 +1,18 @@ +/// Tests that all mobs with assigned bellies use valid datums +/datum/unit_test/mobs_use_valid_belly_overlays + +/datum/unit_test/mobs_use_valid_belly_overlays/Run() + for(var/mob/living/simple_mob/test_path as anything in typesof(/mob/living/simple_mob)) + if(!initial(test_path.vore_active)) + continue + var/mob/living/simple_mob/test_mob = new test_path() + test_mob.init_vore(TRUE) + for(var/obj/belly/mob_belly in test_mob.vore_organs) + var/test_fullscreen = mob_belly.belly_fullscreen + if(!length(test_fullscreen)) + continue + var/datum/belly_overlays/test_overlay = text2path("/datum/belly_overlays/[lowertext(test_fullscreen)]") + if(test_overlay) + continue + TEST_FAIL("[test_mob] uses a non existing belly_fullscreen [test_fullscreen].") + qdel(test_mob) diff --git a/icons/mob/screen_full_vore_list.dmi b/icons/mob/screen_full_vore_list.dmi index bec7f0bfdd8..7e7ae708d25 100644 Binary files a/icons/mob/screen_full_vore_list.dmi and b/icons/mob/screen_full_vore_list.dmi differ diff --git a/icons/mob/screen_full_vore_list_credits.txt b/icons/mob/screen_full_vore_list_credits.txt index 2d787305c7a..ffc6c5ded63 100644 --- a/icons/mob/screen_full_vore_list_credits.txt +++ b/icons/mob/screen_full_vore_list_credits.txt @@ -1,46 +1,8 @@ Yeah hey if you're reading this, this is just a little .txt file keeping a record of which artist created which belly sprite (if any credit is due). -Scottred: -VBO_belly1 -VBO_belly2 -VBO_belly3 -VBO_belly4 -VBO_belly6 -VBO_belly7 -VBO_intestines6 -VBO_intestines7 -VBO_intestines8 - VerySoft: VBO_belly8 -TheMirth: -VBO_belly5 -VBO_maw1 - -Tsumibeer: -VBO_intestines1 -VBO_intestines2 -VBO_intestines3 -VBO_intestines4 -VBO_intestines5 - -Ewebun: -VBO_maw2 -VBO_maw3 -VBO_maw4 -VBO_maw5 -VBO_maw6 -VBO_maw7 -VBO_maw8 -VBO_maw9 -VBO_maw10 -VBO_maw11 - -FishyBoner: -VBO_maw12 -VBO_trash - original art by kernelDecoy (used with permission) with edits by kcin2001: https://twitter.com/kernelDecoy/status/1447387990762954757 VBO_foot diff --git a/icons/mob/vore_fullscreens/VBO_belly1.dmi b/icons/mob/vore_fullscreens/VBO_belly1.dmi deleted file mode 100644 index bc551c30b20..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly1.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_belly2.dmi b/icons/mob/vore_fullscreens/VBO_belly2.dmi deleted file mode 100644 index 068a0083212..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly2.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_belly3.dmi b/icons/mob/vore_fullscreens/VBO_belly3.dmi deleted file mode 100644 index 9c4de6a392d..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly3.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_belly4.dmi b/icons/mob/vore_fullscreens/VBO_belly4.dmi deleted file mode 100644 index d07724da340..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly4.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_belly5.dmi b/icons/mob/vore_fullscreens/VBO_belly5.dmi deleted file mode 100644 index 570632c7152..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly5.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_belly6.dmi b/icons/mob/vore_fullscreens/VBO_belly6.dmi deleted file mode 100644 index 0ad58eff5f9..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly6.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_belly7.dmi b/icons/mob/vore_fullscreens/VBO_belly7.dmi deleted file mode 100644 index fce6253714a..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_belly7.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines1.dmi b/icons/mob/vore_fullscreens/VBO_intestines1.dmi deleted file mode 100644 index c7d42d3a150..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines1.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines2.dmi b/icons/mob/vore_fullscreens/VBO_intestines2.dmi deleted file mode 100644 index dea84d12fae..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines2.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines3.dmi b/icons/mob/vore_fullscreens/VBO_intestines3.dmi deleted file mode 100644 index 29d3184889a..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines3.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines4.dmi b/icons/mob/vore_fullscreens/VBO_intestines4.dmi deleted file mode 100644 index 9a377850c19..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines4.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines5.dmi b/icons/mob/vore_fullscreens/VBO_intestines5.dmi deleted file mode 100644 index 19440f296ed..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines5.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines6.dmi b/icons/mob/vore_fullscreens/VBO_intestines6.dmi deleted file mode 100644 index 8e9431b1dbf..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines6.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines7.dmi b/icons/mob/vore_fullscreens/VBO_intestines7.dmi deleted file mode 100644 index 978bafcd469..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines7.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_intestines8.dmi b/icons/mob/vore_fullscreens/VBO_intestines8.dmi deleted file mode 100644 index df243a8e906..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_intestines8.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw1.dmi b/icons/mob/vore_fullscreens/VBO_maw1.dmi deleted file mode 100644 index 36cba8e0124..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw1.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw10.dmi b/icons/mob/vore_fullscreens/VBO_maw10.dmi deleted file mode 100644 index 600b9b5596a..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw10.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw11.dmi b/icons/mob/vore_fullscreens/VBO_maw11.dmi deleted file mode 100644 index 2f00c920b7e..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw11.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw12.dmi b/icons/mob/vore_fullscreens/VBO_maw12.dmi deleted file mode 100644 index c457af036a7..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw12.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw2.dmi b/icons/mob/vore_fullscreens/VBO_maw2.dmi deleted file mode 100644 index 649f25bf45d..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw2.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw3.dmi b/icons/mob/vore_fullscreens/VBO_maw3.dmi deleted file mode 100644 index 44616d41440..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw3.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw4.dmi b/icons/mob/vore_fullscreens/VBO_maw4.dmi deleted file mode 100644 index 81268b1b57f..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw4.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw5.dmi b/icons/mob/vore_fullscreens/VBO_maw5.dmi deleted file mode 100644 index bc6bf6b210c..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw5.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw6.dmi b/icons/mob/vore_fullscreens/VBO_maw6.dmi deleted file mode 100644 index b7c3a3e9976..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw6.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw7.dmi b/icons/mob/vore_fullscreens/VBO_maw7.dmi deleted file mode 100644 index f36155782d0..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw7.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw8.dmi b/icons/mob/vore_fullscreens/VBO_maw8.dmi deleted file mode 100644 index 16a10c27da0..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw8.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_maw9.dmi b/icons/mob/vore_fullscreens/VBO_maw9.dmi deleted file mode 100644 index 2394f700fa6..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_maw9.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_synth2.dmi b/icons/mob/vore_fullscreens/VBO_synth2.dmi deleted file mode 100644 index 570d731044b..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_synth2.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/VBO_trash.dmi b/icons/mob/vore_fullscreens/VBO_trash.dmi deleted file mode 100644 index 8b18ca26e26..00000000000 Binary files a/icons/mob/vore_fullscreens/VBO_trash.dmi and /dev/null differ diff --git a/icons/mob/vore_fullscreens/screen_full_vore_list.dmi b/icons/mob/vore_fullscreens/screen_full_vore_list.dmi index ad50cba2356..bed6c63bc7b 100644 Binary files a/icons/mob/vore_fullscreens/screen_full_vore_list.dmi and b/icons/mob/vore_fullscreens/screen_full_vore_list.dmi differ