[MIRROR] [READY] Fishing and aquarium expansion. [MDB IGNORE] (#22731)

* [READY] Fishing and aquarium expansion.

* Update general.dm

* Update production_skill.dm

* Merge conflict

* Merge branch 'upstream-merge-76531' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-merge-76531

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>

code/modules/cargo/goodies.dm

@@ -243,6 +243,12 @@
 	cost = PAYCHECK_CREW
 	contains = list(/obj/item/bait_can/worm/premium)
 
+/datum/supply_pack/goody/telescopic_fishing_rod
+	name = "Telescopic Fishing Rod"
+	desc = "A collapsible fishing rod that can fit within a backpack."
+	cost = PAYCHECK_CREW * 8
+	contains = list(/obj/item/fishing_rod/telescopic)
+
 /datum/supply_pack/goody/coffee_mug
 	name = "Coffee Mug"
 	desc = "A bog standard coffee mug, for drinking coffee."

code/modules/cargo/markets/market_items/misc.dm

@@ -95,6 +95,13 @@
 	stock_max = 3
 	availability_prob = 50
 
+/datum/market_item/misc/jawed_hook
+	name = "Jawed Fishing Hook"
+	desc = "The thing ya use if y'are strugglin' with fishes. Just rememeber to whoop yer rod before it's too late, 'cause this thing's gonna hurt them like an Arkansas toothpick."
+	price_min = CARGO_CRATE_VALUE * 0.75
+	price_max = CARGO_CRATE_VALUE * 2
+	stock_max = 3
+	availability_prob = 70
 
 /datum/market_item/misc/v8_engine
 	name = "Genuine V8 Engine (Perserved)"
@@ -104,3 +111,13 @@
 	price_max = CARGO_CRATE_VALUE * 6
 	stock_max = 1
 	availability_prob = 15
+
+/datum/market_item/misc/fish
+	name = "Fish"
+	desc = "Fish! Fresh fish! Fish you can cut, grind and even keep in aquarium if you want to! Get some before the next fight at my village breaks out!"
+	price_min = PAYCHECK_CREW * 0.5
+	price_max = PAYCHECK_CREW * 1.2
+	item = /obj/item/storage/fish_case/blackmarket
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 90

code/modules/cargo/packs/general.dm

@@ -67,6 +67,14 @@
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/item/storage/fish_case/tiziran = 2)
 	crate_name = "tiziran fish crate"
+
+/datum/supply_pack/misc/fish_analyzers
+	name = "Fish Analyzers"
+	desc = "A pack containing three analyzers to monitor fish's status and traits with."
+	cost = CARGO_CRATE_VALUE * 2.5
+	contains = list(/obj/item/fish_analyzer = 3)
+	crate_name = "fish analyzers crate"
+
 /* SKYRAT REMOVAL
 /datum/supply_pack/misc/bicycle
 	name = "Bicycle"
@@ -76,6 +84,7 @@
 	crate_name = "bicycle crate"
 	crate_type = /obj/structure/closet/crate/large
 SKYRAT REMOVAL END */
+
 /datum/supply_pack/misc/bigband
 	name = "Big Band Instrument Collection"
 	desc = "Get your sad station movin' and groovin' with this fine collection! \