[MIRROR] Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly [MDB IGNORE] (#15506)

* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly (#68899)

* Splits up 'gross' food from 'carrion'

* Adds a couple of missed burgers.
Moths dislike Carrion rather than it being poison to them.

* BEES is now BUGS

* It's always safe and a good idea to use find/replace

* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly

* Splits up 'Gross' food from 'Gore' and reshuffles taste preferences accordingly

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-08-17 17:40:21 +01:00
committed by GitHub
co-authored by Jacquerel Tom
parent 7ead4bc47f
commit 3ac5456f79
30 changed files with 83 additions and 72 deletions
+3
View File
@@ -17,6 +17,7 @@
#define SEAFOOD (1<<16)
#define ORANGES (1<<17)
#define BUGS (1<<18)
#define GORE (1<<19)
/// A list of food type names, in order of their flags
#define FOOD_FLAGS list( \
@@ -39,6 +40,7 @@
"SEAFOOD", \
"ORANGES", \
"BUGS", \
"GORE", \
)
/// IC meaning (more or less) for food flags
@@ -62,6 +64,7 @@
"Seafood", \
"Oranges", \
"Bugs", \
"Gore", \
)
#define DRINK_NICE 1
+6 -6
View File
@@ -33,7 +33,7 @@
desc = "A bloody burger."
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("bun" = 2, "long pig" = 4)
foodtypes = MEAT | GRAIN | GROSS
foodtypes = MEAT | GRAIN | GORE
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/burger/human/CheckParts(list/parts_list)
@@ -49,7 +49,7 @@
name = "corgi burger"
desc = "You monster."
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
foodtypes = GRAIN | MEAT | GROSS
foodtypes = GRAIN | MEAT | GORE
venue_value = FOOD_PRICE_EXOTIC
@@ -59,7 +59,7 @@
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
icon_state = "appendixburger"
tastes = list("bun" = 4, "grass" = 2)
foodtypes = GRAIN | MEAT | GROSS
foodtypes = GRAIN | MEAT | GORE
venue_value = FOOD_PRICE_NORMAL
/obj/item/food/burger/fish
@@ -137,7 +137,7 @@
icon_state = "brainburger"
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/medicine/mannitol = 6, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/nutriment/protein = 6)
tastes = list("bun" = 4, "brains" = 2)
foodtypes = GRAIN | MEAT | GROSS
foodtypes = GRAIN | MEAT | GORE
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/burger/ghost
@@ -316,7 +316,7 @@
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtypes = GRAIN | MEAT | GROSS
foodtypes = GRAIN | MEAT | GORE
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/burger/baseball
@@ -353,7 +353,7 @@
icon_state = "catburger"
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("bun" = 4, "meat" = 2, "cat" = 2)
foodtypes = GRAIN | MEAT | GROSS
foodtypes = GRAIN | MEAT | GORE
/obj/item/food/burger/crab
name = "crab burger"
+2 -2
View File
@@ -64,7 +64,7 @@
icon_state = "braincake"
food_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/medicine/mannitol = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
foodtypes = GRAIN | DAIRY | MEAT | GROSS | SUGAR
foodtypes = GRAIN | DAIRY | MEAT | GORE | SUGAR
/obj/item/food/cake/brain/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/brain, 5, 3 SECONDS, table_required = TRUE)
@@ -75,7 +75,7 @@
icon_state = "braincakeslice"
food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/medicine/mannitol = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
foodtypes = GRAIN | DAIRY | MEAT | GROSS | SUGAR
foodtypes = GRAIN | DAIRY | MEAT | GORE | SUGAR
/obj/item/food/cake/cheese
name = "cheese cake"
+1 -1
View File
@@ -78,7 +78,7 @@
icon_state = "donut_meat"
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/ketchup = 3)
tastes = list("meat" = 1)
foodtypes = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
foodtypes = JUNKFOOD | MEAT | GORE | FRIED | BREAKFAST
is_decorated = TRUE
/obj/item/food/donut/berry
+17 -17
View File
@@ -33,7 +33,7 @@
icon_state = "raw_lizard_cheese"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 15, /datum/reagent/consumable/salt = 5)
tastes = list("meat" = 1, "salt" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/raw_headcheese/Initialize(mapload)
@@ -47,7 +47,7 @@
icon_state = "lizard_cheese"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 15, /datum/reagent/consumable/salt = 5)
tastes = list("cheese" = 1, "salt" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/headcheese/MakeProcessable()
@@ -60,7 +60,7 @@
icon_state = "lizard_cheese_slice"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/salt = 1)
tastes = list("cheese" = 1, "salt" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
w_class = WEIGHT_CLASS_TINY
/obj/item/food/shredded_lungs
@@ -70,7 +70,7 @@
icon_state = "lung_stirfry"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/capsaicin = 2)
tastes = list("meat" = 1, "heat" = 1, "veggies" = 1)
foodtypes = MEAT | VEGETABLES | GROSS
foodtypes = MEAT | VEGETABLES | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/tsatsikh
@@ -80,7 +80,7 @@
icon_state = "tsatsikh"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10)
tastes = list("assorted minced organs" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/liver_pate
@@ -151,7 +151,7 @@
icon_state = "brain_pate"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/liquidgibs = 2)
tastes = list("brains" = 2)
foodtypes = MEAT | VEGETABLES | GROSS
foodtypes = MEAT | VEGETABLES | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/crispy_headcheese
@@ -161,7 +161,7 @@
icon_state = "crispy_headcheese"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2)
tastes = list("cheese" = 1, "oil" = 1)
foodtypes = MEAT | VEGETABLES | NUTS | GROSS
foodtypes = MEAT | VEGETABLES | NUTS | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/kebab/picoss_skewers
@@ -181,7 +181,7 @@
icon_state = "nectar_larvae"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/korta_nectar = 3, /datum/reagent/consumable/capsaicin = 1)
tastes = list("meat" = 1, "sweet" = 1, "heat" = 1)
foodtypes = GROSS | MEAT | BUGS
foodtypes = GORE | MEAT | BUGS
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/mushroomy_stirfry
@@ -409,7 +409,7 @@
food_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/protein = 15, /datum/reagent/consumable/nutriment/vitamin = 10)
tastes = list("bread" = 1, "herb" = 1, "oil" = 1, "garlic" = 1, "tomato" = 1, "meat" = 1)
slice_type = null
foodtypes = VEGETABLES | MEAT | NUTS | GROSS
foodtypes = VEGETABLES | MEAT | NUTS | GORE
boxtag = "Imperial Victory Flatbread"
//Sandwiches/Toast Dishes
@@ -420,7 +420,7 @@
icon_state = "emperor_roll"
food_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("bread" = 1, "cheese" = 1, "liver" = 1, "caviar" = 1)
foodtypes = VEGETABLES | NUTS | MEAT | GROSS | SEAFOOD
foodtypes = VEGETABLES | NUTS | MEAT | GORE | SEAFOOD
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
@@ -461,7 +461,7 @@
icon_state = "black_broth"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/blood = 8, /datum/reagent/liquidgibs = 2)
tastes = list("vinegar" = 1, "metal" = 1)
foodtypes = MEAT | VEGETABLES | GROSS
foodtypes = MEAT | VEGETABLES | GORE
/obj/item/food/soup/jellyfish
name = "jellyfish stew"
@@ -470,7 +470,7 @@
icon_state = "jellyfish_stew"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment = 6)
tastes = list("slime" = 1)
foodtypes = MEAT | VEGETABLES | GROSS
foodtypes = MEAT | VEGETABLES | GORE
/obj/item/food/soup/rootbread_soup
name = "rootbread soup"
@@ -489,7 +489,7 @@
icon_state = "black_eggs"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("eggs" = 1, "greens" = 1, "blood" = 1)
foodtypes = MEAT | BREAKFAST | GROSS
foodtypes = MEAT | BREAKFAST | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/patzikula
@@ -541,7 +541,7 @@
icon_state = "candied_mushrooms"
food_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/caramel = 4)
tastes = list("savouriness" = 1, "sweetness" = 1)
foodtypes = SUGAR | VEGETABLES | GROSS
foodtypes = SUGAR | VEGETABLES
//Misc Dishes
/obj/item/food/sauerkraut
@@ -581,7 +581,7 @@
icon_state = "canned_jellyfish"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/toxin/mindbreaker = 2, /datum/reagent/consumable/salt = 1)
tastes = list("slime" = 1, "burning" = 1, "salt" = 1)
foodtypes = SEAFOOD | GROSS
foodtypes = SEAFOOD | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/desert_snails
@@ -591,7 +591,7 @@
icon_state = "canned_snails"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/salt = 2)
tastes = list("snails" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/larvae
@@ -601,5 +601,5 @@
icon_state = "canned_larvae"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/honey = 2)
tastes = list("sweet bugs" = 1)
foodtypes = MEAT | GROSS | BUGS
foodtypes = MEAT | GORE | BUGS
w_class = WEIGHT_CLASS_SMALL
+18 -18
View File
@@ -644,7 +644,7 @@
desc = "A human meat, on a stick."
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 16, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("tender meat" = 3, "metal" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/kebab/monkey
@@ -668,7 +668,7 @@
desc = "Severed lizard tail on a stick."
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 30, /datum/reagent/consumable/nutriment/vitamin = 4)
tastes = list("meat" = 8, "metal" = 4, "scales" = 1)
foodtypes = MEAT
foodtypes = MEAT | GORE
/obj/item/food/kebab/rat
name = "rat-kebab"
@@ -678,7 +678,7 @@
trash_type = null
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 2)
tastes = list("rat meat" = 1, "metal" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/kebab/rat/double
@@ -725,7 +725,7 @@
/obj/item/food/meat/slab/human
name = "meat"
tastes = list("tender meat" = 1)
foodtypes = MEAT | RAW | GROSS
foodtypes = MEAT | RAW | GORE
venue_value = FOOD_MEAT_HUMAN
/obj/item/food/meat/slab/human/MakeGrillable()
@@ -759,7 +759,7 @@
icon_state = "lizardmeat"
desc = "Delicious dino damage."
tastes = list("meat" = 4, "scales" = 1)
foodtypes = MEAT | RAW
foodtypes = MEAT | RAW | GORE
venue_value = FOOD_MEAT_MUTANT
/obj/item/food/meat/slab/human/mutant/lizard/MakeGrillable()
@@ -776,7 +776,7 @@
icon_state = "shadowmeat"
desc = "Ow, the edge."
tastes = list("darkness" = 1, "meat" = 1)
foodtypes = MEAT | RAW
foodtypes = MEAT | RAW | GORE
venue_value = FOOD_MEAT_MUTANT_RARE
/obj/item/food/meat/slab/human/mutant/fly
@@ -784,14 +784,14 @@
desc = "Nothing says tasty like maggot filled radioactive mutant flesh."
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/uranium = 3)
tastes = list("maggots" = 1, "the inside of a reactor" = 1)
foodtypes = MEAT | RAW | GROSS | BUGS
foodtypes = MEAT | RAW | GROSS | BUGS | GORE
venue_value = FOOD_MEAT_MUTANT
/obj/item/food/meat/slab/human/mutant/moth
icon_state = "mothmeat"
desc = "Unpleasantly powdery and dry. Kind of pretty, though."
tastes = list("dust" = 1, "powder" = 1, "meat" = 2)
foodtypes = MEAT | RAW | BUGS
foodtypes = MEAT | RAW | BUGS | GORE
venue_value = FOOD_MEAT_MUTANT
/obj/item/food/meat/slab/human/mutant/skeleton
@@ -799,7 +799,7 @@
icon_state = "skeletonmeat"
desc = "There's a point where this needs to stop, and clearly we have passed it."
tastes = list("bone" = 1)
foodtypes = GROSS
foodtypes = GROSS | GORE
venue_value = FOOD_MEAT_MUTANT_RARE
/obj/item/food/meat/slab/human/mutant/skeleton/MakeProcessable()
@@ -810,14 +810,14 @@
icon_state = "rottenmeat"
desc = "Halfway to becoming fertilizer for your garden."
tastes = list("brains" = 1, "meat" = 1)
foodtypes = RAW | MEAT | TOXIC
foodtypes = RAW | MEAT | TOXIC | GORE | GROSS
/obj/item/food/meat/slab/human/mutant/ethereal
icon_state = "etherealmeat"
desc = "So shiny you feel like ingesting it might make you shine too"
food_reagents = list(/datum/reagent/consumable/liquidelectricity/enriched = 10)
tastes = list("pure electricity" = 2, "meat" = 1)
foodtypes = RAW | MEAT | TOXIC
foodtypes = RAW | MEAT | TOXIC | GORE
venue_value = FOOD_MEAT_MUTANT
////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
@@ -855,7 +855,7 @@
/obj/item/food/meat/slab/mouse
name = "mouse meat"
desc = "A slab of mouse meat. Best not eat it raw."
foodtypes = RAW | MEAT | GROSS
foodtypes = RAW | MEAT | GORE
/obj/item/food/meat/slab/mouse/Initialize(mapload)
. = ..()
@@ -865,7 +865,7 @@
name = "corgi meat"
desc = "Tastes like... well you know..."
tastes = list("meat" = 4, "a fondness for wearing hats" = 1)
foodtypes = RAW | MEAT | GROSS
foodtypes = RAW | MEAT | GORE
/obj/item/food/meat/slab/corgi/Initialize(mapload)
. = ..()
@@ -883,7 +883,7 @@
/obj/item/food/meat/slab/pug
name = "pug meat"
desc = "Tastes like... well you know..."
foodtypes = RAW | MEAT | GROSS
foodtypes = RAW | MEAT | GORE
/obj/item/food/meat/slab/pug/Initialize(mapload)
. = ..()
@@ -1088,7 +1088,7 @@
/obj/item/food/meat/steak/plain/human
tastes = list("tender meat" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
///Make sure the steak has the correct name
/obj/item/food/meat/steak/plain/human/OnMicrowaveCooked(datum/source, obj/item/source_item, cooking_efficiency = 1)
@@ -1147,7 +1147,7 @@
name = "lizard steak"
icon_state = "birdsteak"
tastes = list("juicy chicken" = 3, "scales" = 1)
foodtypes = MEAT
foodtypes = MEAT | GORE
/obj/item/food/meat/steak/meatproduct
name = "thermally processed meat product"
@@ -1195,7 +1195,7 @@
/obj/item/food/meat/rawcutlet/plain/human
tastes = list("tender meat" = 1)
foodtypes = MEAT | RAW | GROSS
foodtypes = MEAT | RAW | GORE
/obj/item/food/meat/rawcutlet/plain/human/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/cutlet/plain/human, rand(35 SECONDS, 50 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE
@@ -1294,7 +1294,7 @@
/obj/item/food/meat/cutlet/plain/human
tastes = list("tender meat" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
/obj/item/food/meat/cutlet/plain/human/OnMicrowaveCooked(datum/source, atom/source_item, cooking_efficiency)
. = ..()
+2 -2
View File
@@ -24,7 +24,7 @@
junkiness = 10
bite_consumption = 10
tastes = list("candy" = 5, "weight loss" = 4, "insect larva" = 1)
foodtypes = JUNKFOOD | RAW | GROSS
foodtypes = JUNKFOOD | RAW | BUGS
custom_price = 80
w_class = WEIGHT_CLASS_TINY
var/revelation = FALSE
@@ -386,7 +386,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types())
icon_state = "boritosred"
trash_type = /obj/item/trash/boritos/red
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3, /datum/reagent/consumable/astrotame = 1, /datum/reagent/consumable/cornmeal = 1)
tastes = list("fried corn" = 1, "nacho cheese" = 3)
tastes = list("fried corn" = 1, "nacho cheese" = 3)
/obj/item/food/cornchips/purple
name = "\improper Spicy Sweet Chili Boritos corn chips"
+2 -2
View File
@@ -157,7 +157,7 @@
icon_state = "eyeballsoup"
food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/liquidgibs = 3)
tastes = list("tomato" = 1, "squirming" = 1)
foodtypes = MEAT | GROSS
foodtypes = MEAT | GORE
/obj/item/food/soup/miso
name = "misosoup"
@@ -306,4 +306,4 @@
food_reagents = list (/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/nutriment/protein = 2)
tastes = list("creamy vegetables"= 2, "sausage" = 1)
foodtypes = VEGETABLES | MEAT | GRAIN | BREAKFAST
+1 -1
View File
@@ -46,7 +46,7 @@
icon_state = "bloodtomato"
bite_consumption_mod = 3
splat_type = /obj/effect/gibspawner/generic
foodtypes = FRUIT | GROSS
foodtypes = FRUIT | GORE
grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0)
distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
@@ -15,7 +15,7 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/felinid
disliked_food = GROSS | CLOTH | RAW
liked_food = SEAFOOD | ORANGES | BUGS
liked_food = SEAFOOD | ORANGES | BUGS | GORE
var/original_felinid = TRUE //set to false for felinids created by mass-purrbation
payday_modifier = 0.75
ass_image = 'icons/ass/asscat.png'
@@ -13,7 +13,7 @@
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
meat = /obj/item/food/meat/slab/human/mutant/fly
mutanteyes = /obj/item/organ/internal/eyes/fly
liked_food = GROSS
liked_food = GROSS | GORE
disliked_food = NONE
toxic_food = NONE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
@@ -1190,7 +1190,7 @@
say_mod = "rattles"
prefix = "Bone"
special_names = list("Head", "Broth", "Fracture", "Rattler", "Appetit")
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
toxic_food = null
species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES,HAS_BONE)
inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID
@@ -11,7 +11,7 @@
mutant_bodyparts = list("wings" = "None")
use_skintones = 1
skinned_type = /obj/item/stack/sheet/animalhide/human
disliked_food = GROSS | RAW | CLOTH | BUGS
disliked_food = GROSS | RAW | CLOTH | BUGS | GORE
liked_food = JUNKFOOD | FRIED
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
payday_modifier = 1
@@ -33,8 +33,8 @@
meat = /obj/item/food/meat/slab/human/mutant/lizard
skinned_type = /obj/item/stack/sheet/animalhide/lizard
exotic_bloodtype = "L"
disliked_food = GRAIN | DAIRY | CLOTH
liked_food = GROSS | MEAT | SEAFOOD | NUTS | BUGS
disliked_food = GRAIN | DAIRY | CLOTH | GROSS
liked_food = GORE | MEAT | SEAFOOD | NUTS | BUGS
inert_mutation = /datum/mutation/human/firebreath
death_sound = 'sound/voice/lizard/deathsound.ogg'
wings_icons = list("Dragon")
@@ -19,7 +19,7 @@
miss_sound = 'sound/weapons/slashmiss.ogg'
meat = /obj/item/food/meat/slab/human/mutant/moth
liked_food = VEGETABLES | DAIRY | CLOTH
disliked_food = FRUIT | GROSS | BUGS
disliked_food = FRUIT | GROSS | BUGS | GORE
toxic_food = MEAT | RAW | SEAFOOD
mutanteyes = /obj/item/organ/internal/eyes/moth
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
@@ -33,7 +33,7 @@
mutantstomach = /obj/item/organ/internal/stomach/bone
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
wings_icons = list("Skeleton")
//They can technically be in an ERT
changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN
@@ -31,7 +31,7 @@
mutanttongue = /obj/item/organ/internal/tongue/zombie
var/static/list/spooks = list('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/wail.ogg')
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN
bodytemp_normal = T0C // They have no natural body heat, the environment regulates body temp
bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_EXIST // Take damage at fire temp
@@ -200,7 +200,7 @@
bite_consumption = 3
eatverbs = list("devour")
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtypes = GROSS | MEAT | RAW
foodtypes = GORE | MEAT | RAW
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
decomp_req_handle = TRUE
ant_attracting = FALSE
@@ -243,5 +243,6 @@
desc = "A dead rodent, consumed by mold and rot. There is a slim chance that a lizard might still eat it."
icon_state = "mouse_gray_dead"
food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mold = 10)
foodtypes = GORE | MEAT | RAW | GROSS
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5, /datum/reagent/consumable/mold = 10)
preserved_food = TRUE
@@ -10,6 +10,8 @@
#define BEE_POLLINATE_PEST_CHANCE 33
#define BEE_POLLINATE_POTENCY_CHANCE 50
#define BEE_FOODGROUPS RAW | MEAT | GORE | BUGS
/mob/living/simple_animal/hostile/bee
name = "bee"
desc = "Buzzy buzzy bee, stingy sti- Ouch!"
@@ -75,7 +77,7 @@
var/list/reee = list(/datum/reagent/consumable/nutriment/vitamin = 5)
if(beegent)
reee[beegent.type] = 5
holder.AddComponent(/datum/component/edible, reee, null, RAW | MEAT | GROSS, 10, 0, list("bee"), null, 10)
holder.AddComponent(/datum/component/edible, reee, null, BEE_FOODGROUPS, 10, 0, list("bee"), null, 10)
L.visible_message(span_warning("[L] scoops up [src]!"))
L.put_in_hands(holder)
@@ -378,7 +380,7 @@
/obj/item/trash/bee/Initialize(mapload)
. = ..()
AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment/vitamin = 5), null, RAW | MEAT | GROSS, 10, 0, list("bee"), null, 10)
AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment/vitamin = 5), null, BEE_FOODGROUPS, 10, 0, list("bee"), null, 10)
AddElement(/datum/element/swabable, CELL_LINE_TABLE_QUEEN_BEE, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
/obj/item/trash/bee/update_overlays()
@@ -386,3 +388,5 @@
var/mutable_appearance/body_overlay = mutable_appearance(icon = icon, icon_state = "bee_item_overlay")
body_overlay.color = beegent ? beegent.color : BEE_DEFAULT_COLOUR
. += body_overlay
#undef BEE_FOODGROUPS
+1 -1
View File
@@ -53,7 +53,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
if(organ_flags & ORGAN_EDIBLE)
AddComponent(/datum/component/edible,\
initial_reagents = food_reagents,\
foodtypes = RAW | MEAT | GROSS,\
foodtypes = RAW | MEAT | GORE,\
volume = reagent_vol,\
after_eat = CALLBACK(src, .proc/OnEatFrom))
@@ -37,7 +37,7 @@
icon = 'modular_skyrat/master_files/icons/mob/newmobs.dmi'
icon_state = "bananaspider_peel"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
foodtype = GROSS | MEAT | RAW
foodtype = GORE | MEAT | RAW
grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
juice_results = list(/datum/reagent/consumable/banana = 10)
@@ -17,7 +17,7 @@
desc = "You do not know what it is, but you can bet the clown would love it."
icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
icon_state = "spibanana"
foodtypes = GROSS | MEAT | RAW | FRUIT
foodtypes = GORE | MEAT | RAW | FRUIT
var/awakening = FALSE
/obj/item/food/grown/banana/banana_spider_spawnable/attack_self(mob/user)
@@ -31,7 +31,7 @@
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
payday_modifier = 0.75
liked_food = SEAFOOD | MEAT | FRUIT
liked_food = SEAFOOD | MEAT | FRUIT | GORE
disliked_food = CLOTH | GROSS
toxic_food = TOXIC
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
@@ -34,7 +34,7 @@
attack_effect = ATTACK_EFFECT_CLAW
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = GROSS | RAW | TOXIC
liked_food = GROSS | RAW | TOXIC | GORE
disliked_food = CLOTH | GRAIN | FRIED
toxic_food = DAIRY
payday_modifier = 0.75
@@ -35,7 +35,7 @@
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
liked_food = GRAIN | MEAT
disliked_food = CLOTH | GROSS
disliked_food = CLOTH | GROSS | GORE
toxic_food = TOXIC
payday_modifier = 0.75
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
@@ -30,8 +30,8 @@
attack_effect = ATTACK_EFFECT_CLAW
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
disliked_food = GRAIN | DAIRY | CLOTH
liked_food = GROSS | MEAT | SEAFOOD | NUTS
disliked_food = GRAIN | DAIRY | CLOTH | GROSS
liked_food = GORE | MEAT | SEAFOOD | NUTS
toxic_food = TOXIC
payday_modifier = 0.75
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
@@ -31,7 +31,7 @@
inherent_biotypes = MOB_UNDEAD | MOB_HUMANOID
mutanttongue = /obj/item/organ/internal/tongue/zombie
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
liked_food = GROSS | MEAT | RAW | GORE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN
bodytemp_normal = T0C // They have no natural body heat, the environment regulates body temp
bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // Take damage at fire temp
@@ -27,8 +27,8 @@
"ears" = ACC_RANDOM,
"legs" = "Normal Legs"
)
disliked_food = GROSS | GRAIN
liked_food = MEAT
disliked_food = GROSS | GRAIN | GORE
liked_food = MEAT | GORE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
attack_verb = "slash"
attack_effect = ATTACK_EFFECT_CLAW
@@ -11,6 +11,7 @@ const FOOD_ICONS = {
[Food.Dairy]: 'cheese',
[Food.Fried]: 'bacon',
[Food.Fruit]: 'apple-alt',
[Food.Gore]: 'skull',
[Food.Grain]: 'bread-slice',
[Food.Gross]: 'trash',
[Food.Junkfood]: 'pizza-slice',
@@ -29,6 +30,7 @@ const FOOD_NAMES: Record<keyof typeof FOOD_ICONS, string> = {
[Food.Dairy]: 'Dairy',
[Food.Fried]: 'Fried food',
[Food.Fruit]: 'Fruit',
[Food.Gore]: 'Gore',
[Food.Grain]: 'Grain',
[Food.Gross]: 'Gross food',
[Food.Junkfood]: 'Junk food',
@@ -10,6 +10,7 @@ export enum Food {
Dairy = 'DAIRY',
Fried = 'FRIED',
Fruit = 'FRUIT',
Gore = 'GORE',
Grain = 'GRAIN',
Gross = 'GROSS',
Junkfood = 'JUNKFOOD',