Small Fishing Update 1.3[DONE] (#2337)

Small Fishing Update 1.3 Fishing update 1.3 adds - freshwater eel - squid - smol shark - pigfish - blue tang - deep fry
vlggms · Aug 2, 2024 · 22fca45 · 22fca45
1 parent 0005657
commit 22fca45
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 16 deletions.
diff --git a/ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm b/ModularTegustation/fishing/code/fish/LC13_fish/freshwater_fish.dm
@@ -7,7 +7,8 @@
 
 /obj/item/food/fish/fresh_water/waterflea
 	name = "water flea"
-	desc = "Water Fleas are sometimes used in scientific studies to test the effects of toxins due to their transparency and easily identifiable organs."
+	desc = "Water Fleas are sometimes used in scientific studies to test the \
+		effects of toxins due to their transparency and easily identifiable organs."
 	habitat = "Freshwater Ponds"
 	icon_state = "waterflea"
 	random_case_rarity = FISH_RARITY_RARE
@@ -27,7 +28,8 @@
 
 /obj/item/food/fish/fresh_water/northernpike
 	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."
+	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_RARE
 	fillet_type = /obj/item/food/freshfish/pink
@@ -38,7 +40,9 @@
 
 /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."
+	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
@@ -47,11 +51,23 @@
 	average_size = 175
 	average_weight = 3175
 
+/obj/item/food/fish/fresh_water/eel
+	name = "freshwater eel"
+	desc = "Eels hunt during the night and sleep in the mud near the shoreline during the day."
+	icon_state = "eel_fresh"
+	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."
+	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
@@ -68,7 +84,8 @@
 
 /obj/item/food/fish/fresh_water/yin
 	name = "yin carp"
-	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."
+	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
@@ -85,7 +102,9 @@
 
 /obj/item/food/fish/fresh_water/mosb
 	name = "mountain of smiling fish"
-	desc = "This mass attempts to bite onto detris and living organisms in order to increase its size. If it wasnt for the uncanny resemblence to T-01-75 this would be written off as a product of nature, but this is clearly a mutation brought upon by exposure."
+	desc = "This mass attempts to bite onto detris and living organisms in order to increase \
+		its size. If it wasnt for the uncanny resemblence to T-01-75 this would be written off \
+		as a product of nature, but this is clearly a mutation brought upon by exposure."
 	icon_state = "mosb"
 	show_in_catalog = FALSE
 	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS

diff --git a/ModularTegustation/fishing/code/fish/LC13_fish/saltwater_fish.dm b/ModularTegustation/fishing/code/fish/LC13_fish/saltwater_fish.dm
@@ -7,7 +7,8 @@
 
 /obj/item/food/fish/salt_water/sheephead
 	name = "california sheephead"
-	desc = "California Sheepheads are unique in the fact that they are protogynous hermaphrodites, born female and become male as they mature."
+	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
@@ -29,7 +30,8 @@
 
 /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."
+	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
@@ -38,9 +40,35 @@
 	average_size = 71
 	average_weight = 4082
 
+/obj/item/food/fish/salt_water/squid
+	name = "squid"
+	// I couldnt find a good squid fact -IP
+	desc = "Cephelopods are the only type of molluscs that have a closed circulatory \
+		system where their vital fluids are transported through veins rather than \
+		sloshing around inside of them."
+	icon_state = "squid"
+	random_case_rarity = FISH_RARITY_RARE
+	fillet_type = /obj/item/food/freshfish/pink
+	sprite_width = 8
+	sprite_height = 8
+	average_size = 160
+	average_weight = 600
+
+/obj/item/food/fish/salt_water/smolshark
+	name = "small shark"
+	desc = "Shark eggs come in various forms such as mermaid purses or corkscrews."
+	icon_state = "shark_smol"
+	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 = 60464
+
 /obj/item/food/fish/salt_water/marine_shrimp
 	name = "marine shrimp"
-	desc = "Shrimp are omnivores and act as primary consumers, mostly consisting off of algae, plankten, and whatever organic material they can scavenge."
+	desc = "Shrimp are omnivores and act as primary consumers, mostly consisting off of algae, \
+		plankten, and whatever organic material they can scavenge."
 	icon_state = "shrimp"
 	dedicated_in_aquarium_icon_state = "shrimp_fish"
 	average_size = 2
@@ -56,7 +84,9 @@
 
 /obj/item/food/fish/salt_water/lobster
 	name = "lobster"
-	desc = "Lobsters are crustaceans that live in salt water."
+	desc = "Lobsters do not weaken as they age, instead they die when the stress of moulting \
+		their ever growing shells becomes too great or they dont moult and their shell collapses \
+		in on themselves."
 	icon_state = "lobster"
 	microwaved_type = /obj/item/food/meat/crab
 	fillet_type = /obj/item/food/meat/rawcrab
@@ -65,11 +95,54 @@
 	average_size = 50
 	average_weight = 6803
 
+/obj/item/food/fish/salt_water/blue_tang
+	name = "blue tang"
+	desc = "Regal blue tangs have spines on the bottom and top of the area where their \
+		tail meets their body that they use to protect themselves."
+	icon_state = "blue_tang"
+	fillet_type = /obj/item/food/freshfish/white
+	average_size = 30
+	average_weight = 500
+	stable_population = 4
+
+/obj/item/food/fish/salt_water/deep_fry
+	name = "deep fry"
+	desc = "We shall dive down through black abysses... and in that lair of the Deep Ones we \
+		shall dwell amidst wonder and glory forever."
+	habitat = "Unknown"
+	icon_state = "deep_fry"
+	fillet_type = /obj/item/food/freshfish/pink
+	show_in_catalog = FALSE
+	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+	required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+	sprite_width = 8
+	sprite_height = 8
+	average_size = 100
+	average_weight = 16000
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment/protein = 1,
+		/datum/reagent/consumable/nutriment/organ_tissue = 1,
+		/datum/reagent/abnormality/bittersyrup = 4,
+		/datum/reagent/consumable/salt = 4,
+	)
+
+/obj/item/food/fish/salt_water/pigfish
+	name = "mini pigfish"
+	desc = "Almost identical to a boss from a popular videogame."
+	icon_state = "pigfish"
+	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+	fillet_type = /obj/item/food/freshfish/pink
+	sprite_width = 8
+	sprite_height = 8
+	average_size = 149.86
+	average_weight = 60464
+
 /// Abnormalities
 
 /obj/item/food/fish/salt_water/piscine_mermaid
 	name = "lovestruck fish"
-	desc = "A carp that seems to have survived exposure to Piscene Mermaid's 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
@@ -91,6 +164,7 @@
 	name = "pallidified tuna"
 	desc = "A tuna that was swallowed and corrupted by a great whale. Yuck."
 	icon_state = "pallid_tuna"
+	habitat = "Great Lake"
 	random_case_rarity = FISH_RARITY_RARE
 	sprite_width = 8
 	sprite_height = 8

diff --git a/ModularTegustation/fishing/code/turfs.dm b/ModularTegustation/fishing/code/turfs.dm
@@ -257,10 +257,11 @@
 	)
 	loot_level2 = list(
 		/obj/item/food/fish/fresh_water/catfish = 50,
-		/obj/item/food/fish/fresh_water/bass = 15,
+		/obj/item/food/fish/fresh_water/bass = 10,
+		/obj/item/food/fish/fresh_water/eel = 10,
 		/obj/item/stack/sheet/sinew/wolf = 10,
 		/obj/item/stack/sheet/leather = 10,
-		/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled = 10,
+		/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled = 5,
 		/obj/item/clothing/head/beret/fishing_hat = 5,
 	)
 	loot_level3 = list(
@@ -285,15 +286,20 @@
 	)
 	loot_level2 = list(
 		/obj/item/food/fish/trout = 35,
-		/obj/item/food/fish/salt_water/cardinal = 30,
-		/obj/item/food/fish/salt_water/sheephead = 20,
+		/obj/item/food/fish/salt_water/cardinal = 25,
+		/obj/item/food/fish/salt_water/sheephead = 10,
+		/obj/item/food/fish/salt_water/blue_tang = 10,
 		/obj/item/reagent_containers/food/drinks/bottle/wine/unlabeled = 10,
+		/obj/item/food/fish/salt_water/squid = 5,
 		/obj/item/clothing/head/beret/fishing_hat = 5,
 	)
 	loot_level3 = list(
-		/obj/item/food/fish/salt_water/lanternfish = 75,
+		/obj/item/food/fish/salt_water/lanternfish = 60,
+		/obj/item/food/fish/salt_water/smolshark = 10,
 		/obj/item/food/fish/salt_water/tuna_pallid = 10,
 		/mob/living/simple_animal/crab = 10,
+		/obj/item/food/fish/salt_water/deep_fry = 5,
+		/obj/item/food/fish/salt_water/pigfish = 5,
 		/obj/item/food/fish/emulsijack = 5,
 	)
 

diff --git a/ModularTegustation/fishing/icons/fish_sprites.dmi b/ModularTegustation/fishing/icons/fish_sprites.dmi