diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 69ec4708..75fd39b8 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -52,6 +52,9 @@ liquidfood name = "\improper \"LiquidFood\" ration" icon_state = "liquidfood" + chocolatebox + name = "box of chocolates" + icon_state = "chocolatebox" /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 66718748..12130406 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1268,4 +1268,14 @@ I said no! reagents = list("sugar" = 5, "frostoil" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/mint +////////////////////////////////////////// +// End of BS12 food port +////////////////////////////////////////// +/datum/recipe/chocolatebox + reagents = list("milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/chocolatebar, + /obj/item/weapon/reagent_containers/food/snacks/grown/cherries + ) + result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebox \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 5f51a8ae..8c8a7e64 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3309,3 +3309,31 @@ ..() reagents.add_reagent("nutriment", 3) +/obj/item/weapon/reagent_containers/food/snacks/chocolatebox + name = "box of chocolates" + desc = "A heart-shaped box of sweet, sweet chocolate-y goodness." + icon_state = "chocolatebox-closed" + wrapped = 1 + bitesize = 1 + trash = /obj/item/trash/chocolatebox + + New() + ..() + reagents.add_reagent("nutriment", 6) + + attack_self(mob/user as mob) + if(wrapped) + open(user) + + proc/open(mob/user as mob) + wrapped = 0 + user << "You open the [src]." + icon_state = "chocolatebox-open" + update_icon() + + attack(mob/M as mob, mob/user as mob, def_zone) + if(wrapped) + user << "You should open the box, first." + return + else + ..() \ No newline at end of file diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 8f43308d..7660da0e 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index c031a957..62a0a9bd 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ