Skip to content
This repository has been archived by the owner on Dec 5, 2020. It is now read-only.

Cheese-Shaped Sponges #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/food_and_drink/ingredients.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
19 changes: 19 additions & 0 deletions code/obj/item/mops_cleaners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span style='color:blue'>[user] cuts [src] into the shape of... cheese?</span>")
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))
Expand Down Expand Up @@ -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"
Expand Down
23 changes: 23 additions & 0 deletions code/obj/item/storage/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down