From b8d9aaef0b00ed42d3adaa72c387af7797c3bf17 Mon Sep 17 00:00:00 2001 From: UniquaSa <111698205+UniquaSa@users.noreply.github.com> Date: Sun, 10 Sep 2023 09:49:43 +0200 Subject: [PATCH] Combat MEKA & Mob bellies addition and fixing (#6946) --- code/_helpers/global_lists_ch.dm | 15 +++- .../mob/living/simple_mob/simple_mob_vr.dm | 5 +- .../subtypes/animal/alien animals/catslug.dm | 2 +- .../subtypes/animal/alien animals/succlet.dm | 2 +- .../subtypes/animal/alien animals/teppi.dm | 4 +- .../simple_mob/subtypes/animal/space/carp.dm | 2 +- .../simple_mob/subtypes/animal/squirrel.dm | 2 +- .../simple_mob/subtypes/vore/vore_hostile.dm | 4 +- .../simple_mob/subtypes/vore/wolftaur.dm | 2 +- icons/mob/robot/engineering_large.dmi | Bin 137081 -> 137078 bytes .../living/silicon/robot/sprites/combat.dm | 23 +++++++ .../living/simple_mob/subtypes/vore/carp.dm | 39 +++++++++++ .../living/simple_mob/subtypes/vore/jelly.dm | 65 ++++++++++++++++++ vorestation.dme | 3 + 14 files changed, 157 insertions(+), 11 deletions(-) create mode 100644 modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/carp.dm create mode 100644 modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm diff --git a/code/_helpers/global_lists_ch.dm b/code/_helpers/global_lists_ch.dm index a9dea7b2ec..71db6e379a 100644 --- a/code/_helpers/global_lists_ch.dm +++ b/code/_helpers/global_lists_ch.dm @@ -48,6 +48,9 @@ var/global/list/vr_mob_tf_options = list( "Parrot" = /mob/living/simple_mob/animal/passive/bird/parrot, "Cat" = /mob/living/simple_mob/animal/passive/cat, "Corgi" = /mob/living/simple_mob/animal/passive/dog/corgi, + "Squirrel" = /mob/living/simple_mob/vore/squirrel, + "Frog" = /mob/living/simple_mob/vore/aggressive/frog, + "Seagull" =/mob/living/simple_mob/vore/seagull, "Fox" = /mob/living/simple_mob/animal/passive/fox, "Racoon" = /mob/living/simple_mob/animal/passive/raccoon_ch, "Shantak" = /mob/living/simple_mob/animal/sif/shantak, @@ -63,6 +66,7 @@ var/global/list/vr_mob_tf_options = list( "Slime" = /mob/living/simple_mob/slime/xenobio/metal, "Corrupt hound" = /mob/living/simple_mob/vore/aggressive/corrupthound, "Deathclaw" = /mob/living/simple_mob/vore/aggressive/deathclaw/den, + "Weretiger" = /mob/living/simple_mob/vore/weretiger, "Mimic" = /mob/living/simple_mob/vore/aggressive/mimic/floor/plating, "Giant rat" = /mob/living/simple_mob/vore/aggressive/rat, "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug, @@ -81,7 +85,13 @@ var/global/list/vr_mob_tf_options = list( "Armalis vox" = /mob/living/simple_mob/vox/armalis, "Xeno hunter" = /mob/living/simple_mob/xeno_ch/hunter, "Xeno queen" = /mob/living/simple_mob/xeno_ch/queen/maid, - "Xeno sentinel" = /mob/living/simple_mob/xeno_ch/sentinel) + "Xeno sentinel" = /mob/living/simple_mob/xeno_ch/sentinel, + "Space carp" = /mob/living/simple_mob/animal/space/carp, + "Jelly blob" = /mob/living/simple_mob/vore/jelly, + "SWOOPIE XL" = /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie, + "Abyss lurker" = /mob/living/simple_mob/vore/vore_hostile/abyss_lurker, + "Abyss leaper" = /mob/living/simple_mob/vore/vore_hostile/leaper, + "Gelatinous cube" = /mob/living/simple_mob/vore/vore_hostile/gelatinous_cube) var/global/list/vr_mob_spawner_options = list( "Parrot" = /mob/living/simple_mob/animal/passive/bird/parrot, @@ -96,6 +106,7 @@ var/global/list/vr_mob_spawner_options = list( "Squirrel" = /mob/living/simple_mob/vore/squirrel, "Red panda" = /mob/living/simple_mob/vore/redpanda, "Fennec" = /mob/living/simple_mob/vore/fennec, + "Seagull" =/mob/living/simple_mob/vore/seagull, "Corgi" = /mob/living/simple_mob/animal/passive/dog/corgi, "Armadillo" = /mob/living/simple_mob/animal/passive/armadillo, "Racoon" = /mob/living/simple_mob/animal/passive/raccoon_ch, @@ -117,6 +128,7 @@ var/global/list/vr_mob_spawner_options = list( "Teppi" = /mob/living/simple_mob/vore/alienanimals/teppi, "Slug" = /mob/living/simple_mob/vore/slug, "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug, + "Weretiger" = /mob/living/simple_mob/vore/weretiger, "Dust jumper" = /mob/living/simple_mob/vore/alienanimals/dustjumper, "Star treader" = /mob/living/simple_mob/vore/alienanimals/startreader, "Space ghost" = /mob/living/simple_mob/vore/alienanimals/spooky_ghost, @@ -161,6 +173,7 @@ var/global/list/vr_mob_spawner_options = list( "Shadekin" = /mob/living/simple_mob/shadekin, "Catgirl" = /mob/living/simple_mob/vore/catgirl, "Wolfgirl" = /mob/living/simple_mob/vore/wolfgirl, + "Wolftaur" = /mob/living/simple_mob/vore/wolftaur, "Lamia" = /mob/living/simple_mob/vore/lamia, "Corrupt hound" = /mob/living/simple_mob/vore/aggressive/corrupthound, "Corrupt corrupt hound" = /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi, diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index 39bb6860b5..caa99d7d98 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -272,7 +272,10 @@ "The churning walls slowly pulverize you into meaty nutrients.", "The stomach glorps and gurgles as it tries to work you into slop.") can_be_drop_pred = TRUE // Mobs will eat anyone that decides to drop/slip into them by default. - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Why are they even using this one, I do not understand. + B.belly_fullscreen = "a_tumby" //Chompedit + B.belly_fullscreen_color = "#823232" //Chompedit + B.belly_fullscreen_color2 = "#823232" //Chompedit /mob/living/simple_mob/Bumped(var/atom/movable/AM, yes) if(tryBumpNom(AM)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 7381187044..6bebab3f5c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -120,7 +120,7 @@ B.name = "stomach" B.desc = "The hot slick gut of a catslug!! Copious slime smears over you as you’re packed away into the gloom and oppressive humidity of this churning gastric sac. The pressure around you is intense, the squashy flesh bends and forms to your figure, clinging to you insistently! There’s basically no free space at all as your ears are filled with the slick slide of flesh against flesh and the burbling of gastric juices glooping all around you. The thumping of a heart booms from somewhere nearby, making everything pulse in against you in time with it! This is it! You’ve been devoured by a catslug!!!" B.mode_flags = 40 - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 0.5 B.digest_burn = 0.5 B.digestchance = 10 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm index c5205d5ecd..95cf941b8e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm @@ -78,7 +78,7 @@ B.name = "stummy" B.desc = "It's a star shaped stomach. A stummy, if you will. It's warm and soft, not unlike plush, but it's tight!" B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 0 B.digest_burn = 0 B.digest_oxy = 12 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 3c4dce9db1..f666cca802 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -174,7 +174,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? B.name = "stomach" B.desc = "The heat of the roiling flesh around you bakes into you immediately as you’re cast into the gloom of a Teppi’s primary gastric chamber. The undulations are practically smothering, clinging to you and grinding you all over as the Teppi continues about its day. The walls are heavy against you, so it’s really difficult to move at all, while the heart of this creature pulses rhythmically somewhere nearby, and you can feel the throb of its pulse in the doughy squish pressing up against you. Your figure sinks a ways into the flesh as it presses in, wrapping limbs up between countless slick folds and kneading waves. It’s not long before you’re positively soaked in a thin layer of slime as you’re rocked and squeezed and jostled in the stomach of your captor." B.mode_flags = 40 - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 0.05 B.digest_burn = 0.05 B.digestchance = 5 @@ -304,7 +304,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? p.contamination_flavor = "Wet" p.contamination_color = "grey" p.item_digest_mode = IM_HOLD - p.belly_fullscreen = "yet_another_tumby" +// p.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change p.fancy_vore = 1 p.vore_verb = "nyomp" friend_zone = p diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index 3260f513ba..99ceb6537b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -152,7 +152,7 @@ B.name = "stomach" B.desc = "You've been swallowed whole and alive by a massive white carp! The stomach around you is oppressively tight, squeezing and grinding wrinkled walls across your body, making it hard to make any movement at all. The chamber is flooded with fluids that completely overwhelm you." B.mode_flags = DM_FLAG_THICKBELLY - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 2 B.digest_burn = 2 B.digest_oxy = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index 1fb1af9255..fc62d8b5d5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -73,7 +73,7 @@ B.name = "stomach" B.digest_mode = DM_SELECT B.mode_flags = DM_FLAG_THICKBELLY - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 1 B.digest_burn = 1 B.escapechance = 35 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm index 0d76550158..ee82ccb71a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm @@ -76,7 +76,7 @@ B.name = "interior" B.desc = "It's hot and overwhelmingly tight! The interior of the pale creature groans with the effort of squeezing you. Everything is hot and churning and eager to grind and smother you in thick fluids. The weight of the creature's body pressing in at you makes it hard to move at all, while you are squeezed to the very core of the creature! There seems almost not to even be an organ for this so much as the creature has folded around you, trying to incorporate your matter into its body with vigor!" B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 3 B.digest_burn = 2 B.digestchance = 0 @@ -194,7 +194,7 @@ B.name = "stomach" B.desc = "The flesh of the tall creature's stomach folds over you in doughy waves, squeezing you into the tightest shape it can manage with idle flexes churning down on you. Your limbs often find themselves lost between folds and tugged this way or that, held in a skin tight press that is not painful, but is hard to pull away from. You can see a strange, glittering pink and purple light glimmering through the flesh of the monster all around you, like your very own sea of stars. The walls rush in to fill all the space, squeezing you from head to toe no matter how you might wiggle, the weight of the semi-transparent interior flesh keeping you neatly secured deep inside while wringing the fight out of you." B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 2 B.digest_burn = 2 B.digestchance = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm index 441fd42f19..9fa501818d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm @@ -73,7 +73,7 @@ B.name = "stomach" B.desc = "After a gruelling compressive traversal down through the taur's gullet, you briefly get deposited in an oppressively tight stomach at it's humanoid waist. However, the wolf has little interest in keeping you here, instead treating you as a mere snack, an orifice opens beneath you and you're soon dragged deeper into her depths. Soon you're splashing into an active, waiting caustic slurry, and the world around you drops as though you're trapped in a hammock. The taur's underbelly sags with your weight, and you feel a heavy pat from the woman outside settling in to make the most of her meal." B.mode_flags = DM_FLAG_THICKBELLY - B.belly_fullscreen = "yet_another_tumby" +// B.belly_fullscreen = "yet_another_tumby" //Chompedit - Belly Fullscreen change B.digest_brute = 2 B.digest_burn = 2 B.digest_oxy = 1 diff --git a/icons/mob/robot/engineering_large.dmi b/icons/mob/robot/engineering_large.dmi index b85e6c11433aba3263e08be14da55d83601ad385..86add26386fac22a1b55417d6cf2412714544f2e 100644 GIT binary patch delta 453 zcmV;$0XqKqt_b$72#_QJ%#kH6e-RDig3O=5Ez0e?AW0Jl_KbHRy*C=>doyCmKDM8` z1KaF(;V-mZURNw;autO^pQk2cF?*9?kU{>Pnc<}~i2)X~#Uc#SyzN-bL>Qe-!7R1}pCh zfCk*3Sb|PYEu^_|HeG^Fp4XFMkV281SR+r9WGS;Flb!lfm zRbp?nlkG%IyA1TxKxU{=3>BWCA}~~Vh6>G4kr*lpLq%sew$L4jJ;eVjXld|D!lBdB z;NqdBv4>-(I4UGs8ub5|mIjMmOGAVHXrSudz_m2Tq%Z<4M6(&xDjt9aBbL&jCZHM& vcwU2^3T^E2GNJI`~ipj0RgxC0Rnv$o$=io delta 456 zcmV;(0XP2kt_bAle~-ZU`=Uf=>fRy%ZXlFlKF;tqO^E&K&ae_g&?th`qM zEx13i0x3=%WTkdCU4az;*W+=Nff5&z5|&U#8D&WvsitY4D_Ev^S7x11M%Q%ewN01Z zxlIprolr(!SL179>uMf_yQ{towyN@6=-_d9?b5{IZE$Z@4a0m!*nguR9if@H+AXno zpGgIy)`kM(aJ7de;^wyRf3BtN;5c0icqQuD6ykB`s