Merge pull request #4018 from CHOMPStation2/upstream-merge-12662

[MIRROR] New Donk-pockets

code/game/objects/items/weapons/storage/boxes.dm

@@ -285,18 +285,6 @@
 	icon_state = "cups"
 	starts_with = list(/obj/item/weapon/reagent_containers/food/drinks/sillycup = 7)
 
-/obj/item/weapon/storage/box/donkpockets
-	name = "box of donk-pockets"
-	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
-	icon_state = "donkpocketbox"
-	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket = 7)
-
-/obj/item/weapon/storage/box/sinpockets
-	name = "box of sin-pockets"
-	desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"
-	icon_state = "donk_kit"
-	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 7)
-
 /obj/item/weapon/storage/box/buns
 	name = "box of bread buns"
 	desc = "Freshly baked at some point in the past few months."
@@ -474,3 +462,46 @@
 		/obj/item/weapon/gun/projectile/revolver/capgun = 1,
 		/obj/item/ammo_magazine/ammo_box/cap = 1
 	)
+
+//Donk-pockets
+/obj/item/weapon/storage/box/donkpockets
+	name = "box of donk-pockets"
+	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
+	icon_state = "donkpocketbox"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket = 7)
+
+/obj/item/weapon/storage/box/donkpockets/spicy
+	name = "box of spicy-flavoured donk-pockets"
+	icon_state = "donkpocketboxspicy"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/spicy = 7)
+
+/obj/item/weapon/storage/box/donkpockets/teriyaki
+	name = "box of teriyaki-flavoured donk-pockets"
+	icon_state = "donkpocketboxteriyaki"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/teriyaki = 7)
+
+/obj/item/weapon/storage/box/donkpockets/pizza
+	name = "box of pizza-flavoured donk-pockets"
+	icon_state = "donkpocketboxpizza"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/pizza = 7)
+
+/obj/item/weapon/storage/box/donkpockets/honk
+	name = "box of banana-flavoured donk-pockets"
+	icon_state = "donkpocketboxbanana"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/honk = 7)
+
+/obj/item/weapon/storage/box/donkpockets/gondola
+	name = "box of gondola-flavoured donk-pockets"
+	icon_state = "donkpocketboxgondola"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/gondola = 7)
+
+/obj/item/weapon/storage/box/donkpockets/berry
+	name = "box of berry-flavoured donk-pockets"
+	icon_state = "donkpocketboxberry"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/berry = 7)
+
+/obj/item/weapon/storage/box/sinpockets
+	name = "box of sin-pockets"
+	desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"
+	icon_state = "donk_kit"
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 7)

code/game/objects/random/mapping.dm

@@ -711,6 +711,14 @@
 				/obj/random/snack,
 				/obj/structure/closet/crate/freezer/centauri //CENTAURI SNACKS
 			),
+			prob(10);list(
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/structure/closet/crate/freezer/centauri //CENTAURI DONK-POCKETS
+			),
 			prob(10);list(
 				/obj/random/powercell,
 				/obj/random/powercell,

code/game/objects/random/misc.dm

@@ -1032,3 +1032,18 @@
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark,
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow,
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal) //CHOMPedit: deleted talon mug
+
+/obj/random/donkpocketbox
+	name = "Random Donk-pocket Box"
+	desc = "This is a random Donk-pocket Box."
+	icon = 'icons/obj/boxes.dmi'
+	icon_state = "donkpocket_spawner"
+
+/obj/random/donkpocketbox/item_to_spawn()
+	return pick(/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets/spicy,
+				/obj/item/weapon/storage/box/donkpockets/teriyaki,
+				/obj/item/weapon/storage/box/donkpockets/pizza,
+				/obj/item/weapon/storage/box/donkpockets/honk,
+				/obj/item/weapon/storage/box/donkpockets/gondola,
+				/obj/item/weapon/storage/box/donkpockets/berry)

code/modules/food/food/snacks.dm

@@ -1007,7 +1007,7 @@
 	reagents.add_reagent("protein", 6)
 
 /obj/item/weapon/reagent_containers/food/snacks/donkpocket
-	name = "Donk-pocket"
+	name = "\improper Donk-pocket"
 	desc = "The food of choice for the seasoned traitor."
 	description_fluff = "DONKpockets were originally a Nanotrasen product, an attempt to break into the food market controlled by Centauri Provisions. Somehow, Centauri wound up with the rights to the DONK brand, ending Nanotrasen's ambitions. They taste pretty okay."
 	icon_state = "donkpocket"
@@ -1041,6 +1041,56 @@
 			src.name = initial(name)
 	return
 
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/spicy
+	name = "\improper Spicy-pocket"
+	desc = "The classic snack food, now with a heat-activated spicy flair."
+	icon_state = "donkpocketspicy"
+	nutriment_amt = 2
+	nutriment_desc = list("heartiness" = 1, "dough" = 2, "spice" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/teriyaki
+	name = "\improper Teriyaki-pocket"
+	desc = "An east-asian take on the classic stationside snack."
+	icon_state = "donkpocketteriyaki"
+	nutriment_amt = 2
+	nutriment_desc = list("meat" = 1, "dough" = 2, "soy sauce" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/pizza
+	name = "\improper Pizza-pocket"
+	desc = "Delicious, cheesy and surprisingly filling."
+	icon_state = "donkpocketpizza"
+	nutriment_amt = 2
+	nutriment_desc = list("meat" = 1, "dough" = 2, "cheese"= 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/honk
+	name = "\improper Honk-pocket"
+	desc = "The award-winning donk-pocket that won the hearts of clowns and humans alike."
+	icon_state = "donkpocketbanana"
+	nutriment_amt = 2
+	nutriment_desc = list("banana" = 1, "dough" = 2, "children's antibiotics"= 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/berry
+	name = "\improper Berry-pocket"
+	desc = "A relentlessly sweet donk-pocket first created for use in Operation Dessert Storm."
+	icon_state = "donkpocketberry"
+	nutriment_amt = 2
+	nutriment_desc = list("dough" = 2, "jam" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/gondola
+	name = "\improper Gondola-pocket"
+	desc = "The choice to use real gondola meat in the recipe is controversial, to say the least." //Only a monster would craft this.
+	icon_state = "donkpocketberry"
+	nutriment_amt = 2
+	nutriment_desc = list("heartiness" = 1, "dough" = 2, "inner peace" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/dankpocket
+	name = "\improper Dank-pocket"
+	desc = "The food of choice for the seasoned botanist."
+	icon_state = "dankpocket"
+	nutriment_amt = 2
+	nutriment_desc = list("heartiness" = 1, "dough" = 2)
+	heated_reagents = list("space_drugs" = 5)
+
 /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket
 	name = "\improper Sin-pocket"
 	desc = "The food of choice for the veteran. Do <B>NOT</B> overconsume."

code/modules/food/recipes_microwave.dm

@@ -459,6 +459,14 @@ I said no!
 	items = list(/obj/item/weapon/reagent_containers/food/snacks/meatball)
 	result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
 
+/datum/recipe/dankpocket
+	fruit = list("ambrosia" = 2)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/meatball,
+		/obj/item/weapon/reagent_containers/food/snacks/doughslice
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/dankpocket
+
 /datum/recipe/validsalad/make_food(var/obj/container as obj)
 	. = ..(container)
 	for (var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked in .)

maps/expedition_vr/beach/beach.dmm

@@ -1354,6 +1354,15 @@
 /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{
 	pixel_x = -3
 	},
+<<<<<<< HEAD
+=======
+/obj/item/weapon/reagent_containers/glass/bottle/eznutrient,
+/obj/item/weapon/reagent_containers/glass/bottle/eznutrient,
+/obj/item/weapon/reagent_containers/glass/bottle/eznutrient,
+/obj/item/weapon/reagent_containers/glass/bottle/eznutrient,
+/obj/item/weapon/reagent_containers/glass/bottle/eznutrient,
+/obj/random/donkpocketbox,
+>>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets
 /turf/simulated/floor/tiled/eris/cafe,
 /area/tether_away/beach/resort/kitchen)
 "By" = (

maps/groundbase/gb-z2.dmm

@@ -4897,7 +4897,7 @@
 /area/groundbase/level2/nw)
 "oL" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
 "oM" = (
@@ -5553,7 +5553,7 @@
 /area/groundbase/dorms/room6)
 "qH" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room8)
 "qJ" = (
@@ -5678,7 +5678,7 @@
 /area/groundbase/civilian/library)
 "rc" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room1)
 "re" = (
@@ -6900,10 +6900,6 @@
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level2/northspur)
 "uU" = (
-/obj/item/weapon/storage/box/donkpockets{
-	pixel_x = 3;
-	pixel_y = 3
-	},
 /obj/item/weapon/reagent_containers/food/condiment/flour,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
@@ -6921,6 +6917,7 @@
 /obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
 /obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
 /obj/structure/closet,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
 "uX" = (
@@ -8892,7 +8889,7 @@
 /area/groundbase/civilian/library)
 "AY" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room2)
 "AZ" = (
@@ -12066,7 +12063,7 @@
 /area/groundbase/cargo/office)
 "Kj" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
 "Kk" = (
@@ -12689,7 +12686,7 @@
 /area/medical/virology)
 "LZ" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
 "Mb" = (
@@ -16068,7 +16065,7 @@
 /area/groundbase/command/hall)
 "VN" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room7)
 "VO" = (

maps/offmap_vr/talon/talon_v2.dm

@@ -822,6 +822,14 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 				/obj/random/snack,
 				/obj/structure/closet/crate/freezer/centauri //CENTAURI SNACKS
 			),
+			prob(10);list(
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/item/weapon/storage/box/donkpockets,
+				/obj/structure/closet/crate/freezer/centauri //CENTAURI DONK-POCKETS
+			),
 			prob(10);list(
 				/obj/random/powercell,
 				/obj/random/powercell,

maps/stellardelight/stellar_delight2.dmm

@@ -7722,10 +7722,6 @@
 /obj/structure/closet/walllocker_double/south{
 	pixel_x = -5
 	},
-/obj/item/weapon/storage/box/donkpockets{
-	pixel_x = 3;
-	pixel_y = 3
-	},
 /obj/structure/table/standard,
 /obj/machinery/button/remote/blast_door{
 	dir = 1;
@@ -7762,6 +7758,7 @@
 	pixel_x = 9;
 	pixel_y = -36
 	},
+/obj/random/donkpocketbox,
 /turf/simulated/floor/tiled/eris/cafe,
 /area/crew_quarters/kitchen)
 "rs" = (

maps/stellardelight/stellar_delight3.dmm

@@ -8871,6 +8871,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/shaker,
 /obj/item/weapon/reagent_containers/glass/rag,
 /obj/structure/table/rack,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/stellardelight/deck3/forestarroomb)
 "GD" = (

maps/tether/tether-01-surface1.dmm

@@ -23015,8 +23015,8 @@
 /area/crew_quarters/sleep/Dorm_8)
 "aLU" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_8)
 "aLV" = (
@@ -24301,8 +24301,8 @@
 /area/crew_quarters/sleep/Dorm_6)
 "aOs" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_6)
 "aOt" = (
@@ -25447,12 +25447,12 @@
 /area/crew_quarters/sleep/Dorm_4)
 "aQk" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/light_switch{
 	name = "light switch ";
 	pixel_y = 26
 	},
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_4)
 "aQl" = (
@@ -26603,12 +26603,12 @@
 /area/crew_quarters/sleep/Dorm_2)
 "aSs" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/storage/box/donkpockets,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/light_switch{
 	name = "light switch ";
 	pixel_y = 26
 	},
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_2)
 "aSt" = (
@@ -32531,7 +32531,6 @@
 /area/tether/surfacebase/security/brig)
 "dlB" = (
 /obj/structure/table/steel,
-/obj/item/weapon/storage/box/donkpockets,
 /obj/effect/floor_decal/corner/lightorange{
 	dir = 6
 	},
@@ -32541,6 +32540,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/random/donkpocketbox,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/brig)
 "doa" = (

maps/tether/tether-02-surface2.dmm

@@ -8828,7 +8828,9 @@
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox{
+	pixel_x = 6
+	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/breakroom)
 "anK" = (
@@ -25349,10 +25351,10 @@
 /area/rnd/breakroom)
 "aTy" = (
 /obj/structure/table/glass,
-/obj/item/weapon/storage/box/donkpockets,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/rnd/breakroom)
 "aTz" = (
@@ -29168,7 +29170,7 @@
 "bcD" = (
 /obj/structure/table/steel,
 /obj/machinery/microwave,
-/obj/item/weapon/storage/box/donkpockets,
+/obj/random/donkpocketbox,
 /turf/simulated/floor/wood,
 /area/maintenance/lower/atmos)
 "bcG" = (

maps/tether/tether-03-surface3.dmm

@@ -25481,8 +25481,19 @@
 /turf/simulated/floor/outdoors/grass/sif/virgo3b,
 /area/tether/surfacebase/outside/outside3)
 "aQg" = (
+<<<<<<< HEAD
 /obj/machinery/vending/cola{
 	dir = 4
+=======
+/obj/structure/table/woodentable,
+/obj/random/donkpocketbox{
+	pixel_x = 1;
+	pixel_y = -4
+	},
+/obj/random/donkpocketbox{
+	pixel_x = -2;
+	pixel_y = 2
+>>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/xenobiology/outpost_breakroom)
@@ -32774,8 +32785,17 @@
 /turf/simulated/floor/lino,
 /area/tether/surfacebase/entertainment/stage)
 "bda" = (
+<<<<<<< HEAD
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
+=======
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/standard,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/random/donkpocketbox{
+	pixel_x = 1;
+	pixel_y = 4
+>>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets
 	},
 /obj/machinery/door/airlock/freezer{
 	name = "Kitchen";
@@ -32784,9 +32804,12 @@
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
+<<<<<<< HEAD
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor,
+=======
+>>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
 "bdb" = (
@@ -306189,8 +306212,13 @@ aOf
 aOf
 aOf
 aPB
+<<<<<<< HEAD
 aPU
 aQg
+=======
+aQg
+aQP
+>>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets
 aQt
 azr
 aQN

maps/tether/tether-05-station1.dmm

@@ -2540,10 +2540,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/table/reinforced,
-/obj/item/weapon/storage/box/donkpockets{
-	pixel_x = 3;
-	pixel_y = 2
-	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
 	},
@@ -2556,6 +2552,10 @@
 /obj/effect/floor_decal/corner/yellow/bordercorner2{
 	dir = 6
 	},
+/obj/random/donkpocketbox{
+	pixel_x = 4;
+	pixel_y = -2
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
 "aeU" = (
@@ -9431,16 +9431,16 @@
 /area/maintenance/station/eng_lower)
 "awT" = (
 /obj/structure/table/reinforced,
-/obj/item/weapon/storage/box/donkpockets{
-	pixel_x = 3;
-	pixel_y = 2
-	},
 /obj/item/weapon/storage/box/glasses/square,
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/machinery/alarm{
 	dir = 8;
 	pixel_x = 25
 	},
+/obj/random/donkpocketbox{
+	pixel_x = 3;
+	pixel_y = -3
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/break_room)
 "awU" = (