diff --git a/code/game/objects/items/maintenance_loot.dm b/code/game/objects/items/maintenance_loot.dm index f6d7fd1c329..e667aca6007 100644 --- a/code/game/objects/items/maintenance_loot.dm +++ b/code/game/objects/items/maintenance_loot.dm @@ -43,3 +43,4 @@ . = ..() var/initial_percent = rand(20, 80) / 100 charge = initial_percent * maxcharge + ADD_TRAIT(src, TRAIT_FISHING_BAIT, INNATE_TRAIT) diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm index 9423c8d8a4d..27d43ea7dd2 100644 --- a/code/modules/fishing/fish/fish_types.dm +++ b/code/modules/fishing/fish/fish_types.dm @@ -316,6 +316,7 @@ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS required_temperature_min = MIN_AQUARIUM_TEMP+10 required_temperature_max = MIN_AQUARIUM_TEMP+30 + favorite_bait = list(/obj/item/stock_parts/cell/lead) fish_traits = list( /datum/fish_trait/parthenogenesis, /datum/fish_trait/mixotroph, @@ -333,7 +334,6 @@ fish_traits = list(/datum/fish_trait/necrophage) required_temperature_min = MIN_AQUARIUM_TEMP+15 required_temperature_max = MIN_AQUARIUM_TEMP+35 - fish_ai_type = FISH_AI_ZIPPY favorite_bait = list( list( @@ -651,7 +651,7 @@ average_size = 30 average_weight = 500 random_case_rarity = FISH_RARITY_VERY_RARE - favorite_bait = list(/obj/item/food/bait/doughball) + favorite_bait = list(/obj/item/stock_parts/cell/lead) required_temperature_min = MIN_AQUARIUM_TEMP+18 required_temperature_max = MIN_AQUARIUM_TEMP+26 fish_traits = list( diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 9cc564df6f4..b748a5215b6 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -277,6 +277,8 @@ if(istype(bait, /obj/item/food/bait)) var/obj/item/food/bait/real_bait = bait bait_state = real_bait.rod_overlay_icon_state + if(istype(bait, /obj/item/stock_parts/cell/lead)) + bait_state = "battery_overlay" . += bait_state /obj/item/fishing_rod/worn_overlays(mutable_appearance/standing, isinhands, icon_file) diff --git a/icons/obj/fishing.dmi b/icons/obj/fishing.dmi index 92d7da8238a..92d1cf9a122 100644 Binary files a/icons/obj/fishing.dmi and b/icons/obj/fishing.dmi differ