diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm index 86aa800248..f87d118f81 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -77,6 +77,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) vore_default_contamination_flavor = "Wet" vore_default_contamination_color = "grey" vore_default_item_mode = IM_DIGEST + can_be_drop_prey = FALSE //CHOMP Add var/reproduction_cooldown = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm index 4f1e1efd9d..0865afb904 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm @@ -75,6 +75,7 @@ vore_default_contamination_flavor = "Wet" vore_default_contamination_color = "grey" vore_default_item_mode = IM_DIGEST + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/alienanimals/skeleton/alt icon_state = "altskeleton" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm index 0b27faa6c8..883e5b887b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm @@ -90,6 +90,7 @@ vore_default_contamination_flavor = "Wet" vore_default_contamination_color = "grey" vore_default_item_mode = IM_DIGEST + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/spacewhale emote_see = list("ripples and flows", "flashes rhythmically","glows faintly","investigates something") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm index 8bae5e7852..783084f09f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm @@ -86,6 +86,8 @@ reload_max = 1 reload_count = 0 reload_time = 7 SECONDS + + can_be_drop_prey = FALSE //CHOMP Add /datum/ai_holder/simple_mob/ranged/kiting/space_ghost diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm index 41eae89376..d0ac5273dc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm @@ -85,6 +85,8 @@ var/flipped = FALSE var/flip_cooldown = 0 + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/startreader emote_see = list("bobs", "digs around","gnashes at something","yawns","snaps at something") 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 24c6ce1ded..c7453f09dc 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 @@ -160,6 +160,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? vore_default_contamination_flavor = "Wet" vore_default_contamination_color = "grey" vore_default_item_mode = IM_DIGEST + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/alienanimals/teppi/init_vore() if(!voremob_loaded) //CHOMPEdit diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index 5262126826..1edfc304f2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -42,6 +42,8 @@ var/has_reproduced = FALSE var/used_dominate // world.time when the dominate power was last used. + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/borer/roundstart roundstart = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index 66c14c7b38..33677238c0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -117,6 +117,8 @@ /obj/item/stack/material/chitin = 1\ ) + can_be_drop_prey = FALSE //CHOMP Add + /mob/living/simple_mob/animal/giant_spider/apply_melee_effects(var/atom/A) if(isliving(A)) var/mob/living/L = A diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm index 44c6cea6f5..f566e738b2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm @@ -64,6 +64,8 @@ meat_amount = 1 say_list_type = /datum/say_list/hare + + can_be_drop_prey = TRUE //CHOMP Add /datum/say_list/hare speak = list("Snrf...","Crk!") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index bdcd9b6179..9831ac3769 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -88,6 +88,7 @@ say_list_type = /datum/say_list/crab var/weaken_amount = 2 // Be careful with this number. High values will equal a permastun. + // Stuns the thing that got hit briefly. /mob/living/simple_mob/animal/sif/hooligan_crab/apply_melee_effects(atom/A) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm index 3a7999f015..f8bf5195e2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm @@ -83,6 +83,7 @@ var/instinct // The points used by Kururaks to decide Who Is The Boss var/obey_pack_rule = TRUE // Decides if the Kururak will automatically assign itself to follow the one with the highest instinct. + /datum/say_list/kururak speak = list("Kurr?","|R|rrh..", "Ksss...") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index 937c45143b..45e5f92f0a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -68,6 +68,7 @@ var/obj/item/clothing/head/hat = null // The hat the Sakimm may be wearing. var/list/friend_loot_list = list(/obj/item/weapon/coin) // What will make this animal non-hostile if held? var/randomize_size = TRUE + can_be_drop_prey = TRUE //CHOMP Add /mob/living/simple_mob/animal/sif/sakimm/verb/remove_hat() set name = "Remove Hat" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm index 2fc4b202a4..53e8a23079 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm @@ -55,6 +55,7 @@ say_list_type = /datum/say_list/savik ai_holder_type = /datum/ai_holder/simple_mob/savik + /datum/say_list/savik speak = list("Hruuugh!","Hrunnph") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm index 219c6eb550..a1965be8af 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm @@ -58,6 +58,7 @@ organ_names = /decl/mob_organ_names/shantak say_list_type = /datum/say_list/shantak + /datum/say_list/shantak speak = list("Shuhn.","Shrunnph?","Shunpf.") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm index be88baab27..fc01dc7f94 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm @@ -8,3 +8,5 @@ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 20, /obj/item/weapon/reagent_containers/food/snacks/meat = 10 ) + + can_be_drop_prey = FALSE //CHOMP Add diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm index f649e5a68f..e18c1ea336 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm @@ -40,6 +40,7 @@ say_list_type = /datum/say_list/siffet ai_holder_type = /datum/ai_holder/simple_mob/siffet + /datum/say_list/siffet speak = list("Yap!", "Heh!", "Huff.") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm index 7127b42830..b61320f87c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm @@ -32,6 +32,8 @@ meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat meat_amount = 5 + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/space/alien/drone name = "alien drone" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm index cf48d42ee1..8876770055 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm @@ -77,6 +77,8 @@ var/turns_since_scan = 0 var/mob/flee_target + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/clockwork/handle_special() if(!stat && prob(2)) // spooky diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm index f4c4719059..b94b3369bd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm @@ -38,6 +38,8 @@ say_list_type = /datum/say_list/mouse // Close enough var/scare_chance = 15 + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/space/bats/apply_melee_effects(var/atom/A) if(isliving(A)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm index c9d75869fb..9efa23c3f8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm @@ -26,6 +26,8 @@ meat_amount = 8 say_list_type = /datum/say_list/bear + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/bear speak = list("RAWR!","Rawr!","GRR!","Growl!") 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 7b21c428bb..b09d61c9c3 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 @@ -59,6 +59,8 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee var/knockdown_chance = 15 + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/space/carp/apply_melee_effects(var/atom/A) if(isliving(A)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm index 875434ebea..e1bf57c6f7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm @@ -27,6 +27,8 @@ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken meat_amount = 3 + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/goose speak = list("HONK!") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm index ad45498057..b153305e89 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_ch.dm @@ -2,6 +2,8 @@ name = "domesticated goose" desc = "It's a domesticated goose. It still looks pretty angry." faction = "neutral" //Mess with this and the goose will eat anyones face, will eat other factions faces, appropiate considering its a hellbird - Jack + + can_be_drop_prey = TRUE //CHOMP Add /mob/living/simple_mob/animal/space/goose/domesticated/casino name = "Donella" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm index 76df7a2382..420f3a498f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm @@ -62,6 +62,8 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive var/rank //pyro, operative, ammo, stealth. more to come. Do not leave blank. + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/space/mouse_army/New() ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index e7dea44853..1aa342ca86 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -46,6 +46,8 @@ say_list_type = /datum/say_list/snake ai_holder_type = /datum/ai_holder/simple_mob/passive + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/snake emote_hear = list("hisses") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index c2decea8af..91952185ae 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -58,6 +58,8 @@ var/time_maw_opened = 0 var/maw_cooldown = 30 SECONDS var/open_maw = FALSE // Are we trying to eat things? + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/space/space_worm/head name = "space worm" diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm index 31ffb6ef1d..9cd2582bd1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm +++ b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm @@ -29,6 +29,8 @@ mob_class = MOB_CLASS_SLIME ai_holder_type = /datum/ai_holder/simple_mob/melee + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/blob/speech_bubble_appearance() return "slime" diff --git a/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm b/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm index b663972372..472af6dd6b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm +++ b/code/modules/mob/living/simple_mob/subtypes/horror/horror .dm @@ -25,3 +25,5 @@ max_n2 = 0 minbodytemp = 0 maxbodytemp = 700 + + can_be_drop_prey = FALSE //CHOMP Add \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm index a52bd28c30..9ffbf209ef 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/humanoid.dm @@ -19,6 +19,8 @@ // Most humans leave a corpse var/corpse = null + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/humanoid/death() ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index b2f981c7fd..14e28d049c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -42,6 +42,7 @@ special_attack_min_range = 2 special_attack_max_range = 7 + //////////////////////////////// // Grenade Attack //////////////////////////////// diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm index 0f183f17d6..ee87745973 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/posessed_ch.dm @@ -47,6 +47,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/merc say_list_type = /datum/say_list/possessed //Set to Null on silenced. + // corpse = /obj/effect/landmark/mobcorpse/possessed // Will eventually leave a full corpse with an activated RIG on it. But not yet. diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm index 121e112a7a..1aab37cb2d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm @@ -23,6 +23,7 @@ corpse = /obj/effect/landmark/mobcorpse/russian + /mob/living/simple_mob/humanoid/russian/ranged icon_state = "russianranged" icon_living = "russianranged" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm index 981fa91c38..1c047f9093 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical.dm @@ -18,6 +18,8 @@ taser_kill = FALSE poison_resist = 1.0 shock_resist = -0.5 + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/mechanical/isSynthetic() return TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm index 8196ce60f8..57cc5f4b0b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metBaseType.dm @@ -59,6 +59,8 @@ var/evo_limit = 0 var/next meat_type = /obj/item/toy/figure/bounty_hunter + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/metroid/Initialize() nutrition = 100 //Have them start off pretty hungry still. diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm index 83910850e3..a733e79b14 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm @@ -62,6 +62,8 @@ var/list/construct_spells = list() // var/do_glow = TRUE +can_be_drop_prey = FALSE //CHOMP Add + /mob/living/simple_mob/construct/place_spell_in_hand(var/path) if(!path || !ispath(path)) return 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm index 9151ea6e2e..95e3ecebe8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm @@ -29,6 +29,8 @@ speak_emote = list("gibbers") ai_holder_type = /datum/ai_holder/simple_mob/melee + + can_be_drop_prey = FALSE //CHOMP Add // Strong Variant /mob/living/simple_mob/creature/strong diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm index 0ee4daf433..36b68d05ca 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm @@ -41,6 +41,8 @@ min_n2 = 0 max_n2 = 0 minbodytemp = 0 + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/faithless/Process_Spacemove(var/check_drift = 0) return 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm index 514b2087b6..1671459c30 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm @@ -40,6 +40,8 @@ var/all_special_attacks = list(GA_ADS, GA_CALLDOWN, GA_LINES, GA_BULLETHELL, GA_ILLUSION, GA_CONFUSION, GA_SPEEDUP) loot_list = list(/obj/item/device/nif/glitch = 100) + + can_be_drop_prey = FALSE //CHOMP Add /obj/item/projectile/energy/slow_orb name = "TROJAN" diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm index 50ee63637c..7b0f11ed6f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm @@ -28,6 +28,8 @@ meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat meat_amount = 4 + + can_be_drop_prey = FALSE //CHOMP Add /decl/mob_organ_names/tomato hit_zones = list("flesh", "leaf", "mouth") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm index be6af537c8..a9b95c9d70 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm @@ -31,6 +31,8 @@ meat_amount = 2 pixel_x = -16 + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/space/tree/apply_melee_effects(var/atom/A) if(isliving(A)) diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 68674189a6..e2d4ecea57 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -81,6 +81,8 @@ var/list/_slime_default_emotes = list( var/mood = ":3" // Icon to use to display 'mood', as an overlay. can_enter_vent_with = list(/obj/item/clothing/head) + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/slime/get_available_emotes() return global._slime_default_emotes.Copy() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm index d5637190d3..77f16fc7f6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon_ch.dm @@ -177,6 +177,8 @@ I think I covered everything. "Normal" ) var/eyes + + can_be_drop_prey = FALSE //CHOMP Add /// /// Subtypes diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm b/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm index 02cf178447..2a6871ac12 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm @@ -40,6 +40,8 @@ ) has_langs = list(LANGUAGE_ANIMAL) + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/animal/passive/honkpet/attack_hand(mob/living/user as mob) if(user.a_intent == I_DISARM) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm index ac65c8b8bc..4422d5775d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm @@ -34,6 +34,8 @@ "catgirlblack", "catgirlbrown" ) + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/catgirl/New() ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm b/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm index 418fdac80d..c667b772cf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/chungus.dm @@ -44,6 +44,7 @@ say_list_type = /datum/say_list/chungus ai_holder_type = /datum/ai_holder/simple_mob/melee + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/aggressive/chungus/death() var/death = list('sound/effects/mob_effects/m_scream_1.ogg','sound/effects/mob_effects/m_scream_2.ogg','sound/effects/mob_effects/m_scream_3.ogg','sound/effects/mob_effects/m_scream_4.ogg') diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm index df106b4e1d..78c04b3baf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm @@ -31,6 +31,7 @@ vore_default_mode = DM_HOLD // They're cookiepeople, what do you expect? vore_digest_chance = 10 // Gonna become as sweet as sugar, soon. vore_icons = SA_ICON_LIVING | SA_ICON_REST + can_be_drop_prey = FALSE //CHOMP Add /datum/ai_holder/simple_mob/passive/cookiegirl/on_hear_say(mob/living/speaker, message) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm index 1a492c665b..c255cc31a0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm @@ -72,6 +72,8 @@ vore_stomach_flavor = "You have ended up in the fuel processor of this corrupted machine. This place was definitely not designed with safety and comfort in mind. The heated and cramped surroundings oozing potent fluids all over your form, eager to do nothing less than breaking you apart to fuel its rampage for the next few days... hours... minutes? Oh dear..." loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6) + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi name = "corrupt corrupt hound" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index 26056324a1..c5a04ea5b5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -67,6 +67,8 @@ vore_min_size = RESIZE_SMALL vore_pounce_chance = 0 // Beat them into crit before eating. vore_icons = SA_ICON_LIVING + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/aggressive/deathclaw/Login() . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm index eda4ed5bf5..a98d942dd1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm @@ -46,6 +46,8 @@ var/shift_state = AB_SHIFT_NONE var/last_shift = 0 var/is_shifting = FALSE + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/demon/init_vore() if(!voremob_loaded) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm index 96a6d1adc7..f7b1492f0d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm @@ -38,6 +38,8 @@ min_n2 = 0 max_n2 = 0 minbodytemp = 0 + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/vore/aggressive/dino diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index 239533ef74..1e5ed98d6c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -49,6 +49,8 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee say_list_type = /datum/say_list/dragonboss + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/aggressive/dragon/Process_Spacemove(var/check_drift = 0) return 1 //No drifting in space for space dragons! diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm index bd033b9f32..41895be835 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm @@ -43,6 +43,8 @@ special_attack_min_range = 1 special_attack_max_range = 5 special_attack_cooldown = 100 + + can_be_drop_prey = FALSE //CHOMP Add // Pepe is love, not hate. /mob/living/simple_mob/vore/aggressive/frog/New() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm index e814e3e93a..e9c0c867bd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm @@ -39,6 +39,8 @@ can_buckle = TRUE buckle_movable = TRUE buckle_lying = FALSE + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/greatwolf diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf_ch.dm index 3478255cb6..6becc54b61 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf_ch.dm @@ -38,6 +38,8 @@ can_buckle = TRUE buckle_movable = TRUE buckle_lying = FALSE + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/greatwolf diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm index 481f73a4cd..d2760e8304 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm @@ -49,6 +49,8 @@ say_list_type = /datum/say_list/hippo ai_holder_type = /datum/ai_holder/simple_mob/retaliate + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/vore/hippo //I don't know why it's in a seperate line but everyone does it so i do it diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm index c5fa952264..9353c3619f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm @@ -34,6 +34,8 @@ say_list_type = /datum/say_list/horse ai_holder_type = /datum/ai_holder/simple_mob/retaliate + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/horse/big name = "horse" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm b/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm index fdd78a1eb4..0715a62d0c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm @@ -16,6 +16,8 @@ say_list_type = /datum/say_list/jelly ai_holder_type = /datum/ai_holder/simple_mob/retaliate/jelly + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/animal/space/jelly diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm index 15a86126c2..671696bd3f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm @@ -53,6 +53,8 @@ say_list_type = /datum/say_list/lamia ai_holder_type = /datum/ai_holder/simple_mob/passive + + can_be_drop_prey = FALSE //CHOMP Add /* CHOMPEdit - now handled by new belly features. /mob/living/simple_mob/vore/lamia/update_fullness() 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 37db06011b..061e1fc450 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm @@ -48,6 +48,8 @@ vore_bump_emote = "tries to snap up" nom_mob = TRUE + + can_be_drop_prey = FALSE //CHOMP Add /datum/category_item/catalogue/fauna/leopardmander name = "Sivian Fauna - Va'aen Drake" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm index d8fb0f212f..8f2ee24117 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm @@ -46,6 +46,8 @@ vore_default_mode = DM_HEAL vore_pounce_maxhealth = 125 vore_bump_emote = "tries to snap up" + + can_be_drop_prey = FALSE //CHOMP Add /datum/category_item/catalogue/fauna/leopardmander name = "Sivian Fauna - Va'aen Drake" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm b/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm index c2ee309206..7fb50c4736 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/lizardman.dm @@ -32,6 +32,8 @@ say_list_type = /datum/say_list/lizardman ai_holder_type = /datum/ai_holder/simple_mob/melee + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/lizardman diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm index 302493b86e..e9f1d9a036 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm @@ -20,6 +20,8 @@ desc = "A rectangular steel crate. This one looks particularly unstable." var/mimic_chance = 30 var/mimic_active = TRUE + + can_be_drop_prey = FALSE //CHOMP Add /obj/structure/closet/crate/mimic/open() if(src.opened) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm index 1e30c139f2..63dc959235 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm @@ -8,6 +8,8 @@ /datum/say_list/clown speak = list("HONK", "Honk!", "Henk!") emote_see = list("honks") + + can_be_drop_prey = FALSE //CHOMP Add diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index a088d8282b..22e5ca0888 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -88,6 +88,8 @@ "rad" = 100 ) + can_be_drop_prey = FALSE //CHOMP Add + /mob/living/simple_mob/vore/oregrub/lava name = "mature lavagrub" desc = "A mature, rocky lavagrub" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index 1de0976ff7..3297640ce1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -46,6 +46,8 @@ var/mob/living/carbon/human/friend var/tamed = 0 var/tame_chance = 50 //It's a fiddy-fiddy default you may get a buddy pal or you may get mauled and ate. Win-win! + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm index 0ff9d3d44c..eff23b4b90 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm @@ -41,6 +41,8 @@ say_list_type = /datum/say_list/panther ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/vore/aggressive/panther diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm index ab2309f837..65df713486 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants_ch/pitcher.dm @@ -59,6 +59,8 @@ GLOBAL_LIST_INIT(pitcher_plant_lure_messages, list( var/scent_strength = 5 //How much can a hungry pitcher confuse nearby people? var/last_lifechecks = 0 //Timing variable to limit vore/hungry proc calls var/list/pitcher_plant_lure_messages = null + + can_be_drop_prey = FALSE //CHOMP Add diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index 4740aa24d2..42255fd49e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -69,6 +69,8 @@ say_list_type = /datum/say_list/rat ai_holder_type = /datum/ai_holder/simple_mob/melee/rat + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/aggressive/rat/init_vore() if(!voremob_loaded) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm index 292525583b..75fa11f63a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat_ch.dm @@ -1,4 +1,6 @@ /mob/living/simple_mob/vore/aggressive/rat/event maxHealth = 50 health = 50 - vore_pounce_chance = 10 \ No newline at end of file + vore_pounce_chance = 10 + + can_be_drop_prey = FALSE //CHOMP Add \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm index d43ea7f622..88288a8090 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/slug_ch.dm @@ -42,6 +42,8 @@ var/list/my_slime = list() var/slime_max = 35 //With a slug which moves once every 10 seconds and a 5 minute delete timer, this should never exceed 30. var/mob/living/vore_memory = null + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/vore/slug //I guess separating the vore variables is a little more organized? vore_bump_chance = 100 //Always attempt a bump nom if possible... diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm index 1eee080207..c9ad0e28e3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm @@ -53,6 +53,8 @@ pixel_y = -16 ai_holder_type = /datum/ai_holder/simple_mob/melee + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/vore/aggressive/giant_snake diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 23bf4e8444..cfb0f5ea77 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -60,6 +60,8 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst var/shock_chance = 10 // Beware var/powerdraw = 100000 // previous value 150000 // CHOMPStation Addition, Rykka waz here. *pawstamp* var/tracked = FALSE + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/solargrub emote_see = list("squelches", "squishes") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth_ch.dm index 0deb43a535..a25ef4021b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth_ch.dm @@ -67,6 +67,8 @@ "bomb" = 100, "bio" = 100, "rad" = 100) + + can_be_drop_prey = FALSE //CHOMP Add /datum/say_list/solarmoth emote_see = list("flutters") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm index 61c3d57faa..0e71039ef7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm @@ -30,6 +30,8 @@ default_pixel_x = -16 has_hands = 1 + + can_be_drop_prey = FALSE //CHOMP Add // Nomnomn /mob/living/simple_mob/vore/weretiger diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index 3b339b71be..aab12f953b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -32,6 +32,8 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive catalogue_data = list(/datum/category_item/catalogue/fauna/wolf) + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/animal/wolf diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm index fa4595459a..94f2e35469 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm @@ -23,6 +23,8 @@ say_list_type = /datum/say_list/wolfgirl ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative/wolfgirl + + can_be_drop_prey = FALSE //CHOMP Add // Activate Noms! /mob/living/simple_mob/vore/wolfgirl diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm index c3e8b129c1..2c991b1c54 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/xenomorph.dm @@ -87,6 +87,8 @@ var/datum/action/innate/xeno_ch/xeno_corrode/corrode_action = new var/datum/action/innate/xeno_ch/xeno_pounce/pounce_action = new var/datum/action/innate/xeno_ch/xeno_spin/spin_action = new + + can_be_drop_prey = FALSE //CHOMP Add /mob/living/simple_mob/xeno_ch/Initialize() ..()