Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow

Removes monkeycube and chocolate unwrapping

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

code/game/objects/structures/watercloset.dm

@@ -447,15 +447,11 @@
 
 	else 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 << "<span class='notice'>You need to unwrap [src] first!</span>"
-			return
-		else
-			user << "<span class='notice'>You place [src] under a stream of water...</span>"
-			user.drop_item()
-			M.loc = get_turf(src)
-			M.Expand()
-			return
+		user << "<span class='notice'>You place [src] under a stream of water...</span>"
+		user.drop_item()
+		M.loc = get_turf(src)
+		M.Expand()
+		return
 
 	var/obj/item/I = O
 	if(!I || !istype(I))

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 << "<span class='notice'>You don't feel like eating any more junk food at the moment.</span>"
 				return 0
 
-			if(wrapped)
-				M << "<span class='warning'>You can't eat wrapped food!</span>"
-				return 0
 			else if(fullness <= 50)
 				M << "<span class='notice'>You hungrily [eatverb] some of \the [src] and gobble it down!</span>"
 			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("<span class='danger'>[user] attempts to feed [M] [src].</span>", \
 										"<span class='userdanger'>[user] attempts to feed [M] [src].</span>")

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("<span class='notice'>[src] expands!</span>")
 	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 << "<span class='notice'>You unwrap the cube.</span>"
-	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!"

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 << "<span class='notice'>You remove the foil.</span>"
-		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."

code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm

@@ -102,7 +102,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 << "<span class='notice'>The machine's display flashes that it has [grinded] monkeys worth of material left.</span>"
 	else
 		user << "<span class='danger'>The machine needs at least [required_grind] monkey(s) worth of material to produce a monkey cube. It only has [grinded].</span>"

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
  */