Restrict fishing rod storage to food items (#21784)

goonstation · Dec 24, 2024 · 82b6c05 · 82b6c05
1 parent 9a7ae60
commit 82b6c05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/code/modules/fishing/fishing_gear.dm b/code/modules/fishing/fishing_gear.dm
@@ -24,8 +24,7 @@
 	New()
 		..()
 		RegisterSignal(src, COMSIG_ITEM_ATTACKBY_PRE, PROC_REF(attackby_pre))  // Storage for a single lure item
-		var/list/fishing_rods = list(/obj/item/fishing_rod, /obj/item/fishing_rod/basic, /obj/item/fishing_rod/upgraded, /obj/item/fishing_rod/master)
-		src.create_storage(/datum/storage, max_wclass = W_CLASS_NORMAL, slots = 1, prevent_holding = fishing_rods)
+		src.create_storage(/datum/storage, can_hold = list(/obj/item/reagent_containers/food), max_wclass = W_CLASS_NORMAL, slots = 1)
 
 	disposing()
 		UnregisterSignal(src, COMSIG_ITEM_ATTACKBY_PRE)

diff --git a/code/modules/fishing/fishing_lootpools.dm b/code/modules/fishing/fishing_lootpools.dm
@@ -13,8 +13,8 @@
 	var/minimum_rod_tier = 0
 	/// what tier of rod is the highest to have access to the lootable?
 	var/maximum_rod_tier = INFINITY
-	/// what kind of item is needed as a lure
-	var/obj/item/required_lure = null
+	/// what kind of food item is needed as a lure
+	var/obj/item/reagent_containers/food/required_lure = null
 
 /// This proc checks for all the conditionals that could apply to a fishing spot. Modify that for special conditions.
 /datum/fishing_lootpool/proc/check_conditionals(var/mob/user, var/obj/item/fishing_rod/fishing_rod)