cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [NO GBP] Fixing certain aquarium fish eating other fish when not hungry [MDB IGNORE] (#22939)

Browse Source 
* [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

🆑
fix: Fixed certain aquarium fish eating other fish when not hungry.
/🆑

* [NO GBP] Fixing certain aquarium fish eating other fish when not hungry

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-08-08 08:18:37 -04:00
committed by GitHub
co-authored by Ghom
parent 23907fe9ee
commit 583156705f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/fishing/fish/fish_traits.dm
+2 -2
View File
@@ -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))