TGS Test Merge (#6083)

Citadel-Station-13 · Oct 19, 2023 · 87df640 · 87df640
2 parents ff26869 + 2a58b6b
commit 87df640
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/__DEFINES/fishing/fishing.dm b/code/__DEFINES/fishing/fishing.dm
@@ -54,6 +54,8 @@
 #define FISHING_MINIGAME_RULE_WEIGHTED_BAIT "weighted"
 #define FISHING_MINIGAME_RULE_LIMIT_LOSS "limit_loss"
 
+#define isfish(fish_type) (ispath(fish_type, /obj/item/fish) || ispath(fish_type, /mob/living/simple_mob/animal/passive/fish))
+
 /// The default additive value for fishing hook catch weight modifiers.
 #define FISHING_DEFAULT_HOOK_BONUS_ADDITIVE 0
 /// The default multiplicative value for fishing hook catch weight modifiers.

diff --git a/code/modules/fishing/equipment/hook.dm b/code/modules/fishing/equipment/hook.dm
@@ -59,7 +59,7 @@
 	// chasm_detritus_type = /obj/item/chasm_detritus/restricted/objects
 
 /obj/item/fishing_hook/magnet/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source)
-	if(fish_type == FISHING_DUD || ispath(fish_type, /obj/item/fish))
+	if(fish_type == FISHING_DUD || isfish(fish_type))
 		return ..()
 	// We multiply the odds by five for everything that's not a fish nor a dud
 	return MAGNET_HOOK_BONUS_MULTIPLIER
@@ -103,7 +103,7 @@
 
 /obj/item/fishing_hook/rescue/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source)
 	// Sorry, you won't catch fish with this.
-	if(ispath(fish_type, /obj/item/fish))
+	if(isfish(fish_type))
 		return RESCUE_HOOK_FISH_MULTIPLIER
 	return ..()