mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
[NO GBP] fixing a few issues with fishing and aquariums (#93964)
## About The Pull Request Played around with fishing and aquariums the other day. While it has come a long way, aquariums are still a pain in the ass in many ways and there are still things that don't work as intended as well as some pet peeves. This PR: - removes code that didn't work to begin with (rotating the fish when mounted on for fish trophy wallmounts) - fixes the predator and necrophage traits triggering when the fish is NOT hungry and on fishes that are bigger than the not-so-hungry fish, rather than smaller. - Add an examine line to fish tanks when full. - Fixes evolution probability for self-reproducing fishes (purple sludgefish should be 1 in 20, not 1 in 40) - Fixes fish analyzers not being usable on equipped/held items. - Nit with examine lines for fishing rods. - Experiments handler devices won't announce when an experiment that they cannot perform is completed. The big exception is the generic experi-scanner. This means fish analyzers and operating computers will no longer bug you about material scan experiments being completed. - the ping sound from using lures should be a smidge louder and can be heard from more than 1 tile away. ## Why It's Good For The Game Issues with fishing and aquariums mainly, also a smidge of a code improvement for experiment handlers. ## Changelog 🆑 fix: Fixed some fishes trying to eat other (bigger) fish while not hungry. Also a nit with purple sludgefish being a bit too rare. fix: Fixes fish analyzers not working with held or equipped fish or aquariums (not in your backpack). balance: Fish analyzers and operating computers no longer announce completed experiments that they aren't compatible with. balance: the ping sound from using fishing lures should be a smidge louder and can be heard from more than 1 tile away. qol: Examining fish tanks (the item) when they're almost full will warn you about it. /🆑
This commit is contained in:
@@ -395,8 +395,8 @@
|
||||
///Check if an offspring of two fish (or one if self-reproducing) can evolve.
|
||||
/datum/component/aquarium/proc/check_evolution(atom/movable/source, obj/item/fish/fish, obj/item/fish/mate, datum/fish_evolution/evolution)
|
||||
SIGNAL_HANDLER
|
||||
//chances are halved if only one parent has this evolution.
|
||||
var/real_probability = (mate && (evolution.type in mate.evolution_types)) ? evolution.probability : evolution.probability * 0.5
|
||||
//chances are halved if it isn't asexual reproduction and one parent doesn't have the evolution.
|
||||
var/real_probability = (isnull(mate) || (evolution.type in mate.evolution_types)) ? evolution.probability : evolution.probability * 0.5
|
||||
if(HAS_TRAIT(fish, TRAIT_FISH_MUTAGENIC) || (mate && HAS_TRAIT(mate, TRAIT_FISH_MUTAGENIC)))
|
||||
real_probability *= 3
|
||||
if(!prob(real_probability))
|
||||
|
||||
Reference in New Issue
Block a user