diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index e760f2dc668..bb948c1435c 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -357,7 +357,26 @@ tastes = list("muffin" = 3, "spookiness" = 1) foodtypes = GRAIN | FRUIT | SUGAR | BREAKFAST +/obj/item/food/muffin/moffin + name = "moffin" + icon_state = "moffin" + desc = "A delicious and spongy little cake." + tastes = list("muffin" = 3, "dust" = 1, "lint" = 1) + foodtypes = CLOTH | GRAIN | SUGAR | BREAKFAST +/obj/item/food/muffin/moffin/Initialize(mapload) + . = ..() + icon_state = "[icon_state]_[rand(1,3)]" + +/obj/item/food/muffin/moffin/examine(mob/user) + . = ..() + if(!ishuman(user)) + return + var/mob/living/carbon/human/moffin_observer = user + if(moffin_observer.dna.species.liked_food & CLOTH) + . += "Ooh! It's even got bits of clothes on it! Yummy!" + else + . += "You're not too sure what's on top though..." ////////////////////////////////////////////WAFFLES//////////////////////////////////////////// diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 2acd1d2c326..98f2d8db563 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -433,6 +433,16 @@ subcategory = CAT_PASTRY +/datum/crafting_recipe/food/moffin + name = "Moffin" + reqs = list( + /datum/reagent/consumable/milk = 5, + /obj/item/food/pastrybase = 1, + /obj/item/stack/sheet/cloth = 1, + ) + result = /obj/item/food/muffin/moffin + subcategory = CAT_PASTRY + ////////////////////////////////////////////OTHER//////////////////////////////////////////// /datum/crafting_recipe/food/hotdog diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index d1afcdce055..1415a1f1905 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -11,6 +11,7 @@ //mutant_organs = list(/obj/item/organ/tail/cat) //SKYRAT EDIT REMOVAL - CUSTOMIZATION changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/felinid + disliked_food = CLOTH var/original_felinid = TRUE //set to false for felinids created by mass-purrbation payday_modifier = 0.75 ass_image = 'icons/ass/asscat.png' diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index d99202ab77e..0a2f43f4d10 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -8,6 +8,7 @@ disliked_food = null liked_food = GROSS mutanteyes = /obj/item/organ/eyes/fly + disliked_food = CLOTH toxic_food = NONE changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/fly diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 5848371b092..2fdf5e1f319 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -6,7 +6,7 @@ mutant_bodyparts = list("wings" = "None") use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human - disliked_food = GROSS | RAW + disliked_food = GROSS | RAW | CLOTH liked_food = JUNKFOOD | FRIED changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 1 diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index b92f4c2c27f..d41776dda57 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -21,7 +21,7 @@ meat = /obj/item/food/meat/slab/human/mutant/lizard skinned_type = /obj/item/stack/sheet/animalhide/lizard exotic_bloodtype = "L" - disliked_food = GRAIN | DAIRY + disliked_food = GRAIN | DAIRY | CLOTH liked_food = GROSS | MEAT inert_mutation = FIREBREATH deathsound = 'sound/voice/lizard/deathsound.ogg' diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 95aa4753b78..bdf5cf12ac3 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -16,6 +16,7 @@ no_equip = list(ITEM_SLOT_EARS, ITEM_SLOT_EYES, ITEM_SLOT_OCLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_ICLOTHING, ITEM_SLOT_SUITSTORE) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT liked_food = MEAT | FRUIT + disliked_food = CLOTH limbs_id = "monkey" damage_overlay_type = "monkey" sexes = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 836ef46f705..1389315dab2 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -20,7 +20,7 @@ breathid = "tox" damage_overlay_type = ""//let's not show bloody wounds or burns over bones. var/internal_fire = FALSE //If the bones themselves are burning clothes won't help you much - disliked_food = FRUIT + disliked_food = FRUIT | CLOTH liked_food = VEGETABLES changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC outfit_important_for_life = /datum/outfit/plasmaman diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index bbb0137291f..f8a7270ea36 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ