diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index bb95dbf2d7f..2fd9b9c47dc 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -311,7 +311,7 @@
/obj/item/weapon/storage/box/monkeycubes/New()
..()
for(var/i = 1; i <= 5; i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
+ new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src)
/obj/item/weapon/storage/box/permits
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 1a9586b7449..fe14145ffad 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -442,15 +442,11 @@
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = O
- if(M.wrapped)
- user << "You need to unwrap [src] first!"
- return
- else
- user << "You place [src] under a stream of water..."
- user.drop_item()
- M.loc = get_turf(src)
- M.Expand()
- return
+ user << "You place [src] under a stream of water..."
+ user.drop_item()
+ M.loc = get_turf(src)
+ M.Expand()
+ return
var/obj/item/I = O
if(!I || !istype(I))
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 5a90cc0d225..7ba88bcd75a 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -9,7 +9,6 @@
var/slice_path // for sliceable food. path of the item resulting from the slicing
var/slices_num
var/eatverb
- var/wrapped = 0
var/dried_type = null
var/dry = 0
var/cooked_type = null //for microwave cooking. path of the resulting item after microwaving
@@ -65,9 +64,6 @@
M << "You don't feel like eating any more junk food at the moment."
return 0
- if(wrapped)
- M << "You can't eat wrapped food!"
- return 0
else if(fullness <= 50)
M << "You hungrily [eatverb] some of \the [src] and gobble it down!"
else if(fullness > 50 && fullness < 150)
@@ -81,8 +77,6 @@
return 0
else
if(!isbrain(M)) //If you're feeding it to someone else.
- if(wrapped)
- return 0
if(fullness <= (600 * (1 + M.overeatduration / 1000)))
M.visible_message("[user] attempts to feed [M] [src].", \
"[user] attempts to feed [M] [src].")
diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm
index 5000e581448..79cc725e8a8 100644
--- a/code/modules/food&drinks/food/snacks_meat.dm
+++ b/code/modules/food&drinks/food/snacks_meat.dm
@@ -129,30 +129,14 @@
desc = "Just add water!"
icon_state = "monkeycube"
bitesize = 12
- wrapped = 0
list_reagents = list("nutriment" = 2)
filling_color = "#CD853F"
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user)
- if(wrapped)
- Unwrap(user)
-
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand()
visible_message("[src] expands!")
new /mob/living/carbon/monkey(get_turf(src))
qdel(src)
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user)
- icon_state = "monkeycube"
- desc = "Just add water!"
- user << "You unwrap the cube."
- wrapped = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped
- desc = "Still wrapped in some paper."
- icon_state = "monkeycubewrap"
- wrapped = 1
-
/obj/item/weapon/reagent_containers/food/snacks/enchiladas
name = "enchiladas"
desc = "Viva La Mexico!"
diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm
index f962ff5e48e..21d3b51ff7d 100644
--- a/code/modules/food&drinks/food/snacks_other.dm
+++ b/code/modules/food&drinks/food/snacks_other.dm
@@ -33,29 +33,10 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "chocolate bar"
desc = "Such, sweet, fattening food."
- icon_state = "chocolatebarunwrapped"
- wrapped = 0
+ icon_state = "chocolatebar"
list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
filling_color = "#A0522D"
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
- if(wrapped)
- Unwrap(user)
- else
- ..()
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/proc/Unwrap(mob/user)
- icon_state = "chocolatebarunwrapped"
- desc = "It won't make you all sticky."
- user << "You remove the foil."
- wrapped = 0
-
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/wrapped
- desc = "It's wrapped in some foil."
- icon_state = "chocolatebar"
- wrapped = 1
-
/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
diff --git a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm
index 47a8d236b6f..48019536aca 100644
--- a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm
+++ b/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm
@@ -100,7 +100,7 @@
playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1)
grinded -= required_grind
for(var/i = 0, i < cube_production, i++)
- new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src.loc)
+ new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc)
user << "The machine's display flashes that it has [grinded] monkeys worth of material left."
else
user << "The machine needs at least [required_grind] monkey(s) worth of material to produce a monkey cube. It only has [grinded]."
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 767f1521cac..959d2c1c6e2 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -147,16 +147,13 @@
// Monkey cube
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
- if(!cube.wrapped)
- cube.Expand()
+ cube.Expand()
// Dehydrated carp
else if(istype(O,/obj/item/toy/carpplushie/dehy_carp))
var/obj/item/toy/carpplushie/dehy_carp/dehy = O
dehy.Swell() // Makes a carp
- return
-
/*
* Water reaction to a mob
*/
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 6213ecdfa7a..20fcc6a2450 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ