From abdb26cb102f7b4c63b071e2f20e299583f10a93 Mon Sep 17 00:00:00 2001 From: MrFluffster <49726786+MrFluffster@users.noreply.github.com> Date: Sun, 19 May 2019 17:58:56 +0200 Subject: [PATCH] Adds foodtype CLOTH, gives it to dummy item for clothing eating and makes moths like CLOTH (#43965) --- code/__DEFINES/food.dm | 1 + code/modules/clothing/clothing.dm | 1 + code/modules/mob/living/carbon/human/species_types/mothmen.dm | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 2c7a66ce40c..5e12715aba8 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -11,6 +11,7 @@ #define GROSS (1<<10) #define TOXIC (1<<11) #define PINEAPPLE (1<<12) +#define CLOTH (1<<14) #define DRINK_NICE 1 #define DRINK_GOOD 2 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 32cfa27c4aa..609a49718c6 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -64,6 +64,7 @@ desc = "If you're reading this it means I messed up. This is related to moths eating clothes and I didn't know a better way to do it than making a new food object." list_reagents = list("nutriment" = 1) tastes = list("dust" = 1, "lint" = 1) + foodtype = CLOTH /obj/item/clothing/attack(mob/M, mob/user, def_zone) if(user.a_intent != INTENT_HARM && ismoth(M)) diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index ad0a7733c43..8a7f775a489 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -11,7 +11,7 @@ attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth - liked_food = VEGETABLES | DAIRY + liked_food = VEGETABLES | DAIRY | CLOTH disliked_food = FRUIT | GROSS toxic_food = MEAT | RAW mutanteyes = /obj/item/organ/eyes/moth