Minor fishing nits and tweaks (tgstation#87638)

code/__DEFINES/fish.dm

@@ -168,7 +168,7 @@
 #define FISH_RARITY_BASIC 1000
 #define FISH_RARITY_RARE 400
 #define FISH_RARITY_VERY_RARE 200
-#define FISH_RARITY_GOOD_LUCK_FINDING_THIS 5
+#define FISH_RARITY_GOOD_LUCK_FINDING_THIS 50
 #define FISH_RARITY_NOPE 0
 
 ///Aquarium fluid variables. The fish' required fluid has to match this, or it'll slowly die.

code/datums/components/aquarium_content.dm

@@ -179,13 +179,9 @@
 	remove_visual_from_aquarium()
 	current_aquarium = null
 
-///The visual overlay of the aquarium content. It holds a few vars that we can modity them during signals.
+///The visual overlay of the aquarium content. It can hold a couple vars that we can modify through signal procs.
 /obj/effect/aquarium
 	layer = 0 //set on set_vc_base_position
-	/// Base px offset of the visual object in current aquarium aka current base position
-	var/base_px = 0
-	/// Base px offset of the visual object in current aquarium aka current base position
-	var/base_py = 0
 	/// How the visual will be layered
 	var/layer_mode = AQUARIUM_LAYER_MODE_AUTO
 

code/modules/fishing/aquarium/aquarium_kit.dm

@@ -58,7 +58,12 @@
 	name = "ominous fish case"
 
 /obj/item/storage/fish_case/syndicate/get_fish_type()
-	return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable, /obj/item/fish/chainsawfish)
+	var/datum/fish_source/portal/syndicate = GLOB.preset_fish_sources[/datum/fish_source/portal/syndicate]
+	var/list/picks = syndicate.fish_table.Copy()
+	for(var/fish in picks)
+		if(!ispath(fish, /obj/item/fish))
+			picks -= fish
+	return pick(picks)
 
 /obj/item/storage/fish_case/tiziran
 	name = "imported fish case"
@@ -73,16 +78,19 @@
 
 /obj/item/storage/fish_case/blackmarket/get_fish_type()
 	var/static/list/weighted_list = list(
-		/obj/item/fish/boned = 1,
-		/obj/item/fish/clownfish/lube = 3,
-		/obj/item/fish/emulsijack = 1,
-		/obj/item/fish/jumpercable = 1,
-		/obj/item/fish/sludgefish/purple = 1,
-		/obj/item/fish/pufferfish = 3,
+		/obj/item/fish/clownfish/lube = 2,
+		/obj/item/fish/pufferfish = 2,
+		/obj/item/fish/emulsijack = 2,
+		/obj/item/fish/sludgefish/purple = 2,
 		/obj/item/fish/slimefish = 2,
 		/obj/item/fish/ratfish = 2,
-		/obj/item/fish/chasm_crab/ice = 2,
-		/obj/item/fish/chasm_crab = 2,
+		/obj/item/fish/zipzap = 2,
+		/obj/item/fish/jumpercable = 2,
+		/obj/item/fish/chasm_crab/ice = 1,
+		/obj/item/fish/chasm_crab = 1,
+		/obj/item/fish/boned = 1,
+		/obj/item/fish/pike = 1,
+		/obj/item/fish/swordfish = 1,
 	)
 	return pick_weight(weighted_list)
 

code/modules/fishing/fish/_fish.dm

@@ -996,10 +996,10 @@
 	var/px_min = aq_properties[AQUARIUM_PROPERTIES_PX_MIN] + avg_width - 16
 	var/px_max = aq_properties[AQUARIUM_PROPERTIES_PX_MAX] - avg_width - 16
 	var/py_min = aq_properties[AQUARIUM_PROPERTIES_PY_MIN] + avg_height - 16
-	var/py_max = aq_properties[AQUARIUM_PROPERTIES_PY_MAX] - avg_width - 16
+	var/py_max = aq_properties[AQUARIUM_PROPERTIES_PY_MAX] - avg_height - 16
 
-	visual.pixel_x = visual.base_px = rand(px_min,px_max)
-	visual.pixel_y = visual.base_py = rand(py_min,py_max)
+	visual.pixel_x = visual.base_pixel_x = rand(px_min,px_max)
+	visual.pixel_y = visual.base_pixel_y = rand(py_min,py_max)
 
 /obj/item/fish/proc/get_aquarium_animation()
 	var/obj/structure/aquarium/aquarium = loc
@@ -1030,8 +1030,8 @@
 	var/py_min = aq_properties[AQUARIUM_PROPERTIES_PY_MIN] + avg_height - 16
 	var/py_max = aq_properties[AQUARIUM_PROPERTIES_PY_MAX] - avg_width - 16
 
-	var/origin_x = visual.base_px
-	var/origin_y = visual.base_py
+	var/origin_x = visual.base_pixel_x
+	var/origin_y = visual.base_pixel_y
 	var/prev_x = origin_x
 	var/prev_y = origin_y
 	animate(visual, pixel_x = origin_x, time = 0, loop = -1) //Just to start the animation
@@ -1054,11 +1054,11 @@
 		animate(pixel_x = target_x, pixel_y = target_y, time = eyeballed_time, loop = -1)
 
 /obj/item/fish/proc/dead_animation(obj/structure/aquarium/current_aquarium, obj/effect/aquarium/visual)
-	//Set base_py to lowest possible value
+	//Set base_pixel_y to lowest possible value
 	var/avg_height = round(sprite_height / 2)
 	var/list/aq_properties = current_aquarium.get_surface_properties()
 	var/py_min = aq_properties[AQUARIUM_PROPERTIES_PY_MIN] + avg_height - 16
-	visual.base_py = py_min
+	visual.base_pixel_y = py_min
 	animate(visual, pixel_y = py_min, time = 1) //flop to bottom and end current animation.
 
 /// Checks if our current environment lets us live.

code/modules/fishing/fish/types/station.dm

@@ -140,7 +140,7 @@
 	///How long does it take for us to grow up?
 	var/growth_time = 3.5 MINUTES
 
-/obj/item/fish/fryish/Initialize(mapload)
+/obj/item/fish/fryish/Initialize(mapload, apply_qualities = TRUE)
 	. = ..()
 	if(is_bait)
 		add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GREAT_QUALITY_BAIT), INNATE_TRAIT)

code/modules/fishing/fish/types/tiziran.dm

@@ -79,8 +79,8 @@
 	. = ..()
 	add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT)
 
-/obj/item/fish/chasm_crab/get_fish_taste()
+/obj/item/fish/armorfish/get_fish_taste()
 	return list("raw prawn" = 2)
 
-/obj/item/fish/chasm_crab/get_fish_taste_cooked()
+/obj/item/fish/armorfish/get_fish_taste_cooked()
 	return list("cooked prawn" = 2)

code/modules/fishing/sources/source_types.dm

@@ -13,12 +13,10 @@
 		/obj/item/fish/stingray = 8,
 		/obj/item/fish/plaice = 8,
 		/obj/item/fish/monkfish = 5,
-		/obj/item/fish/stingray = 10,
 		/obj/item/fish/lanternfish = 7,
 		/obj/item/fish/zipzap = 7,
 		/obj/item/fish/clownfish/lube = 5,
 		/obj/item/fish/swordfish = 5,
-		/obj/item/fish/swordfish = 3,
 		/obj/structure/mystery_box/fishing = 2,
 	)
 	fish_counts = list(