Food Expansion 2 [DO NOT MERGE]

_maps/RandomRuins/JungleRuins/jungle_witch.dmm

@@ -165,7 +165,7 @@
 "vf" = (
 /obj/structure/table/wood/fancy/cyan,
 /obj/item/reagent_containers/food/snacks/burger/spell,
-/obj/item/reagent_containers/food/snacks/dankpocket{
+/obj/item/reagent_containers/food/snacks/donkpocket/dankpocket{
 	pixel_x = 8;
 	pixel_y = 10
 	},

code/__DEFINES/food.dm

@@ -14,11 +14,10 @@
 #define BREAKFAST (1<<13)
 #define CLOTH (1<<14)
 #define GRILLED (1<<15)
-/*#define NUTS (1<<16)
+#define NUTS (1<<16)
 #define SEAFOOD (1<<17)
-#define ORANGES (1<<18)
-#define BUGS (1<<19)*/
-#define GORE (1<<20)
+#define BUGS (1<<18)
+#define GORE (1<<19)
 
 /// IC meaning (more or less) for food flags
 #define FOOD_FLAGS_IC list( \
@@ -39,7 +38,6 @@
 	"Clothing", \
 	"Nuts", \
 	"Seafood", \
-	"Oranges", \
 	"Bugs", \
 )
 

code/_globalvars/lists/maintenance_loot.dm

@@ -232,6 +232,11 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 			/obj/item/storage/box/donkpockets/donkpocketberry = 1,
 			/obj/item/storage/box/donkpockets/donkpockethonk = 1,
 			) = 1,
+		list(//Donk-dinner Varieties
+			/obj/item/reagent_containers/food/snacks/ready_donk = 1,
+			/obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese = 1,
+			/obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas = 1,
+			) = 1,
 		/obj/item/reagent_containers/food/snacks/monkeycube = 1,
 		/obj/effect/spawner/lootdrop/ration = 1,
 		) = 8,

code/datums/mapgen/planetary/LavaGenerator.dm

@@ -244,7 +244,8 @@
 		/obj/structure/flora/ash/cacti = 1,
 		/obj/structure/flora/ash/tall_shroom = 2,
 		/obj/structure/flora/ash/fern = 2,
-		/obj/structure/flora/ash/puce = 2
+		/obj/structure/flora/ash/puce = 2,
+		/obj/structure/flora/ash/seraka = 2
 	)
 
 /datum/biome/cave/lavaland/rocky
@@ -265,7 +266,8 @@
 		/obj/structure/flora/ash/cap_shroom = 2,
 		/obj/structure/flora/ash/stem_shroom = 2,
 		/obj/structure/flora/ash/cacti = 1,
-		/obj/structure/flora/ash/tall_shroom = 2
+		/obj/structure/flora/ash/tall_shroom = 2,
+		/obj/structure/flora/ash/seraka = 2
 	)
 
 /datum/biome/cave/lavaland/lava

code/datums/mapgen/planetary/SandGenerator.dm

@@ -118,6 +118,7 @@
 		/obj/structure/flora/ash/stem_shroom = 4,
 		/obj/effect/decal/remains/human = 4,
 		/obj/effect/spawner/lootdrop/maintenance = 40,
+		/obj/structure/flora/ash/seraka = 4
 	)
 
 /datum/biome/sand/grass
@@ -145,6 +146,7 @@
 		/obj/structure/flora/tree/dead/barren = 4,
 		/obj/structure/flora/rock = 3,
 		/obj/structure/flora/rock/pile = 3,
+		/obj/structure/flora/ash/seraka = 2
 	)
 
 /datum/biome/sand/icecap
@@ -157,6 +159,7 @@
 		/obj/structure/flora/ash/stem_shroom = 2 ,
 		/obj/structure/flora/rock = 3,
 		/obj/structure/flora/rock/pile = 3,
+		/obj/structure/flora/ash/seraka = 2
 	)
 
 /datum/biome/sand/riverbed

code/datums/mood_events/generic_positive_events.dm

@@ -239,3 +239,8 @@
 	description = "Fishing is relaxing"
 	mood_change = 5
 	timeout = 3 MINUTES
+
+/datum/mood_event/memories_of_home
+	description = "<span class='nicegreen'>This taste seems oddly nostalgic...</span>\n"
+	mood_change = 3
+	timeout = 5 MINUTES

code/game/objects/items/gift.dm

@@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 /obj/item/a_gift
 	name = "gift"
 	desc = "PRESENTS!!!! eek!"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "giftdeliverypackage3"
 	item_state = "gift"
 	resistance_flags = FLAMMABLE

code/game/objects/items/melee/misc.dm

@@ -264,7 +264,7 @@
 /obj/item/conversion_kit
 	name = "conversion kit"
 	desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "uk"
 	custom_price = 450
 

code/game/objects/items/robot/robot_upgrades.dm

@@ -550,7 +550,7 @@
 /obj/item/borg/upgrade/rped
 	name = "engineering cyborg RPED"
 	desc = "A rapid part exchange device for the engineering cyborg."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "borgrped"
 	require_module = TRUE
 	module_type = list(/obj/item/robot_module/engineering, /obj/item/robot_module/saboteur)

code/game/objects/items/storage/backpack.dm

@@ -226,7 +226,7 @@
 /obj/item/storage/backpack/satchel/leather
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
-	icon = 'icons/obj/storage.dmi'		//WS Edit - Suitcases
+	icon = 'icons/obj/storage/storage.dmi'		//WS Edit - Suitcases
 	icon_state = "satchel"
 	item_state = "satchel"
 
@@ -359,7 +359,7 @@
 /obj/item/storage/backpack/messenger
 	name = "messenger bag"
 	desc = "A sturdy backpack worn over one shoulder."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	mob_overlay_icon = 'icons/mob/clothing/back.dmi'
 	icon_state = "courierbag"
 	item_state = "courierbag"

code/game/objects/items/storage/book.dm

@@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
 /obj/item/storage/book/bible
 	name = "bible"
 	desc = "Apply to head repeatedly."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "bible"
 	item_state = "bible"
 	lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
@@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
 	if(!GLOB.bible_icon_state && H.mind.holy_role == HOLY_ROLE_HIGHPRIEST)
 		var/dat = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"
 		for(var/i in 1 to GLOB.biblestates.len)
-			var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i])
+			var/icon/bibleicon = icon('icons/obj/storage/storage.dmi', GLOB.biblestates[i])
 			var/nicename = GLOB.biblenames[i]
 			H << browse_rsc(bibleicon, nicename)
 			dat += {"<tr><td><img src="[nicename]"></td><td><a href="?src=[REF(src)];seticon=[i]">[nicename]</a></td></tr>"}

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

@@ -254,7 +254,7 @@
 
 /obj/item/storage/box/hypospray
 	name = "hypospray mk. II kit"
-	icon = 'icons/obj/storage.dmi'		//WS Edit - Suitcases
+	icon = 'icons/obj/storage/storage.dmi'		//WS Edit - Suitcases
 	icon_state = "medbriefcase"
 	illustration = null
 
@@ -465,6 +465,7 @@
 	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"
+	icon = 'icons/obj/storage/donk.dmi'
 	illustration=null
 	var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket
 
@@ -736,7 +737,7 @@
 
 /obj/item/storage/box/lights
 	name = "box of replacement bulbs"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	illustration = "light"
 	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	item_state = "syringe_kit"
@@ -886,7 +887,7 @@
 /obj/item/storage/box/slugshot
 	name = "box of 12-gauge slug shotgun shells"
 	desc = "a box full of slug shots, designed for riot shotguns"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "slugshot_box"
 	illustration = null
 
@@ -1478,6 +1479,7 @@
 	name = "bubblegum packet"
 	desc = "The packaging is entirely in japanese, apparently. You can't make out a single word of it."
 	icon_state = "bubblegum_generic"
+	icon = 'icons/obj/storage/gum.dmi'
 	w_class = WEIGHT_CLASS_TINY
 	illustration = null
 	foldable = null

code/game/objects/items/storage/briefcase.dm

@@ -1,7 +1,7 @@
 /obj/item/storage/briefcase
 	name = "briefcase"
 	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
-	icon = 'icons/obj/storage.dmi' //WS edit - Better briefcases
+	icon = 'icons/obj/storage/storage.dmi' //WS edit - Better briefcases
 	icon_state = "briefcase"
 	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'

code/game/objects/items/storage/firstaid.dm

@@ -12,7 +12,7 @@
 /obj/item/storage/firstaid
 	name = "first-aid kit"
 	desc = "It's an emergency medical kit for those serious boo-boos."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "firstaid"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
@@ -119,7 +119,7 @@
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/firstaid/ancient
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "firstaid"
 	desc = "A first aid kit with the ability to heal common types of injuries."
 

code/game/objects/items/storage/lockbox.dm

@@ -3,7 +3,7 @@
 	desc = "A locked box."
 	icon_state = "lockbox+l"
 	item_state = "syringe_kit"
-	icon = 'icons/obj/storage.dmi' //WS edit - better briefcases
+	icon = 'icons/obj/storage/storage.dmi' //WS edit - better briefcases
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	w_class = WEIGHT_CLASS_BULKY

code/game/objects/items/storage/secure.dm

@@ -117,7 +117,7 @@
 // -----------------------------
 /obj/item/storage/secure/briefcase
 	name = "secure briefcase"
-	icon = 'icons/obj/storage.dmi' //WS edit - better briefcases
+	icon = 'icons/obj/storage/storage.dmi' //WS edit - better briefcases
 	icon_state = "secure"
 	item_state = "sec-case"
 	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
@@ -158,7 +158,7 @@
 
 /obj/item/storage/secure/safe
 	name = "secure safe"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "safe"
 	icon_opened = "safe0"
 	icon_locking = "safeb"

code/game/objects/items/storage/sixpack.dm

@@ -1,7 +1,7 @@
 /obj/item/storage/cans
 	name = "can ring"
 	desc = "Holds up to six drink cans, and select bottles."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	icon_state = "canholder"
 	item_state = "cola"
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'

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

@@ -1,6 +1,6 @@
 /obj/item/storage
 	name = "storage"
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/storage/storage.dmi'
 	w_class = WEIGHT_CLASS_NORMAL
 	var/rummage_if_nodrop = TRUE
 	var/component_type = /datum/component/storage/concrete

code/game/objects/items/trash.dm

@@ -69,6 +69,25 @@
 	name = "semki pack"
 	icon_state = "semki_pack"
 
+/obj/item/trash/peanuts
+	name = "\improper Gallery peanuts packet"
+	desc = "This thread is trash!"
+	icon_state = "peanuts"
+
+/obj/item/trash/cnds
+	name = "\improper C&Ds packet"
+	icon_state = "cnds"
+
+/obj/item/trash/spacers_sidekick
+	name = "\improper Spacer's Sidekick packet"
+	icon_state = "spacers_sidekick"
+
+/obj/item/trash/ready_donk
+	name = "empty Ready-donk"
+	desc = "It's been Donk-decimated."
+	icon_state = "ready_donk"
+	icon = 'icons/obj/food/donk.dmi'
+
 /obj/item/trash/tray
 	name = "tray"
 	icon_state = "tray"
@@ -79,15 +98,26 @@
 	icon = 'icons/obj/candle.dmi'
 	icon_state = "candle4"
 
+/obj/item/trash/can/Initialize()
+	. = ..()
+	pixel_x = rand(-4,4)
+	pixel_y = rand(-4,4)
+
+/obj/item/trash/attack(mob/M, mob/living/user)
+	return
+
 /obj/item/trash/can
 	name = "crushed can"
 	icon_state = "cola"
 	resistance_flags = NONE
 	grind_results = list(/datum/reagent/aluminium = 10)
 
+/obj/item/trash/can/food
+	name = "canned peaches"
+	icon_state = "peachcan_empty"
+	icon = 'icons/obj/food/canned.dmi'
 /obj/item/trash/can/food/peaches
 	name = "canned peaches"
-	icon = 'icons/obj/food/food.dmi'
 	icon_state = "peachcan_empty"
 
 /obj/item/trash/can/food/peaches/maint
@@ -96,13 +126,24 @@
 
 /obj/item/trash/can/food/beans
 	name = "tin of beans"
-	icon = 'icons/obj/food/food.dmi'
 	icon_state = "beans_empty"
 
-/obj/item/trash/can/Initialize()
-	. = ..()
-	pixel_x = rand(-4,4)
-	pixel_y = rand(-4,4)
+/obj/item/trash/can/food/tomatoes
+	name = "canned San Marzano tomatoes"
+	icon_state = "tomatoescan_empty"
 
-/obj/item/trash/attack(mob/M, mob/living/user)
-	return
+/obj/item/trash/can/food/pine_nuts
+	name = "canned pine nuts"
+	icon_state = "pinenutscan_empty"
+
+/obj/item/trash/can/food/jellyfish
+	name = "canned gunner jellyfish"
+	icon_state = "jellyfish_empty"
+
+/obj/item/trash/can/food/desert_snails
+	name = "canned desert snails"
+	icon_state = "snails_empty"
+
+/obj/item/trash/can/food/larvae
+	name = "canned bee larva"
+	icon_state = "larvae_empty"

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -76,4 +76,5 @@
 	open_sound_volume = 35
 	close_sound_volume = 50
 	material_drop = /obj/item/stack/sheet/plasteel
+
 #undef SNAKE_SPAM_TICKS

code/modules/admin/verbs/pray.dm

@@ -17,7 +17,7 @@
 		if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
 			return
 
-	var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible")
+	var/mutable_appearance/cross = mutable_appearance('icons/obj/storage/storage.dmi', "bible")
 	var/font_color = "purple"
 	var/prayer_type = "PRAYER"
 	var/deity