diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm
index 2b1e12aa92..0e757f7ed9 100644
--- a/code/modules/economy/vending_machines_vr.dm
+++ b/code/modules/economy/vending_machines_vr.dm
@@ -2786,7 +2786,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi = 10,
- /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/fox = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/human = 10,
@@ -3242,7 +3242,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi = 10,
- /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/fox = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat/human = 10,
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 61b5921157..5b18636bf6 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -854,32 +854,6 @@
nutriment_desc = list("dryness" = 2, "bread" = 2)
bitesize = 1
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat
- name = "fillet"
- desc = "A fillet of carp meat"
- icon_state = "fishfillet"
- filling_color = "#FFDEFE"
- center_of_mass = list("x"=17, "y"=13)
- bitesize = 6
-
- var/toxin_type = "carpotoxin"
- var/toxin_amount = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent(toxin_type, toxin_amount)
-
-/obj/item/weapon/reagent_containers/food/snacks/crabmeat
- name = "crab legs"
- desc = "... Coffee? Is that you?"
- icon_state = "crabmeat"
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize()
- . = ..()
- reagents.add_reagent("seafood", 2)
-
/obj/item/weapon/reagent_containers/food/snacks/crab_legs
name = "steamed crab legs"
desc = "Crab legs steamed and buttered to perfection. One day when the boss gets hungry..."
@@ -894,21 +868,6 @@
reagents.add_reagent("seafood", 6)
reagents.add_reagent("sodiumchloride", 1)
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif
- desc = "A fillet of sivian fish meat."
- filling_color = "#2c2cff"
- color = "#2c2cff"
- toxin_type = "neurotoxic_protein"
- toxin_amount = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish
- toxin_type = "murk_protein"
-
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish
- desc = "A fillet of fish meat."
- toxin_type = "neurotoxic_protein"
- toxin_amount = 1
-
/obj/item/weapon/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
desc = "A finger of fish."
@@ -933,69 +892,6 @@
. = ..()
reagents.add_reagent("protein", 4)
-/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
- name = "huge mushroom slice"
- desc = "A slice from a huge mushroom."
- icon_state = "hugemushroomslice"
- filling_color = "#E0D7C5"
- center_of_mass = list("x"=17, "y"=16)
- nutriment_amt = 3
- nutriment_desc = list("raw" = 2, "mushroom" = 2)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/Initialize()
- . = ..()
- reagents.add_reagent("psilocybin", 3)
-
-/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
- name = "tomato slice"
- desc = "A slice from a huge tomato"
- icon_state = "tomatomeat"
- filling_color = "#DB0000"
- center_of_mass = list("x"=17, "y"=16)
- nutriment_amt = 3
- nutriment_desc = list("raw" = 2, "tomato" = 3)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/bearmeat
- name = "bear meat"
- desc = "A very manly slab of meat."
- icon_state = "bearmeat"
- filling_color = "#DB0000"
- center_of_mass = list("x"=16, "y"=10)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/bearmeat/Initialize()
- . = ..()
- reagents.add_reagent("protein", 12)
- reagents.add_reagent("hyperzine", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat
- name = "xenomeat"
- desc = "A slab of green meat. Smells like acid."
- icon_state = "xenomeat"
- filling_color = "#43DE18"
- center_of_mass = list("x"=16, "y"=10)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/Initialize()
- . = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("pacid",6)
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
- name = "spider meat"
- desc = "A slab of green meat."
- icon_state = "xenomeat"
- filling_color = "#43DE18"
- center_of_mass = list("x"=16, "y"=10)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
- . = ..()
- reagents.add_reagent("spidertoxin",6)
- reagents.remove_reagent("pacid",6)
-
/obj/item/weapon/reagent_containers/food/snacks/meatball
name = "meatball"
desc = "A great meal all round."
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index c95ddd3d1d..e7a16f5364 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -44,16 +44,178 @@
//same as plain meat
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
- name = "Corgi meat"
+ name = "dogmeat"
desc = "Tastes like... well, you know."
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
- name = "chicken"
+ name = "poultry"
icon_state = "chickenbreast"
cooked_icon = "chickensteak"
filling_color = "#BBBBAA"
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize()
- . = ..()
- reagents.remove_reagent("triglyceride", INFINITY)
- //Chicken is low fat. Less total calories than other meats
\ No newline at end of file
+ . = ..()
+ reagents.remove_reagent("triglyceride", INFINITY)
+ //Chicken is low fat. Less total calories than other meats
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat
+ name = "fillet"
+ desc = "A fillet of carp meat"
+ icon_state = "fishfillet"
+ filling_color = "#FFDEFE"
+ center_of_mass = list("x"=17, "y"=13)
+ bitesize = 6
+
+ var/toxin_type = "carpotoxin"
+ var/toxin_amount = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent(toxin_type, toxin_amount)
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif
+ desc = "A fillet of sivian fish meat."
+ filling_color = "#2c2cff"
+ color = "#2c2cff"
+ toxin_type = "neurotoxic_protein"
+ toxin_amount = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish
+ toxin_type = "murk_protein"
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish
+ desc = "A fillet of fish meat."
+ toxin_type = "neurotoxic_protein"
+ toxin_amount = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/crabmeat
+ name = "crustacean legs"
+ desc = "... Coffee? Is that you?"
+ icon_state = "crabmeat"
+ bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize()
+ . = ..()
+ reagents.add_reagent("seafood", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
+ name = "fungus slice"
+ desc = "A slice from a huge mushroom."
+ icon_state = "hugemushroomslice"
+ filling_color = "#E0D7C5"
+ center_of_mass = list("x"=17, "y"=16)
+ nutriment_amt = 3
+ nutriment_desc = list("raw" = 2, "mushroom" = 2)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/Initialize()
+ . = ..()
+ reagents.add_reagent("psilocybin", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
+ name = "tomato slice"
+ desc = "A slice from a huge tomato"
+ icon_state = "tomatomeat"
+ filling_color = "#DB0000"
+ center_of_mass = list("x"=17, "y"=16)
+ nutriment_amt = 3
+ nutriment_desc = list("raw" = 2, "tomato" = 3)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/bearmeat
+ name = "bearmeat"
+ desc = "A very manly slab of meat."
+ icon_state = "bearmeat"
+ filling_color = "#DB0000"
+ center_of_mass = list("x"=16, "y"=10)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/bearmeat/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 12)
+ reagents.add_reagent("hyperzine", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ name = "xenomeat"
+ desc = "A slab of green meat. Smells like acid."
+ icon_state = "xenomeat"
+ filling_color = "#43DE18"
+ center_of_mass = list("x"=16, "y"=10)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 6)
+ reagents.add_reagent("pacid",6)
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat.
+ name = "insect meat"
+ desc = "A slab of green meat."
+ icon_state = "xenomeat"
+ filling_color = "#43DE18"
+ center_of_mass = list("x"=16, "y"=10)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize()
+ . = ..()
+ reagents.add_reagent("spidertoxin",6)
+ reagents.remove_reagent("pacid",6)
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/fox
+ name = "foxmeat"
+ desc = "The fox doesn't say a goddamn thing, now."
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
+ name = "grubmeat"
+ desc = "A slab of grub meat, it gives a gentle shock if you touch it"
+ icon = 'icons/obj/food.dmi'
+ icon_state = "grubmeat"
+ center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 1)
+ reagents.add_reagent("shockchem", 6)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/worm
+ name = "weird meat"
+ desc = "A chunk of pulsating meat."
+ icon_state = "wormmeat"
+ health = 180
+ filling_color = "#551A8B"
+ center_of_mass = list("x"=16, "y"=14)
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/worm/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 6)
+ reagents.add_reagent("phoron", 3)
+ reagents.add_reagent("myelamine", 3)
+ src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/worm/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W,/obj/item/weapon/material/knife))
+ var/to_spawn = pickweight(/obj/random/junk = 30,
+ /obj/random/trash = 30,
+ /obj/random/maintenance/clean = 15,
+ /obj/random/tool = 15,
+ /obj/random/medical = 3,
+ /obj/random/bomb_supply = 7,
+ /obj/random/contraband = 3,
+ /obj/random/unidentified_medicine/old_medicine = 7,
+ /obj/item/weapon/strangerock = 3,
+ /obj/item/weapon/ore/phoron = 7,
+ /obj/random/handgun = 1,
+ /obj/random/toolbox = 4,
+ /obj/random/drinkbottle = 5
+ )
+
+ new to_spawn(get_turf(src))
+
+ if(prob(20))
+ user.visible_message("Something oozes out of \the [src] as it is cut.")
+
+ to_chat(user, "You cut the tissue holding the chunks together.")
+
+ ..()
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 132bba78ec..0175a9dc81 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -161,19 +161,6 @@
reagents.add_reagent("protein", 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
- name = "grub meat"
- desc = "A slab of grub meat, it gives a gentle shock if you touch it"
- icon = 'icons/obj/food.dmi'
- icon_state = "grubmeat"
- center_of_mass = list("x"=16, "y"=10)
-
-/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/Initialize()
- . = ..()
- reagents.add_reagent("protein", 1)
- reagents.add_reagent("shockchem", 6)
- bitesize = 6
-
/obj/item/weapon/reagent_containers/food/snacks/bugball
name = "bugball"
desc = "A hard piece of chitin, don't chip a tooth!"
diff --git a/code/modules/mob/living/butchering.dm b/code/modules/mob/living/butchering.dm
index b46abcac01..14adae33a3 100644
--- a/code/modules/mob/living/butchering.dm
+++ b/code/modules/mob/living/butchering.dm
@@ -1,12 +1,13 @@
/mob/living
- var/meat_amount = 0 // How much meat to drop from this mob when butchered
- var/obj/meat_type // The meat object to drop
+ var/meat_amount = 0 // How much meat to drop from this mob when butchered
+ var/obj/meat_type // The meat object to drop
var/gib_on_butchery = FALSE
+ var/butchery_drops_organs = TRUE // Do we spawn and/or drop organs when butchered?
- var/list/butchery_loot // Associated list, path = number.
+ var/list/butchery_loot // Associated list, path = number.
// Harvest an animal's delicious byproducts
/mob/living/proc/harvest(var/mob/user, var/obj/item/I)
@@ -40,7 +41,7 @@
butchery_loot.Cut()
butchery_loot = null
- if(LAZYLEN(organs))
+ if(LAZYLEN(organs) && butchery_drops_organs)
organs_by_name.Cut()
for(var/path in organs)
@@ -62,7 +63,7 @@
OR.removed()
organs -= OR
- if(LAZYLEN(internal_organs))
+ if(LAZYLEN(internal_organs) && butchery_drops_organs)
internal_organs_by_name.Cut()
for(var/path in internal_organs)
diff --git a/code/modules/mob/living/organs.dm b/code/modules/mob/living/organs.dm
index 76694553f6..133961a631 100644
--- a/code/modules/mob/living/organs.dm
+++ b/code/modules/mob/living/organs.dm
@@ -17,21 +17,22 @@
return organs_by_name[zone]
/mob/living/gib()
- for(var/path in internal_organs)
- if(ispath(path))
- var/obj/item/organ/neworg = new path(src, TRUE)
- internal_organs -= path
- neworg.name = "[name] [neworg.name]"
- neworg.meat_type = meat_type
- internal_organs |= neworg
+ if(butchery_drops_organs)
+ for(var/path in internal_organs)
+ if(ispath(path))
+ var/obj/item/organ/neworg = new path(src, TRUE)
+ internal_organs -= path
+ neworg.name = "[name] [neworg.name]"
+ neworg.meat_type = meat_type
+ internal_organs |= neworg
- for(var/obj/item/organ/I in internal_organs)
- I.removed()
- if(isturf(I?.loc)) // Some organs qdel themselves or other things when removed
- I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
+ for(var/obj/item/organ/I in internal_organs)
+ I.removed()
+ if(isturf(I?.loc)) // Some organs qdel themselves or other things when removed
+ I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
- for(var/obj/item/organ/external/E in src.organs)
- if(!ispath(E))
- E.droplimb(0,DROPLIMB_EDGE,1)
+ for(var/obj/item/organ/external/E in src.organs)
+ if(!ispath(E))
+ E.droplimb(0,DROPLIMB_EDGE,1)
..()
diff --git a/code/modules/mob/living/simple_mob/butchering.dm b/code/modules/mob/living/simple_mob/butchering.dm
index c03c6b8015..46e888d925 100644
--- a/code/modules/mob/living/simple_mob/butchering.dm
+++ b/code/modules/mob/living/simple_mob/butchering.dm
@@ -1,5 +1,6 @@
/mob/living/simple_mob
gib_on_butchery = TRUE
+ butchery_drops_organs = FALSE
/mob/living/simple_mob/can_butcher(var/mob/user, var/obj/item/I) // Override for special butchering checks.
. = ..()
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 9f652e34b0..9222975f1f 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
@@ -64,7 +64,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
maxHealth = 600
health = 600
movement_cooldown = 2
- meat_amount = 10
+ meat_amount = 12
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
response_help = "pets"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
index 9ba9437fa7..a8ec4d3894 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
@@ -26,7 +26,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
say_list_type = /datum/say_list/chicken
- meat_amount = 2
+ meat_amount = 4
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
var/eggsleft = 0
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
index 3d590a19fd..0ff6ee6496 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
@@ -19,7 +19,7 @@
say_list_type = /datum/say_list/cow
- meat_amount = 6
+ meat_amount = 10
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
var/datum/reagents/udder = null
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
index 1e7991d6a2..477dcb5aa7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
@@ -22,7 +22,7 @@
say_list_type = /datum/say_list/goat
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
- meat_amount = 4
+ meat_amount = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
var/datum/reagents/udder = null
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 e6dfc3f708..66c14c7b38 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
@@ -98,14 +98,14 @@
speak_emote = list("chitters")
- meat_amount = 1
+ meat_amount = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat
say_list_type = /datum/say_list/spider
tame_items = list(
/obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10,
- /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 40,
+ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 40,
/obj/item/weapon/reagent_containers/food/snacks/meat = 20
)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm
index d2d0379ffe..345e315a16 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm
@@ -21,6 +21,8 @@
old_x = -16
old_y = 0
+ meat_amount = 20
+
projectiletype = /obj/item/projectile/energy/spidertoxin
projectilesound = 'sound/weapons/pierce.ogg'
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
index 2af3c8f6e7..c63ac35fa8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm
@@ -51,7 +51,8 @@
default_pixel_x = -16
old_x = -16
old_y = 0
-
+ meat_amount = 15
+
egg_type = /obj/effect/spider/eggcluster/royal
/mob/living/simple_mob/animal/giant_spider/webslinger/event // YW CHANGE
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm
index a772346555..7ff84ff697 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm
@@ -18,7 +18,8 @@
organ_names = /decl/mob_organ_names/crab
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/crab
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat
+ meat_amount = 3
say_list_type = /datum/say_list/crab
@@ -51,12 +52,5 @@
. = ..()
adjust_scale(rand(5,12) / 10)
-// Meat!
-
-/obj/item/weapon/reagent_containers/food/snacks/meat/crab
- name = "meat"
- desc = "A chunk of meat."
- icon_state = "crustacean-meat"
-
/decl/mob_organ_names/crab
hit_zones = list("cephalothorax", "abdomen", "left walking legs", "right walking legs", "left swimming legs", "right swimming legs", "left pincer", "right pincer")
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm
index 33ea730b2e..8608c6f7a7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm
@@ -23,6 +23,7 @@
holder_type = /obj/item/weapon/holder/fish
meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish
+ meat_amount = 3
// By default they can be in any water turf. Subtypes might restrict to deep/shallow etc
var/global/list/suitable_turf_types = list(
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
index 89ccfc3a25..741f3f279a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
@@ -2,6 +2,7 @@
desc = "A genetic marvel, combining the docility and aesthetics of the koi with some of the resiliency and cunning of the noble space carp."
health = 50
maxHealth = 50
+ meat_amount = 0
/mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize()
. = ..()
@@ -67,7 +68,7 @@
icon_state = "measelshark"
icon_living = "measelshark"
icon_dead = "measelshark-dead"
- meat_amount = 6 //Big fish, tons of meat. Great for feasts.
+ meat_amount = 8 //Big fish, tons of meat. Great for feasts.
meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk
vore_active = 1
vore_bump_chance = 100
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm
index ca94f0373f..83af74c076 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm
@@ -23,6 +23,8 @@
say_list_type = /datum/say_list/lizard
+ meat_amount = 1
+
/mob/living/simple_mob/animal/passive/lizard/large
desc = "A cute, big lizard."
maxHealth = 20
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
index a4b0ba0112..60520b51e5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm
@@ -35,7 +35,8 @@
has_langs = list("Mouse")
holder_type = /obj/item/weapon/holder/mouse
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_amount = 1
+ butchery_loot = list()
say_list_type = /datum/say_list/mouse
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm
index 3e3647a0b0..5616b4b524 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm
@@ -16,6 +16,9 @@
organ_names = /decl/mob_organ_names/penguin
+ meat_amount = 3
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
+
harm_intent_damage = 5
melee_damage_lower = 10
melee_damage_upper = 15
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
index e7be8a1f57..27bd772e25 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
@@ -25,7 +25,7 @@
var/mob/M = loc
var/was_in_hands = istype(M) && (src == M.get_active_hand() || src == M.get_inactive_hand())
-
+
critter = new critter(critter_holder)
critter_holder = new(loc, critter)
@@ -138,6 +138,7 @@
can_pull_mobs = MOB_PULL_SMALLER
say_list_type = /datum/say_list/possum
catalogue_data = list(/datum/category_item/catalogue/fauna/opossum)
+ meat_amount = 2
/mob/living/simple_mob/animal/passive/opossum/adjustBruteLoss(var/amount,var/include_robo)
. = ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm
index c7692b391b..d7c2bf37db 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm
@@ -23,6 +23,9 @@
softfall = TRUE
parachuting = TRUE
+ meat_amount = 1
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
+
attacktext = list("clawed", "pecked")
speak_emote = list("chirps", "caws")
has_langs = list("Bird")
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
index 2c203844e3..ea41d429f8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
@@ -37,6 +37,7 @@ var/list/_cat_default_emotes = list(
movement_cooldown = 0.5 SECONDS
+ meat_amount = 1
see_in_dark = 6 // Not sure if this actually works.
response_help = "pets"
response_disarm = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
index 1140250fb2..7ec636defd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
@@ -23,7 +23,7 @@
minbodytemp = 223 //Below -50 Degrees Celcius
maxbodytemp = 323 //Above 50 Degrees Celcius
- meat_amount = 1
+ meat_amount = 2
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox
say_list_type = /datum/say_list/fox
@@ -186,9 +186,6 @@
set_dir(get_dir(src, friend))
say("Yap!")
*/
-/obj/item/weapon/reagent_containers/food/snacks/meat/fox
- name = "Fox meat"
- desc = "The fox doesn't say a goddamn thing, now."
//Captain fox
/mob/living/simple_mob/animal/passive/fox/renault
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm
index 989ca0266b..b830cbec2b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm
@@ -28,7 +28,10 @@
maxHealth = 25
health = 25
- minbodytemp = 175 //yw edit, Makes mobs survive cryogaia temps
+
+ meat_amount = 2
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
movement_cooldown = 0
melee_damage_lower = 2
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm
index dac94477d0..31b25ee36f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm
@@ -32,6 +32,9 @@
movement_cooldown = 0
+ meat_amount = 4
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
+
melee_damage_lower = 2
melee_damage_upper = 10
base_attack_cooldown = 1 SECOND
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
index c8935093a4..1a93754af3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
@@ -56,7 +56,7 @@
tame_items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown = 90,
- /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/meat = 5
)
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 0c2eb934aa..44c6cea6f5 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
@@ -61,7 +61,7 @@
organ_names = /decl/mob_organ_names/hare
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_amount = 1
say_list_type = /datum/say_list/hare
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 076c19a066..bdcd9b6179 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
@@ -72,7 +72,8 @@
attack_edge = TRUE
melee_attack_delay = 1 SECOND
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/crab
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat
+ meat_amount = 6
response_help = "pets"
response_disarm = "gently pushes aside"
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 0ea7bfb5c8..3a7999f015 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
@@ -48,6 +48,7 @@
attacktext = list("gouged", "bit", "cut", "clawed", "whipped")
organ_names = /decl/mob_organ_names/kururak
+ meat_amount = 5
armor = list(
"melee" = 30,
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 a94bdb2659..937c45143b 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
@@ -40,6 +40,7 @@
melee_damage_upper = 15
base_attack_cooldown = 1 SECOND
attacktext = list("nipped", "bit", "cut", "clawed")
+ meat_amount = 3
armor = list(
"melee" = 15,
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 bb1445b6f2..2fc4b202a4 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
@@ -49,7 +49,7 @@
tame_items = list(
/obj/item/organ = 70,
- /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 30,
+ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 30,
/obj/item/weapon/reagent_containers/food/snacks/meat = 20
)
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 dab82b850b..be88baab27 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
@@ -5,6 +5,6 @@
heat_resist = -0.5
tame_items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 20,
+ /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 20,
/obj/item/weapon/reagent_containers/food/snacks/meat = 10
)
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 d3cda1f22b..7127b42830 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
@@ -31,6 +31,7 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ meat_amount = 5
/mob/living/simple_mob/animal/space/alien/drone
name = "alien drone"
@@ -68,7 +69,7 @@
old_x = -16
icon_expected_width = 64
icon_expected_height = 64
- meat_amount = 5
+ meat_amount = 8
/mob/living/simple_mob/animal/space/alien/queen
name = "alien queen"
@@ -84,7 +85,7 @@
projectilesound = 'sound/weapons/pierce.ogg'
- movement_cooldown = 8
+ movement_cooldown = 10
/mob/living/simple_mob/animal/space/alien/queen/empress
name = "alien empress"
@@ -95,7 +96,7 @@
icon_rest = "queen_sleep"
maxHealth = 400
health = 400
- meat_amount = 5
+ meat_amount = 15
pixel_x = -16
old_x = -16
@@ -111,7 +112,7 @@
icon_rest = "empress_rest"
maxHealth = 600
health = 600
- meat_amount = 10
+ meat_amount = 40
melee_damage_lower = 15
melee_damage_upper = 25
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 a775c315f9..595e3557cf 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
@@ -33,6 +33,7 @@
has_langs = list("Mouse")
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_amount = 2
say_list_type = /datum/say_list/mouse // Close enough
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 e4199373bd..c9d75869fb 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
@@ -23,6 +23,7 @@
attacktext = list("mauled")
meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
+ meat_amount = 8
say_list_type = /datum/say_list/bear
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 f5a18eb16a..7b21c428bb 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
@@ -53,7 +53,7 @@
organ_names = /decl/mob_organ_names/fish
- meat_amount = 1
+ meat_amount = 5
meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
ai_holder_type = /datum/ai_holder/simple_mob/melee
@@ -92,7 +92,7 @@
icon_expected_width = 64
icon_expected_height = 32
- meat_amount = 3
+ meat_amount = 7
/mob/living/simple_mob/animal/space/carp/large/huge
@@ -115,7 +115,7 @@
icon_expected_width = 64
icon_expected_height = 64
- meat_amount = 10
+ meat_amount = 15
/mob/living/simple_mob/animal/space/carp/holographic
@@ -156,4 +156,4 @@
..()
derez()
-
+
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 9f028ed56d..c4f41bd3ba 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
@@ -25,7 +25,8 @@
has_langs = list("Bird")
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
+ meat_amount = 3
/datum/say_list/goose
speak = list("HONK!")
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 c30dd4be5a..40aea9ea5d 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
@@ -34,6 +34,9 @@
response_disarm = "shoos"
response_harm = "kicks"
+ meat_amount = 2
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
melee_damage_lower = 2
melee_damage_upper = 3
attacktext = list("bitten")
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 ca5ab5e962..c2decea8af 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
@@ -35,7 +35,7 @@
mob_class = MOB_CLASS_ABERRATION // It's a monster.
- meat_amount = 2
+ meat_amount = 10
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/worm
var/mob/living/simple_mob/animal/space/space_worm/previous //next/previous segments, correspondingly
@@ -370,47 +370,4 @@
if(previous)
previous.update_body_faction()
return 1
- return 0
-
-// Worm meat.
-
-/obj/item/weapon/reagent_containers/food/snacks/meat/worm
- name = "meat"
- desc = "A chunk of pulsating meat."
- icon_state = "wormmeat"
- health = 180
- filling_color = "#551A8B"
- center_of_mass = list("x"=16, "y"=14)
-
-/obj/item/weapon/reagent_containers/food/snacks/meat/worm/Initialize()
- . = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("phoron", 3)
- reagents.add_reagent("myelamine", 3)
- src.bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/meat/worm/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W,/obj/item/weapon/material/knife))
- var/to_spawn = pickweight(/obj/random/junk = 30,
- /obj/random/trash = 30,
- /obj/random/maintenance/clean = 15,
- /obj/random/tool = 15,
- /obj/random/medical = 3,
- /obj/random/bomb_supply = 7,
- /obj/random/contraband = 3,
- /obj/random/unidentified_medicine/old_medicine = 7,
- /obj/item/weapon/strangerock = 3,
- /obj/item/weapon/ore/phoron = 7,
- /obj/random/handgun = 1,
- /obj/random/toolbox = 4,
- /obj/random/drinkbottle = 5
- )
-
- new to_spawn(get_turf(src))
-
- if(prob(20))
- user.visible_message("Something oozes out of \the [src] as it is cut.")
-
- to_chat(user, "You cut the tissue holding the chunks together.")
-
- ..()
+ return 0
\ No newline at end of file
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 76753e8da6..50ee63637c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm
@@ -27,6 +27,7 @@
ai_holder_type = /datum/ai_holder/simple_mob/melee
meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
+ meat_amount = 4
/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 052fdaa196..be6af537c8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
@@ -28,6 +28,7 @@
organ_names = /decl/mob_organ_names/tree
meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ meat_amount = 2
pixel_x = -16
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
index f39e5dc666..cac9a79b10 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
@@ -24,6 +24,9 @@
say_list_type = /datum/say_list/bee
ai_holder_type = /datum/ai_holder/simple_mob/retaliate
+ meat_amount = 5
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat
+
//Space bees aren't affected by atmos.
min_oxy = 0
max_oxy = 0
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 5b345affac..b7f02e2833 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm
@@ -15,6 +15,9 @@
melee_damage_lower = 2
melee_damage_upper = 5
+ meat_amount = 10
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/cookiesnack
+
say_list_type = /datum/say_list/cookiegirl
ai_holder_type = /datum/ai_holder/simple_mob/passive/cookiegirl
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 1f848b1be1..2ed5f51d87 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm
@@ -41,6 +41,9 @@
melee_damage_lower = 5
melee_damage_upper = 30
+ meat_amount = 8
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
old_x = -16
old_y = 0
default_pixel_x = -16
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 cae232e051..96a6d1adc7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm
@@ -25,6 +25,9 @@
cold_damage_per_tick = 10
unsuitable_atoms_damage = 10
+ meat_amount = 5
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
//Phoron dragons aren't affected by atmos.
min_oxy = 0
max_oxy = 0
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 0d66b7e977..239533ef74 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
@@ -16,6 +16,9 @@
melee_damage_lower = 5
melee_damage_upper = 30
+ meat_amount = 15
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
//Space dragons aren't affected by atmos.
min_oxy = 0
max_oxy = 0
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm
index fd5c7ca68e..071aef71ca 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm
@@ -39,6 +39,9 @@
response_disarm = "gently pushes aside"
response_harm = "hits"
+ meat_amount = 2
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox
+
harm_intent_damage = 5
melee_damage_lower = 1
melee_damage_upper = 3
@@ -85,7 +88,7 @@
/mob/living/simple_mob/vore/fennec/huge
icon = 'icons/mob/vore100x100.dmi'
icon_rest = null
-
+
// LORG
maxHealth = 500
health = 500
@@ -101,7 +104,7 @@
old_x = -32
pixel_x = -32
default_pixel_x = -32
-
+
// If you're immune to digestion, they can't digest you anyway!
vore_ignores_undigestable = TRUE
vore_default_mode = DM_DIGEST
@@ -119,7 +122,7 @@
response_help = "pats the paw of"
response_disarm = "somehow shoves aside"
-
+
ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative
var/image/bigshadow
var/autodoom = TRUE
@@ -171,4 +174,3 @@
else
return ..()
return ..()
-
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm
index d32a6ee923..7d16df1049 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm
@@ -12,6 +12,9 @@
maxHealth = 60
health = 60
+ meat_amount = 5
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox
+
response_help = "pats"
response_disarm = "gently pushes aside"
response_harm = "hits"
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 a3d1c331a4..e171d912a0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm
@@ -30,6 +30,9 @@
movement_cooldown = 4 //fast as fucc boie.
+ meat_amount = 4
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
harm_intent_damage = 5
melee_damage_lower = 5
melee_damage_upper = 12
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 b58ebca5ae..481f73a4cd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm
@@ -38,7 +38,7 @@
pixel_x = -16
pixel_y = 0
- meat_amount = 10 //Infinite meat!
+ meat_amount = 15 //Infinite meat!
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
max_buckled_mobs = 1 //Yeehaw
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 047f83e024..c5fa952264 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm
@@ -23,7 +23,7 @@
melee_damage_upper = 5
attacktext = list("kicked")
- meat_amount = 4
+ meat_amount = 6
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
max_buckled_mobs = 1 //Yeehaw
@@ -49,7 +49,7 @@
melee_damage_upper = 15
attacktext = list("kicked")
- meat_amount = 6
+ meat_amount = 10
old_x = -16
old_y = 0
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 4a843eed80..ad9601398b 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
@@ -37,8 +37,7 @@
attacktext = "glomped"
attack_sound = 'sound/effects/blobattack.ogg'
- meat_amount = 2
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_amount = 0
showvoreprefs = 0
vore_active = 1
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 2b5103a128..0ff9d3d44c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm
@@ -16,6 +16,9 @@
movement_cooldown = 4
see_in_dark = 8
+ meat_amount = 8
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
melee_damage_lower = 5
melee_damage_upper = 15
attack_sharp = TRUE
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm
index d5eb37d0d1..3e60529764 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm
@@ -32,6 +32,9 @@
say_list_type = /datum/say_list/rabbit
ai_holder_type = /datum/ai_holder/simple_mob/passive
+ meat_amount = 3
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
// Vore vars
vore_active = 1
vore_bump_emote = "playfully lunges at"
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 9af88b36cf..4740aa24d2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
@@ -45,6 +45,9 @@
attacktext = list("ravaged")
friendly = list("nuzzles", "licks", "noses softly at", "noseboops", "headbumps against", "leans on", "nibbles affectionately on")
+ meat_amount = 6
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
old_x = -16
old_y = 0
default_pixel_x = -16
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm
index fa75b5bc69..8399dd79fb 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm
@@ -13,6 +13,9 @@
maxHealth = 30
health = 30
+ meat_amount = 2
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
response_help = "pats"
response_disarm = "gently pushes aside"
response_harm = "hits"
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm
index eb2b3c4d3e..ffb042c1df 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm
@@ -48,6 +48,9 @@
vore_pounce_chance = 70 // v hongry buggo
vore_icons = SA_ICON_LIVING
+ meat_amount = 4
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat
+
//Beeg bug don't give a fuck about atmos. Something something, phoron mutation.
min_oxy = 0
max_oxy = 0
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm
index 21dc7aa5f5..8b0f99329d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm
@@ -40,6 +40,8 @@
health = 200
see_in_dark = 8
+ meat_amount = 8
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat
melee_damage_lower = 8
melee_damage_upper = 16
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
index 32ddb75c0a..b4767b8dea 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
@@ -14,6 +14,9 @@
see_in_dark = 2
+ meat_amount = 5
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
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 600fb6fd53..1eee080207 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm
@@ -38,6 +38,9 @@
melee_damage_lower = 5
melee_damage_upper = 12
+ meat_amount = 6
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+
response_help = "pats"
response_disarm = "tries to shove"
response_harm = "hits"
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 12fe006460..3feecd4d03 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
@@ -43,6 +43,7 @@ var/global/list/moth_amount = 0 // Chompstation Addition, Rykka waz here. *pawst
movement_cooldown = 8
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
+ meat_amount = 6
response_help = "pokes"
response_disarm = "pushes"
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
index f3c200410b..0589a35391 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
@@ -16,8 +16,9 @@ var/global/list/grub_machine_overlays = list()
melee_damage_lower = 1 // This is a tiny worm. It will nibble and thats about it.
melee_damage_upper = 1
- meat_amount = 2
+ meat_amount = 1
meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
+ butchery_loot = list() // No hides
faction = "grubs"
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 d3cae84552..3b339b71be 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
@@ -25,6 +25,9 @@
melee_damage_lower = 5
melee_damage_upper = 12
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_amount = 5
+
minbodytemp = 200
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive