From 583156705fc3c090fec554846e4f15917280a2f1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 8 Aug 2023 14:18:37 +0200 Subject: [PATCH] [MIRROR] [NO GBP] Fixing certain aquarium fish eating other fish when not hungry [MDB IGNORE] (#22939) * [NO GBP] Fixing certain aquarium fish eating other fish when not hungry (#77408) ## About The Pull Request Another couple, tiny mistakes my fishing PR. I believe I had forgotten to change the logic while swtiching to early returns. ## Why It's Good For The Game Bugfixing. ## Changelog :cl: fix: Fixed certain aquarium fish eating other fish when not hungry. /:cl: * [NO GBP] Fixing certain aquarium fish eating other fish when not hungry --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/fishing/fish/fish_traits.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm index efe7f8f9a32..6d53356f6bd 100644 --- a/code/modules/fishing/fish/fish_traits.dm +++ b/code/modules/fishing/fish/fish_traits.dm @@ -154,7 +154,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list( /datum/fish_trait/necrophage/proc/eat_dead_fishes(obj/item/fish/source, seconds_per_tick) SIGNAL_HANDLER - if(world.time - source.last_feeding >= source.feeding_frequency || !isaquarium(source.loc)) + if(world.time - source.last_feeding < source.feeding_frequency || !isaquarium(source.loc)) return for(var/obj/item/fish/victim in source.loc) if(victim.status != FISH_DEAD || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH)) @@ -218,7 +218,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list( /datum/fish_trait/predator/proc/eat_fishes(obj/item/fish/source, seconds_per_tick) SIGNAL_HANDLER - if(world.time - source.last_feeding >= source.feeding_frequency || !isaquarium(source.loc)) + if(world.time - source.last_feeding < source.feeding_frequency || !isaquarium(source.loc)) return var/obj/structure/aquarium/aquarium = source.loc for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source))