diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index ccc5955520a..d1872582f95 100644
--- a/code/__DEFINES/construction.dm
+++ b/code/__DEFINES/construction.dm
@@ -95,6 +95,7 @@
 #define CAT_EGG "Egg-Based Food"
 #define CAT_LIZARD "Lizard Food"
 #define CAT_MEAT "Meats"
+#define CAT_SEAFOOD "Seafood"
 #define CAT_MISCFOOD "Misc. Food"
 #define CAT_MEXICAN "Mexican Food"
 #define CAT_PASTRY "Pastries"
diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm
index a877c968685..b1295a5faf8 100644
--- a/code/__DEFINES/food.dm
+++ b/code/__DEFINES/food.dm
@@ -14,6 +14,7 @@
 #define BREAKFAST (1<<13)
 #define CLOTH (1<<14)
 #define NUTS (1<<15)
+#define SEAFOOD (1<<16)
 
 /// A list of food type names, in order of their flags
 #define FOOD_FLAGS list( \
@@ -32,6 +33,8 @@
 	"PINEAPPLE", \
 	"BREAKFAST", \
 	"CLOTH", \
+	"NUTS", \
+	"SEAFOOD", \
 )
 
 #define DRINK_NICE 1
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index e6dbffefb88..175157130e2 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -382,14 +382,14 @@
 /proc/bitfield2list(bitfield = 0, list/wordlist)
 	var/list/r = list()
 	if(islist(wordlist))
-		var/max = min(wordlist.len,16)
+		var/max = min(wordlist.len,24)
 		var/bit = 1
 		for(var/i=1, i<=max, i++)
 			if(bitfield & bit)
 				r += wordlist[i]
 			bit = bit << 1
 	else
-		for(var/bit=1, bit<=65535, bit = bit << 1)
+		for(var/bit=1, bit<=(1<<24), bit = bit << 1)
 			if(bitfield & bit)
 				r += bit
 
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index bf0e03f7d61..ac436f7ae71 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -32,6 +32,7 @@
 					CAT_LIZARD,
 					CAT_ICE,
 					CAT_MEAT,
+					CAT_SEAFOOD,
 					CAT_MISCFOOD,
 					CAT_PASTRY,
 					CAT_PIE,
diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm
index cfd7f5f0e9d..708586694d4 100644
--- a/code/game/objects/items/food/burgers.dm
+++ b/code/game/objects/items/food/burgers.dm
@@ -69,7 +69,7 @@
 	icon_state = "fishburger"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("bun" = 4, "fish" = 4)
-	foodtypes = GRAIN | MEAT
+	foodtypes = GRAIN | SEAFOOD
 	venue_value = FOOD_PRICE_EXOTIC
 
 /obj/item/food/burger/tofu
@@ -349,7 +349,7 @@
 	icon_state = "crabburger"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("bun" = 2, "crab meat" = 4)
-	foodtypes = GRAIN | MEAT
+	foodtypes = GRAIN | SEAFOOD
 	venue_value = FOOD_PRICE_NORMAL
 
 /obj/item/food/burger/soylent
diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm
index 2c26fde34e5..03f5c90293c 100644
--- a/code/game/objects/items/food/lizard.dm
+++ b/code/game/objects/items/food/lizard.dm
@@ -100,7 +100,7 @@
 	icon_state = "moonfish_eggs"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2)
 	tastes = list("caviar" = 1)
-	foodtypes = MEAT
+	foodtypes = SEAFOOD
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/moonfish_caviar
@@ -110,7 +110,7 @@
 	icon_state = "moonfish_caviar"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2)
 	tastes = list("caviar" = 1)
-	foodtypes = MEAT
+	foodtypes = SEAFOOD
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/lizard_escargot
@@ -171,7 +171,7 @@
 	icon_state = "picoss_skewer"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/vinegar= 1, /datum/reagent/consumable/capsaicin = 1)
 	tastes = list("fish" = 1, "acid" = 1, "onion" = 1, "heat" = 1)
-	foodtypes = MEAT | VEGETABLES
+	foodtypes = SEAFOOD | VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/nectar_larvae
@@ -202,7 +202,7 @@
 	icon_state = "grilled_moonfish"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment = 3)
 	tastes = list("fish" = 1)
-	foodtypes = MEAT
+	foodtypes = SEAFOOD
 	burns_on_grill = TRUE
 	w_class = WEIGHT_CLASS_SMALL
 
@@ -213,7 +213,7 @@
 	icon_state = "moonfish_demiglace"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment = 3)
 	tastes = list("fish" = 1)
-	foodtypes = MEAT
+	foodtypes = SEAFOOD
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/lizard_surf_n_turf
@@ -223,7 +223,7 @@
 	icon_state = "surf_n_turf"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/nutriment/vitamin = 10)
 	tastes = list("surf" = 1, "turf" = 1)
-	foodtypes = MEAT | VEGETABLES
+	foodtypes = MEAT | SEAFOOD | VEGETABLES
 	w_class = WEIGHT_CLASS_BULKY
 
 //Spaghetti Dishes
@@ -420,7 +420,7 @@
 	icon_state = "emperor_roll"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bread" = 1, "cheese" = 1, "liver" = 1, "caviar" = 1)
-	foodtypes = VEGETABLES | NUTS | MEAT | GROSS
+	foodtypes = VEGETABLES | NUTS | MEAT | GROSS | SEAFOOD
 	food_flags = FOOD_FINGER_FOOD
 	w_class = WEIGHT_CLASS_SMALL
 
@@ -581,7 +581,7 @@
 	icon_state = "canned_jellyfish"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/toxin/mindbreaker = 2, /datum/reagent/consumable/salt = 1)
 	tastes = list("slime" = 1, "burning" = 1, "salt" = 1)
-	foodtypes = MEAT | GROSS
+	foodtypes = SEAFOOD | GROSS
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/desert_snails
diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm
index 5d7231b36dc..0b019479b69 100644
--- a/code/game/objects/items/food/meat.dm
+++ b/code/game/objects/items/food/meat.dm
@@ -10,7 +10,7 @@
 	bite_consumption = 3
 	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 6,  /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
-	foodtypes = MEAT | FRIED
+	foodtypes = SEAFOOD | FRIED
 	w_class = WEIGHT_CLASS_SMALL
 
 
@@ -21,7 +21,7 @@
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bite_consumption = 6
 	tastes = list("fish" = 1)
-	foodtypes = MEAT
+	foodtypes = SEAFOOD
 	eatverbs = list("bite","chew","gnaw","swallow","chomp")
 	w_class = WEIGHT_CLASS_SMALL
 
@@ -72,7 +72,7 @@
 	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bite_consumption = 1
 	tastes = list("fish" = 1, "breadcrumbs" = 1)
-	foodtypes = MEAT | FRIED
+	foodtypes = SEAFOOD | FRIED
 	w_class = WEIGHT_CLASS_SMALL
 	venue_value = FOOD_PRICE_EXOTIC
 
@@ -82,7 +82,7 @@
 	icon_state = "fishandchips"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("fish" = 1, "chips" = 1)
-	foodtypes = MEAT | VEGETABLES | FRIED
+	foodtypes = SEAFOOD | VEGETABLES | FRIED
 	venue_value = FOOD_PRICE_NORMAL
 
 /obj/item/food/fishfry
@@ -91,7 +91,7 @@
 	icon_state = "fishfry"
 	food_reagents = list (/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("fish" = 1, "pan seared vegtables" = 1)
-	foodtypes = MEAT | VEGETABLES | FRIED
+	foodtypes = SEAFOOD | VEGETABLES | FRIED
 	w_class = WEIGHT_CLASS_SMALL
 
 ////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
@@ -477,7 +477,7 @@
 	icon_state = "sashimi"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/capsaicin = 9, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("fish" = 1, "hot peppers" = 1)
-	foodtypes = MEAT | TOXIC
+	foodtypes = SEAFOOD | TOXIC
 	w_class = WEIGHT_CLASS_TINY
 	//total price of this dish is 20 and a small amount more for soy sauce, all of which are available at the orders console
 	venue_value = FOOD_PRICE_CHEAP
@@ -929,7 +929,7 @@
 	icon_state = "crabmeat"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 2)
 	tastes = list("crab" = 1)
-	foodtypes = MEAT
+	foodtypes = SEAFOOD
 	burns_on_grill = TRUE
 
 /obj/item/food/meat/slab/chicken
diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm
index b8d90b869ca..b0bd328d8d8 100644
--- a/code/game/objects/items/food/snacks.dm
+++ b/code/game/objects/items/food/snacks.dm
@@ -91,6 +91,16 @@
 	if(trash_type)
 		AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_POPABLE)
 
+/obj/item/food/chips/shrimp
+	name = "shrimp chips"
+	desc = "Deep-fried, shrimp flavored chips. A favorite junkfood among seafood connoisseurs!"
+	icon_state = "shrimp_chips"
+	trash_type = /obj/item/trash/shrimp_chips
+	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3, /datum/reagent/consumable/salt = 1)
+	tastes = list("salt" = 1, "shrimp" = 1)
+	foodtypes = JUNKFOOD | FRIED | SEAFOOD
+	w_class = WEIGHT_CLASS_SMALL
+
 /obj/item/food/no_raisin
 	name = "4no raisins"
 	icon_state = "4no_raisins"
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index a71ed0fd5f3..12dcf5f4f2e 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -1523,7 +1523,7 @@
 	new /obj/item/food/meat/slab/bear(src)
 	new /obj/item/food/meat/slab/spider(src)
 	new /obj/item/food/spidereggs(src)
-	new /obj/item/food/fishmeat/carp(src)
+	new /obj/item/food/meat/slab/penguin(src)
 	new /obj/item/food/meat/slab/xeno(src)
 	new /obj/item/food/meat/slab/corgi(src)
 	new /obj/item/food/meatball(src)
@@ -1538,6 +1538,16 @@
 		new /obj/item/food/grown/cabbage(src)
 	new /obj/item/food/grown/chili(src)
 
+/obj/item/storage/box/ingredients/seafood
+	theme_name = "seafood"
+
+/obj/item/storage/box/ingredients/seafood/PopulateContents()
+	for(var/i in 1 to 2)
+		new /obj/item/food/fishmeat/carp(src)
+		new /obj/item/food/fishmeat/armorfish(src)
+		new /obj/item/food/fishmeat/moonfish(src)
+	new /obj/item/food/fishmeat/gunner_jellyfish(src)
+
 /obj/item/storage/box/ingredients/random
 	theme_name = "random"
 	desc = "This box should not exist, contact the proper authorities."
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index dd61a84e11a..de9e49f467c 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -36,6 +36,10 @@
 	name = "chips"
 	icon_state = "chips"
 
+/obj/item/trash/shrimp_chips
+	name = "shrimp chips"
+	icon_state = "shrimp_chips"
+
 /obj/item/trash/boritos
 	name = "boritos bag"
 	icon_state = "boritos"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 8c05dad3d34..688dedbd7ed 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -50,57 +50,6 @@
 	result = /obj/item/food/kebab/fiesta
 	subcategory = CAT_MEAT
 
-////////////////////////////////////////////////FISH////////////////////////////////////////////////
-
-/datum/crafting_recipe/food/cubancarp
-	name = "Cuban carp"
-	reqs = list(
-		/datum/reagent/consumable/flour = 5,
-		/obj/item/food/grown/chili = 1,
-		/obj/item/food/fishmeat/carp = 1
-	)
-	result = /obj/item/food/cubancarp
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/fishandchips
-	name = "Fish and chips"
-	reqs = list(
-		/obj/item/food/fries = 1,
-		/obj/item/food/fishmeat = 1
-	)
-	result = /obj/item/food/fishandchips
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/fishfingers
-	name = "Fish fingers"
-	reqs = list(
-		/datum/reagent/consumable/flour = 5,
-		/obj/item/food/bun = 1,
-		/obj/item/food/fishmeat = 1
-	)
-	result = /obj/item/food/fishfingers
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/fishfry
-	name = "Fish fry"
-	reqs = list(
-		/obj/item/food/grown/corn = 1,
-		/obj/item/food/grown/peas = 1,
-		/obj/item/food/fishmeat = 1
-	)
-	result = /obj/item/food/fishfry
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/sashimi
-	name = "Sashimi"
-	reqs = list(
-		/datum/reagent/consumable/soysauce = 5,
-		/obj/item/food/spidereggs = 1,
-		/obj/item/food/fishmeat = 1
-	)
-	result = /obj/item/food/sashimi
-	subcategory = CAT_MEAT
-
 ////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/spidereggsham
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
new file mode 100644
index 00000000000..65efa2d0565
--- /dev/null
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
@@ -0,0 +1,48 @@
+/datum/crafting_recipe/food/cubancarp
+	name = "Cuban carp"
+	reqs = list(
+		/datum/reagent/consumable/flour = 5,
+		/obj/item/food/grown/chili = 1,
+		/obj/item/food/fishmeat/carp = 1
+	)
+	result = /obj/item/food/cubancarp
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/fishandchips
+	name = "Fish and chips"
+	reqs = list(
+		/obj/item/food/fries = 1,
+		/obj/item/food/fishmeat = 1
+	)
+	result = /obj/item/food/fishandchips
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/fishfingers
+	name = "Fish fingers"
+	reqs = list(
+		/datum/reagent/consumable/flour = 5,
+		/obj/item/food/bun = 1,
+		/obj/item/food/fishmeat = 1
+	)
+	result = /obj/item/food/fishfingers
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/fishfry
+	name = "Fish fry"
+	reqs = list(
+		/obj/item/food/grown/corn = 1,
+		/obj/item/food/grown/peas = 1,
+		/obj/item/food/fishmeat = 1
+	)
+	result = /obj/item/food/fishfry
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/sashimi
+	name = "Sashimi"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/food/spidereggs = 1,
+		/obj/item/food/fishmeat = 1
+	)
+	result = /obj/item/food/sashimi
+	subcategory = CAT_SEAFOOD
diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm
index 3d6c1ce0787..276ef89ee68 100644
--- a/code/modules/mob/living/carbon/human/species_types/felinid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm
@@ -11,12 +11,19 @@
 	//mutant_organs = list(/obj/item/organ/tail/cat) //SKYRAT EDIT REMOVAL - CUSTOMIZATION
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
 	species_language_holder = /datum/language_holder/felinid
-	disliked_food = GROSS | RAW | CLOTH
+	disliked_food = GROSS | CLOTH | RAW
+	liked_food = SEAFOOD
 	var/original_felinid = TRUE //set to false for felinids created by mass-purrbation
 	payday_modifier = 0.75
 	ass_image = 'icons/ass/asscat.png'
 	family_heirlooms = list(/obj/item/toy/cattoy)
 
+// Prevents felinids from taking toxin damage from carpotoxin
+/datum/species/human/felinid/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H, delta_time, times_fired)
+	. = ..()
+	if(istype(chem, /datum/reagent/toxin/carpotoxin))
+		var/datum/reagent/toxin/carpotoxin/fish = chem
+		fish.toxpwr = 0
 
 //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
 /*
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index a7c56c29aa6..396e8778df9 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -29,7 +29,7 @@
 	skinned_type = /obj/item/stack/sheet/animalhide/lizard
 	exotic_bloodtype = "L"
 	disliked_food = GRAIN | DAIRY | CLOTH
-	liked_food = GROSS | MEAT
+	liked_food = GROSS | MEAT | SEAFOOD
 	inert_mutation = FIREBREATH
 	deathsound = 'sound/voice/lizard/deathsound.ogg'
 	wings_icons = list("Dragon")
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 0a58f00f5ec..b0a7e89885a 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -19,7 +19,7 @@
 	meat = /obj/item/food/meat/slab/human/mutant/moth
 	liked_food = VEGETABLES | DAIRY | CLOTH
 	disliked_food = FRUIT | GROSS
-	toxic_food = MEAT | RAW
+	toxic_food = MEAT | RAW | SEAFOOD
 	mutanteyes = /obj/item/organ/eyes/moth
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
 	species_language_holder = /datum/language_holder/moth
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index 6785d1bfb7b..3de8528fa7c 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -19,7 +19,7 @@
 	heatmod = 1.5
 	payday_modifier = 0.75
 	meat = /obj/item/food/meat/slab/human/mutant/plant
-	disliked_food = MEAT | DAIRY
+	disliked_food = MEAT | DAIRY | SEAFOOD
 	liked_food = VEGETABLES | FRUIT | GRAIN
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
 	species_language_holder = /datum/language_holder/plant
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 4725ec4e412..0160dbe2916 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -9,6 +9,7 @@
 					/obj/item/food/cheesiehonkers = 6,
 					/obj/item/food/candy = 6,
 		            /obj/item/food/chips = 6,
+					/obj/item/food/chips/shrimp = 6,
 		            /obj/item/food/sosjerky = 6,
 					/obj/item/food/no_raisin = 6,
 					/obj/item/food/peanuts = 6,
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 6e2e9471544..dfa70a2bb5a 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 67baf78f355..b273f0fb5fd 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index cb0c4be1971..6b68f47bcb0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2492,6 +2492,7 @@
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm"
+#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm"
 #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm"
 #include "code\modules\food_and_drinks\restaurant\_venue.dm"
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx
index 237722163e4..27c98ba946b 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx
@@ -17,7 +17,9 @@ const FOOD_ICONS = {
   [Food.Gross]: "trash",
   [Food.Junkfood]: "pizza-slice",
   [Food.Meat]: "hamburger",
+  [Food.Nuts]: "acorn",
   [Food.Raw]: "drumstick-bite",
+  [Food.Seafood]: "fish",
   [Food.Sugar]: "candy-cane",
   [Food.Toxic]: "biohazard",
   [Food.Vegetables]: "carrot",
@@ -32,7 +34,9 @@ const FOOD_NAMES: Record<keyof typeof FOOD_ICONS, string> = {
   [Food.Gross]: "Gross food",
   [Food.Junkfood]: "Junk food",
   [Food.Meat]: "Meat",
+  [Food.Nuts]: "Nuts",
   [Food.Raw]: "Raw",
+  [Food.Seafood]: "Seafood",
   [Food.Sugar]: "Sugar",
   [Food.Toxic]: "Toxic food",
   [Food.Vegetables]: "Vegetables",
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
index 9fba753dabe..82382e54816 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/data.ts
@@ -13,8 +13,10 @@ export enum Food {
   Gross = "GROSS",
   Junkfood = "JUNKFOOD",
   Meat = "MEAT",
+  Nuts = "NUTS",
   Pineapple = "PINEAPPLE",
   Raw = "RAW",
+  Seafood = "SEAFOOD",
   Sugar = "SUGAR",
   Toxic = "TOXIC",
   Vegetables = "VEGETABLES",