diff --git a/code/modules/food_and_drink/ingredients.dm b/code/modules/food_and_drink/ingredients.dm index fcf290db..c3ef4291 100644 --- a/code/modules/food_and_drink/ingredients.dm +++ b/code/modules/food_and_drink/ingredients.dm @@ -286,7 +286,7 @@ /obj/item/reagent_containers/food/snacks/ingredient/gcheese name = "weird cheese" desc = "Some kind of... gooey, messy, gloopy thing. Similar to cheese, but only in the looser sense of the word." - icon_state = "gcheese" + icon_state = "cheese-green" amount = 2 heal_amt = 1 food_color = "#669966" diff --git a/code/obj/item/mops_cleaners.dm b/code/obj/item/mops_cleaners.dm index 5fc775e8..378ea2e1 100644 --- a/code/obj/item/mops_cleaners.dm +++ b/code/obj/item/mops_cleaners.dm @@ -448,6 +448,17 @@ WET FLOOR SIGN SPAWN_DBG(10) spam_flag = 0 +/obj/item/sponge/attackby(obj/item/W as obj, mob/user as mob) + if (istool(W, TOOL_CUTTING | TOOL_SNIPPING)) + user.visible_message("[user] cuts [src] into the shape of... cheese?") + if(src.loc == user) + user.u_equip(src) + src.set_loc(user) + var/obj/item/sponge/cheese/I = new /obj/item/sponge/cheese + src.reagents.trans_to(I, reagents.total_volume) + user.put_in_hand_or_drop(I) + qdel(src) + /obj/item/sponge/throw_impact(atom/hit) if(hit && ishuman(hit)) if(prob(hit_face_prob)) @@ -579,6 +590,14 @@ WET FLOOR SIGN else ..() +/obj/item/sponge/cheese + name = "cheese-shaped sponge" + desc = "Wait a minute! This isn't cheese..." + icon = 'icons/obj/foodNdrink/food_ingredient.dmi' + icon_state = "cheese-sponge" + item_state = "sponge" + + /obj/item/caution desc = "Caution! Wet Floor!" name = "wet floor sign" diff --git a/code/obj/item/storage/food.dm b/code/obj/item/storage/food.dm index 77cc3437..bfc3a40e 100644 --- a/code/obj/item/storage/food.dm +++ b/code/obj/item/storage/food.dm @@ -77,6 +77,29 @@ desc = "Ice cream cones stored in a handy box." spawn_contents = list(/obj/item/reagent_containers/food/snacks/ice_cream_cone = 7) +/obj/item/storage/box/butter + name = "butter tray" + icon_state = "buttertray" + desc = "A homely little tray for keeping butter fresh." + spawn_contents = list(/obj/item/reagent_containers/food/snacks/ingredient/butter = 5) + +/obj/item/storage/box/cheese + name = "cheese box" + icon_state = "cheesebox" + desc = "A cheap box for storing cheese." + + make_my_stuff() + ..() + for (var/i=6,i>0,i--) + new /obj/item/reagent_containers/food/snacks/ingredient/cheese(src) + + if (prob(10)) + new /obj/item/sponge/cheese(src) + else + new /obj/item/reagent_containers/food/snacks/ingredient/cheese(src) + + shuffle(src.contents) + /obj/item/storage/goodybag name = "goodybag" desc = "A bag designed to store Halloween candy."