From 867d7950f138fc87ede669d423a1f632e5970c9b Mon Sep 17 00:00:00 2001
From: AmoryBlaine <mcripfist80@gmail.com>
Date: Sun, 1 Sep 2024 19:34:08 -0400
Subject: [PATCH] Fishin'

---
 code/game/objects/prop.dm                  |  9 +++++++++
 code/modules/fishing/bait/generic.dm       |  2 ++
 code/modules/fishing/datums/generic.dm     | 17 +++++++++--------
 code/modules/fishing/props/fishing_pole.dm |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm
index ac94e8ab03..7fba26d1b2 100644
--- a/code/game/objects/prop.dm
+++ b/code/game/objects/prop.dm
@@ -291,3 +291,12 @@
 /obj/item/prop/magazine/boots/n055
 	name = "Boots!: Issue No.55"
 	desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'"
+
+/obj/item/prop/scrap
+	name = "scrap metal"
+	icon = 'icons/obj/items/fishing_atoms.dmi'
+	icon_state = "sheet-scrap"
+	item_state = ""
+	desc = "A rusty piece of scrap metal."
+	w_class = SIZE_MASSIVE
+	garbage = TRUE
diff --git a/code/modules/fishing/bait/generic.dm b/code/modules/fishing/bait/generic.dm
index 8a8c8698d7..21716406a2 100644
--- a/code/modules/fishing/bait/generic.dm
+++ b/code/modules/fishing/bait/generic.dm
@@ -1,5 +1,7 @@
 /obj/item/fish_bait
 	name = "fish bait"
+	icon = 'icons/obj/items/fishing_atoms.dmi'
+	icon_state = "other_meat"
 	desc = "A tasty piece of... meat? Whatever it is, fish love this."
 
 	var/common_mod = -10
diff --git a/code/modules/fishing/datums/generic.dm b/code/modules/fishing/datums/generic.dm
index 3d2766efba..94a1684513 100644
--- a/code/modules/fishing/datums/generic.dm
+++ b/code/modules/fishing/datums/generic.dm
@@ -2,20 +2,21 @@ GLOBAL_LIST_EMPTY(fishing_loot_tables)
 
 /datum/fish_loot_table
 	var/list/common_fishable_atoms = list(
-		/obj/item/clothing/shoes/leather,
-		/obj/item/clothing/shoes/marine,
+		/obj/item/prop/scrap,
+		/obj/item/trash/crushed_cup,
+		/obj/item/trash/c_tube,
+		/obj/item/trash/cigbutt/bcigbutt,
+		/obj/item/trash/cigbutt/cigarbutt
 	)
 	var/list/uncommon_fishable_atoms = list(
-		/obj/item/cell/high,
-		/obj/item/device/multitool
+		/obj/item/reagent_container/food/snacks/fishable/squid/whorl,
+		/obj/item/reagent_container/food/snacks/fishable/crab
 	)
 	var/list/rare_fishable_atoms = list(
-		/obj/item/reagent_container/food/snacks/packaged_burrito
+		/obj/item/coin/silver
 	)
 	var/list/ultra_rare_fishable_atoms = list(
-		/obj/item/card/data/clown,
-		/obj/item/reagent_container/food/snacks/clownburger,
-		/obj/item/reagent_container/pill/ultrazine/unmarked
+		/obj/item/reagent_container/food/snacks/fishable/quadtopus
 	)
 
 /datum/fish_loot_table/proc/return_caught_fish(common_weight, uncommon_weight, rare_weight, ultra_rare_weight)
diff --git a/code/modules/fishing/props/fishing_pole.dm b/code/modules/fishing/props/fishing_pole.dm
index 3d87a171e3..3782012514 100644
--- a/code/modules/fishing/props/fishing_pole.dm
+++ b/code/modules/fishing/props/fishing_pole.dm
@@ -9,7 +9,7 @@
 
 /obj/structure/prop/fishing/pole_interactive
 	var/time_to_fish = 30 SECONDS
-	var/fishing_success = 'sound/items/bikehorn.ogg'//to-do get a sound effect(s)
+	var/fishing_success = 'sound/items/fulton.ogg'//to-do get a sound effect(s)
 	var/fishing_start = 'sound/items/fulton.ogg'
 	var/fishing_failure = 'sound/items/jetpack_beep.ogg'
 	var/fishing_event = 'sound/items/component_pickup.ogg'