Merge remote-tracking branch 'upstream/master'

ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm

@@ -11,6 +11,7 @@
 	habitat = "Freshwater Ponds"
 	icon_state = "waterflea"
 	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/slime
 	sprite_width = 2
 	sprite_height = 2
 	average_size = 1
@@ -28,19 +29,32 @@
 	name = "northern pike"
 	desc = "Northern pike are territorial predators that ambush prey with a burst of speed, pikes can move upto ten miles per hour while ambushing prey."
 	icon_state = "northernpike"
-	random_case_rarity = FISH_RARITY_VERY_RARE
+	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
 	sprite_width = 8
 	sprite_height = 4
 	average_size = 91
 	average_weight = 9071
 
+/obj/item/food/fish/fresh_water/salmon
+	name = "atlantic salmon"
+	desc = " Atlantic salmon are anadromous fish known for their silver-blue coloration and are native to rivers and oceans along the North Atlantic coast, valued for their delicate taste and texture in culinary preparations."
+	icon_state = "salmon_sockeye"
+	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
+	sprite_width = 8
+	sprite_height = 4
+	average_size = 175
+	average_weight = 3175
+
 /// Abnormalities
 
 /obj/item/food/fish/fresh_water/yang
 	name = "yang carp"
 	desc = "A unique breed of carp that is themed around yang. The philosophical concept of yang is characterized by masculinity, the sun, light, and activity."
 	icon_state = "yangfish"
 	random_case_rarity = FISH_RARITY_VERY_RARE
+	fillet_type = /obj/item/food/freshfish/white
 	sprite_width = 8
 	sprite_height = 8
 	average_size = 50
@@ -57,6 +71,7 @@
 	desc = "A unique breed of carp that is themed around yin. The philosophical concept of yin is characterized by femininity, the moon, darkness, and disintigration."
 	icon_state = "yinfish"
 	random_case_rarity = FISH_RARITY_VERY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
 	sprite_width = 8
 	sprite_height = 8
 	average_size = 50
@@ -74,6 +89,7 @@
 	icon_state = "mosb"
 	show_in_catalog = FALSE
 	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+	fillet_type = /obj/item/food/freshfish/rotten
 	required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
 	sprite_width = 8
 	sprite_height = 8
@@ -84,4 +100,3 @@
 		/datum/reagent/abnormality/heartysyrup = 4,
 		/datum/reagent/consumable/nutriment/vile_fluid = 6,
 	)
-	fillet_type = /obj/item/food/meat/slab/human/mutant/zombie //zombi meat

ModularTegustation/fishing/code/fish/LC13_fish/saltwater_fish.dm

@@ -10,6 +10,7 @@
 	desc = "California Sheepheads are unique in the fact that they are protogynous hermaphrodites, born female and become male as they mature."
 	icon_state = "sheephead"
 	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
 	sprite_width = 8
 	sprite_height = 8
 	average_size = 91
@@ -20,10 +21,22 @@
 	desc = "Bluefins are the largest type of tuna and migrate across all oceans."
 	icon_state = "bluefintuna"
 	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
 	sprite_width = 8
 	sprite_height = 8
 	average_size = 149.86
-	average_weight = 226796
+	average_weight = 60464
+
+/obj/item/food/fish/salt_water/salmon
+	name = "sockeye salmon"
+	desc = "Sockeye salmon, also known as red salmon, are a species prized for their vibrant red flesh and rich, distinct flavor, typically found in Pacific Ocean waters."
+	icon_state = "salmon_sockeye"
+	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
+	sprite_width = 8
+	sprite_height = 4
+	average_size = 71
+	average_weight = 4082
 
 /obj/item/food/fish/salt_water/marine_shrimp
 	name = "marine shrimp"
@@ -41,13 +54,25 @@
 		/datum/reagent/consumable/nutriment/vile_fluid = 1,
 	)
 
+/obj/item/food/fish/salt_water/lobster
+	name = "lobster"
+	desc = "Lobsters are crustaceans that live in salt water."
+	icon_state = "lobster"
+	microwaved_type = /obj/item/food/meat/crab
+	fillet_type = /obj/item/food/meat/rawcrab
+	sprite_width = 8
+	sprite_height = 8
+	average_size = 50
+	average_weight = 6803
+
 /// Abnormalities
 
 /obj/item/food/fish/salt_water/piscine_mermaid
 	name = "lovestruck fish"
-	desc = "A carp that seems to have survived exposure to Piscene Mermaids water. It seems to have consumed its own pectoral fins."
+	desc = "A carp that seems to have survived exposure to Piscene Mermaid's water. It seems to have consumed its own pectoral fins."
 	habitat = "Saltwater"
 	icon_state = "mermaid"
+	fillet_type = /obj/item/food/freshfish/white
 	show_in_catalog = FALSE
 	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
 	required_fluid_type = AQUARIUM_FLUID_SALTWATER
@@ -61,3 +86,20 @@
 		/datum/reagent/abnormality/bittersyrup = 4,
 		/datum/reagent/consumable/salt = 4,
 	)
+
+/obj/item/food/fish/salt_water/tuna_pallid//TODO: make it unsafe to eat somehow. Apply pallid noise to the consumer
+	name = "pallidified tuna"
+	desc = "A tuna that was swallowed and corrupted by a great whale. Yuck."
+	icon_state = "pallid_tuna"
+	random_case_rarity = FISH_RARITY_RARE
+	sprite_width = 8
+	sprite_height = 8
+	average_size = 149.86
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment/protein = 1,
+		/datum/reagent/consumable/nutriment/organ_tissue = 1,
+		/datum/reagent/consumable/salt = 8,
+		/datum/reagent/toxin = 3,
+		/datum/reagent/toxin/mindbreaker = 5,
+		/datum/reagent/toxin/pallidwaste = 15,//this is defined in toxin_reagents.dm
+	)

ModularTegustation/fishing/code/fish/freshwater_fish.dm

@@ -10,24 +10,55 @@
 	desc = "Despite common belief, goldfish do not have three-second memories. They can actually remember things that happened up to three months ago."
 	habitat = "Bodies of Freshwater"
 	icon_state = "goldfish"
+	fillet_type = /obj/item/food/freshfish/white
 	sprite_width = 8
 	sprite_height = 8
 	stable_population = 3
 	average_size = 30
 	average_weight = 500
 
+/obj/item/food/fish/fresh_water/bass
+	name = "largemouth bass"
+	desc = "A large, carnivorous freshwater fish known for thriving in most environments and being popular amongst sport fishers."
+	icon_state = "bass"
+	fillet_type = /obj/item/food/freshfish/white
+	average_size = 40
+	average_weight = 5000
+	stable_population = 3
+
+/obj/item/food/fish/trout
+	name = "steelhead trout"
+	desc = "A species of coastal trout closely related to salmon and with a deep history of being used as a source of food."
+	icon_state = "trout"
+	fillet_type = /obj/item/food/freshfish/white
+	required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+	average_size = 60
+	average_weight = 12000
+	stable_population = 3
+
+/obj/item/food/fish/fresh_water/perch
+	name = "perch"
+	desc = "A relatively small, yet common, species of predatory fish."
+	icon_state = "perch"
+	fillet_type = /obj/item/food/freshfish/white
+	average_size = 20
+	average_weight = 900
+	stable_population = 6
+
 /obj/item/food/fish/fresh_water/angelfish
 	name = "angelfish"
 	desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood."
 	icon_state = "angelfish"
+	fillet_type = /obj/item/food/freshfish/white
 	dedicated_in_aquarium_icon_state = "bigfish"
 	sprite_height = 7
 	source_height = 7
 
 /obj/item/food/fish/fresh_water/guppy
 	name = "guppy"
-	desc = "Guppy is also known as rainbow fish because of the brightly colored body and fins."
+	desc = "Guppy is also known as rainbow fish because of their brightly colored body and fins."
 	icon_state = "guppy"
+	fillet_type = /obj/item/food/freshfish/white
 	dedicated_in_aquarium_icon_state = "fish_greyscale"
 	aquarium_vc_color = "#91AE64"
 	sprite_width = 8
@@ -38,13 +69,15 @@
 	name = "plasma tetra"
 	desc = "Due to their small size, tetras are prey to many predators in their watery world, including eels, crustaceans, and invertebrates."
 	icon_state = "plastetra"
+	fillet_type = /obj/item/food/freshfish/white
 	dedicated_in_aquarium_icon_state = "fish_greyscale"
 	aquarium_vc_color = "#D30EB0"
 
 /obj/item/food/fish/fresh_water/catfish
 	name = "cory catfish"
 	desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch."
 	icon_state = "catfish"
+	fillet_type = /obj/item/food/freshfish/white
 	average_size = 100
 	average_weight = 2000
 
@@ -56,4 +89,4 @@
 	show_in_catalog = FALSE
 	random_case_rarity = FISH_RARITY_RARE
 	stable_population = 4 //set by New, but this is the default config value
-	fillet_type = /obj/item/food/meat/slab/human/mutant/zombie //eww...
+	fillet_type = /obj/item/food/freshfish/rotten

ModularTegustation/fishing/code/fish/misc_fish.dm

@@ -9,6 +9,7 @@
 	name = "toxic emulsijack"
 	desc = "Ah, the terrifying emulsijack. Created in a laboratory, this slimey, scaleless fish emits an invisible toxin that emulsifies other fish for it to feed on. Its only real use is for completely ruining a tank."
 	habitat = "Invading Other Habitats"
+	fillet_type = /obj/item/food/freshfish/slime
 	icon_state = "emulsijack"
 	show_in_catalog = FALSE
 	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
@@ -33,6 +34,7 @@
 	desc = "A unique breed of fish that is themed around Dream-Devouring Siltcurrent. Flotsams not included."
 	icon_state = "siltcurrent"
 	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/rotten
 	sprite_width = 8
 	sprite_height = 8
 	average_size = 60

ModularTegustation/fishing/code/fish/saltwater_fish.dm

@@ -10,6 +10,7 @@
 	desc = "One Pufferfish contains enough toxins in its liver to kill 30 people."
 	habitat = "Ocean"
 	icon_state = "pufferfish"
+	fillet_type = /obj/item/food/freshfish/fugu
 	required_fluid_type = AQUARIUM_FLUID_SALTWATER
 	sprite_width = 8
 	sprite_height = 8
@@ -22,6 +23,7 @@
 	desc = "Clownfish catch prey by swimming onto the reef, attracting larger fish, and luring them back to the anemone. The anemone will sting and eat the larger fish, leaving the remains for the clownfish."
 	icon_state = "clownfish"
 	dedicated_in_aquarium_icon_state = "clownfish_small"
+	fillet_type = /obj/item/food/freshfish/pink
 	sprite_width = 8
 	sprite_height = 5
 	average_size = 30
@@ -32,6 +34,7 @@
 	name = "cardinalfish"
 	desc = "Cardinalfish are often found near sea urchins, where the fish hide when threatened."
 	icon_state = "cardinalfish"
+	fillet_type = /obj/item/food/freshfish/white
 	average_size = 30
 	average_weight = 500
 	stable_population = 4
@@ -40,6 +43,7 @@
 	name = "green chromis"
 	desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights."
 	icon_state = "greenchromis"
+	fillet_type = /obj/item/food/freshfish/white
 	average_size = 30
 	average_weight = 500
 	stable_population = 5
@@ -48,6 +52,7 @@
 	name = "firefish goby"
 	desc = "To communicate in the wild, the firefish uses its dorsal fin to alert others of potential danger."
 	icon_state = "firefish"
+	fillet_type = /obj/item/food/freshfish/white
 	sprite_width = 6
 	sprite_height = 5
 	average_size = 30
@@ -58,6 +63,7 @@
 	desc = "Typically found in areas below 6600 feet below the surface of the ocean, they live in complete darkness."
 	icon_state = "lanternfish"
 	random_case_rarity = FISH_RARITY_VERY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
 	source_width = 28
 	source_height = 21
 	sprite_width = 8

ModularTegustation/fishing/code/fish_market.dm

@@ -13,16 +13,29 @@
 		new /datum/data/extraction_cargo("Fishin Starting Pack ",		/obj/item/storage/box/fishing,						200) = 1,
 		new /datum/data/extraction_cargo("Aquarium Rocks ",				/obj/item/aquarium_prop/rocks,						250) = 1,
 		new /datum/data/extraction_cargo("Aquarium Seaweed ",			/obj/item/aquarium_prop/seaweed,					250) = 1,
-		new /datum/data/extraction_cargo("Sinew Fishing Line ",			/obj/item/fishing_component/line/sinew,				250) = 1,
-		new /datum/data/extraction_cargo("Bone Fishing Hook ",			/obj/item/fishing_component/hook/bone,				250) = 1,
 		new /datum/data/extraction_cargo("Water Sprayer Backpack ",		/obj/item/watertank,								400) = 1,
 		new /datum/data/extraction_cargo("Dock Worker Lantern ",		/obj/item/flashlight/lantern,						400) = 1,
-		new /datum/data/extraction_cargo("Weighted Fishing Hook ", 		/obj/item/fishing_component/hook/weighted,			500) = 1,
-		new /datum/data/extraction_cargo("Reinforced Fishing Line ", 	/obj/item/fishing_component/line/reinforced,		500) = 1,
 		new /datum/data/extraction_cargo("Fishing Hat ",		 		/obj/item/clothing/head/beret/fishing_hat,			500) = 1,
 		new /datum/data/extraction_cargo("Aquarium Branch Office ",		/obj/item/aquarium_prop/lcorp,						500) = 1,
-		new /datum/data/extraction_cargo("Tier 1 Fishing Rod ",			/obj/item/fishing_rod/tier1,						500) = 1,
-		//Yes we are scamming you.
+
+		//More nets
+		new /datum/data/extraction_cargo("Fishing Net ",					/obj/item/fishing_net,							300) = 1,
+		new /datum/data/extraction_cargo("Nylon Fishing Net ",				/obj/item/fishing_net/nylon,					700) = 1,
+		new /datum/data/extraction_cargo("Steel Fishing Net ",				/obj/item/fishing_net/steel,					700) = 1,
+
+		//Better rods
+		new /datum/data/extraction_cargo("Fibreglass Fishing Rod ",			/obj/item/fishing_rod/fiberglass,				700) = 1,
+		new /datum/data/extraction_cargo("Gold-plated Fishing Rod ",		/obj/item/fishing_rod/gold,						700) = 1,
+		new /datum/data/extraction_cargo("Titanium Fishing Rod ",			/obj/item/fishing_rod/titanium,					700) = 1,
+
+		//Lines
+		new /datum/data/extraction_cargo("Sinew Fishing Line ",			/obj/item/fishing_component/line/sinew,				250) = 1,
+		new /datum/data/extraction_cargo("Woven Fishing Line ",			/obj/item/fishing_component/line/woven,				500) = 1,
+		new /datum/data/extraction_cargo("Reinforced Fishing Line ", 	/obj/item/fishing_component/line/reinforced,		700) = 1,
+
+		//Hooks
+		new /datum/data/extraction_cargo("Bone Fishing Hook ",			/obj/item/fishing_component/hook/bone,				250) = 1,
+		new /datum/data/extraction_cargo("Weighted Fishing Hook ", 		/obj/item/fishing_component/hook/weighted,			500) = 1,
 		new /datum/data/extraction_cargo("Shiny Fishing Hook ", 		/obj/item/fishing_component/hook/shiny,				1000) = 1,
 	)