mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-16 18:45:22 +01:00
mayfools
51 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 Roxy
|
e28e9fbdba | Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025 | ||
|
Ghom
|
b48b717730 |
Fish analyzer UI is a bit more reactive, also fixing a couple things with fish reproduction (#93461)
## About The Pull Request The fish analyzer now uses ui_data to fetch hunger, health, size, weight and breeding cooldown rather than ui_static_data, meaning these values are updated in real time on the UI. It also calls update_static_data_for_all_viewers() whenever the user scans a new fish or aquarium or if fishes are added/removed to/from the aquarium, and closes the UI if the scanned object is out of normal view or further than 7 tiles away. I've also reduced the breeding cooldown for newly spawned fish from two times the standard cooldown (usually 2 minutes, hence 4 minutes) to 60% of it. Offsprings still retain the usual 200% cooldown however. This should make it a bit easier for people who want to use the aquarium with fish acquired through means other than fish farming itself. Lastly, this PR introduces a small unit test to make sure that the stable population of most fish is higher than 1. This was the problem with #93043, where you couldn't breed a slimefish with a lavaloop because the stable population of the latter wasn't set. I'm sure that's a problem with other fishes as well, and that explains some of the confusion with the feature (that and its opacity as a whole I guess). ## Why It's Good For The Game This will close #93043, improve the fish analyzer UI updates, make fish farming etc. less problematic. ## Changelog 🆑 qol: The fish analyzer UI should update more reliably. fix: Fixed some of the fishes being unable to reproduce. balance: Fish acquired through means other than fish farming itself takes less time to be able to reproduce. /🆑 |
||
|
Ghom
|
b296d71625 |
Aquariums have now three different modes (Manual/Assisted/Stasis) (#90605)
## About The Pull Request This PR replaces the toggleable safe mode with Manual, Assisted and Stasis. Manual and Stasis mode works much like the old safe mode being off and on respectively. The real addition here is the new default assisted mode, which automatically sets fluid and temperature based on what combination of these two settings would keep the most fish alive. It can also temporarily enable stasis if over half of the fish population is at risk of dying. The main difference with stasis is that it doesn't necessarily prevent fish death if it's a minority of the general population, rather just make aquarium easier for players to manage. Also added a line about fluid and temp when examining aquariums. Still have to test it, definitely a WIP. ## Why It's Good For The Game I want to make aquariums a bit easier and more accessible, since the benefits are fairly meager for the efforts needed to maintain one, excluding the power generator. I'll probably look into fish traits and fish reproduction next, who knows... ## Changelog 🆑 add: Aquariums can now be switched between three different modes (Manual/Assisted/Stasis) to replace the old Safe Mode toggle. /🆑 |
||
|
Ghom
|
ec20e7fac2 |
Aquariums have now three different modes (Manual/Assisted/Stasis) (#90605)
## About The Pull Request This PR replaces the toggleable safe mode with Manual, Assisted and Stasis. Manual and Stasis mode works much like the old safe mode being off and on respectively. The real addition here is the new default assisted mode, which automatically sets fluid and temperature based on what combination of these two settings would keep the most fish alive. It can also temporarily enable stasis if over half of the fish population is at risk of dying. The main difference with stasis is that it doesn't necessarily prevent fish death if it's a minority of the general population, rather just make aquarium easier for players to manage. Also added a line about fluid and temp when examining aquariums. Still have to test it, definitely a WIP. ## Why It's Good For The Game I want to make aquariums a bit easier and more accessible, since the benefits are fairly meager for the efforts needed to maintain one, excluding the power generator. I'll probably look into fish traits and fish reproduction next, who knows... ## Changelog 🆑 add: Aquariums can now be switched between three different modes (Manual/Assisted/Stasis) to replace the old Safe Mode toggle. /🆑 |
||
|
Majkl-J
|
b6b8306fda | Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-25-02a | ||
|
carlarctg
|
876088b9a9 |
Expands (further) on Rift Fishing by adding two new fish & more (#88860)
## About The Pull Request I swear it's the last one  ### Added two new fishes to the rift pool:  #### The __mossglob__ is the Fisherman's Bane. The apex of evil. The be-all-end-all in fisher destruction. It is haunted. It deals toxic damage. It throws itself around. It's coated in a deadly and hallucinogenic compound. Its mossy coating is slippery. It revives itself. It throws itself out of aquariums. Best of all, it is extremely easy to catch. How do you deal with it? Well, probably by not fishing in a portal to hell. Otherwise... good luck? Suiciding into it empowers it by 15% and seals you inside. JOIN THE MOSS!  #### The __babbelfish__ is a strange sort of predator, a psychic fish. It casts a psychic aura near itself, ~~disturbing people~~ (nvm lol the demoralizer datum is bad), killing fish nearby and then eating their corpses. When it dies, it emits an awesome psychic wail, which will instantly kill all fish in audible range and severely incapacitate psy-sensitive humans: I can't play the ogg here but credits to grungus for it   There is also a secret, secondary function of the babbelfish: Splitting one in half (a terrible idea) and shoving it inside your ears will unlock your full psychic potential, granting you psychic resistance and grant you the ability to either understand or speak every single language, at a terrible cost. #### ARMS Failing the fishing minigame while fishing in a heretical rift will now cause the rift to tear your arm (and its fishing rod) off your joints and greedily slurp it up. The Mansus does not care for losers. (Getting bored and walking away while the minigame is up also counts as failure.) However, these missing items can, in fact, be fished back up, which also includes arms -and- heads lost normally to the rift! Not only that, but you're able to fish up random arms of any type, presumably from other fools across time and space. #### This PR probably shouldn't be merged until the bug that causes finite fish counts to not be finite is fixed. Infinite fire sharks are bad enough... Added ABSTRACT flag to profound_fisher fake rod. objectify() now works with instances of objects. Apparently snuck in a random-ass refactor to smoker lungs. Psychic resistance now prevents the instadeath from trying to telekinetically grasp at a opened rift. Hallucinogenic fish with a stinger now inject their hallucinogenic toxins. I woudl like to preemptively apologize to ghommie ## Why It's Good For The Game __Mossglob__ I think the game's missing a fish that's just extremely dangerous to be around, the piscine equivalent to radioactive waste. You can't bin or tank it, because it flies off. You can't kill it, because it's atmos-proof and revives itself anyway. Trying to keep it on a table to turn into disgusting mold 'slices' is a challenge in and of itself. This fish will (not) make people think twice about fishing in hell, and give another reason for security and command to give PSAs to not interact with the rifts across space and time around the station, which I think is wonderful. __Babbelfish__ This fish punishes sloppy fishermen who hold up their catch and then store it inside their bag for the poor fish to slowly asphixiate to death in. The fish griefing that will happen from it will be _wonderful_. The organ thing is a clear reference to HHG, but it has its own twist. You can speak all languages, or understand all languages... but rarely both. It'll make for some silly situations where people just 'make strange noises' at you or try to act as translator for, say, ashwalkers or xenomorphs while being completely clueless as to what anyone is actually saying. __ARMS__ Arms. Arms arms. Someone asked me if rifts let you fish up arms and i said ___IT DOES NOW___. ## Changelog 🆑 Ghommie, carlarc, grungus add: Added two new fish to heretic rift fishing. add: You can now fish up arms, heads, and other items lost to heretic rifts! admin: objectify() now works with instances of objects. Mark a player, then an object, and use those marks to call that global proc and you can turn people into pre-existing items. add: Psychic resistance now prevents the instadeath from trying to telekinetically grasp at a opened rift. /🆑 --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
||
|
Ghom
|
9d6f164501 |
You can now try to fish random products out of vending machines with a fishing rod and a few bucks. (#88290)
## About The Pull Request You can now use a fishing rod to fish random vending products from vending machines, using holochips, coins and spacecash as bait. The value of the money used as bait will positively influence the chance of getting the pricier vending items, while using less than the minimum paycheck (25 credits) will increase the minigame difficulty and carries an additional, small risk of getting a dud or even hurling the vending machine in your direction. This also warranted a slight refactor of how vending product prices are set. ## Why It's Good For The Game Expands the list of things you can do with a fishing rod. Like for the organ manipulation fishing PR. This is not about getting fish, but the unconventional things we can do along the way. Now tested, it works. ## Changelog 🆑 add: You can now try to fish random products out of vending machines with a fishing rod and a few bucks. fix: Fixing the 1000 cr holochip loot from exploration drones. /🆑 |
||
|
carlarctg
|
4d84d0de9b |
Rift Fishing (#88619)
## About The Pull Request Adds rift fishing to the game.  Drained and undrained influences can be fished in, the latter only by heretics. Fishing in an undrained influence shows a bobber floating over nothing to other people, so don't be stupid! The loot pool includes the following: - Knowledge. Great for heretics, bad for crew. Only actually gives knowledge if fished up in an unopened rift, opening it. One of each heretic potion type. - A wild Fire Shark, hostile to all. - One of each heretic potion, and two flasks of eldritch essence. - Several new fish:  In order: 1. Chrystarfish Cosmostarfishe that snuck into the bluespace compartment of a shuttle engine. Teleports around when eaten. Can be cut into bluespace crystals. Very pointy. 2. Flumpulus Probably not an actual fish. Contains flumpuline, which is in many ways an upgrade to oculine. Except for it occasionally popping your eyes out and replacing them with fungus. It also gets flattened if you land on it, cushioning your fall.  3. Gullion This fish can be cut into two diamonds, and needs no mate to reproduce, making it an excellent way to replenish the station's diamond supply! However, it needs silicon in the fish tank to survive. 4. Walro-Dolphish Weird, amphibious creature. Amazing weapon - high damage, strong piercing wounds, decent block chances. However, it will bite you if you hold it for too long, so be careful! More fish are planned to be added. The PR was split in two to reduce review complexity as the latter half of the fish were increasingly convoluted. Any fishing rod will do for fishing, but heretics are now able to infuse their fishing rod with a grasp:  Infusing the rod will temporarily improve its fishing modifier and give it a unique trait that lets heretics gather 2 influence, rather than 1, from a fished-up rift. If crew fish up a glimpse of the Mansus, they will recieve the same effects as if they examined the rift, and a curse hand will shoot out at them. influences cannot be bombed for fish. ## Why It's Good For The Game Rifts are _extremely_ close to basically just being eldritch pools of liquid that some heretic spilled over the station. It's always stuck out like a sore thumb that we can't fish in them, but now we _can_. (Also, someone needs to PR fishing in a bucket for clowns and mimes.) Fishing in a rift is just one of those things you see some random, innocent assistant do while doing an errand, passively enhancing the round with the sheer ridiculousness of it. Coming back, it's likely you'll see them running from a wild Fire Shark they unwisely dug up from messing with eldritch influences. For Heretics, this is for the most part actively a worse alternative than just doing things normally. But sometimes you don't want to be optimal. Infusing their fishing rod is almost entirely an amusing twist on the blade infusion that blade path has, and they can even infuse other people's rods - make fish not war. Ghommie gave me the fish sprites, and I interpreted them the silliest and most interesting ways I could think of. > Chrystarfish Bluespace's technobabble has finally reached fish. Much like the Gullion, the intention here was primarily some additional, risky way to procure some amount of bluespace crystals and dust that doesn't depend on Mining to do their job, either for the station or for your own stupid plans. (Obviously mining is still the best way to get it, but it's not healthy for the game for them to be the ONLY way to do so!) >Flumpulus  Imagine taking a pill of 'Super oculine!' and suddenly your eyes pop out and are replaced with fungeyes. 10/10 >Gullion Diamonds are extremely scarce on the station and the only way to get more is by mining. I thought adding some rare, restricted way of getting more would be fun for the game, and encourage fish breeding. Parthenogenesis may be a bit much admittedly, but let's just see what happens > Walro-Dolphish The name for this thing kinda sucks. I like the idea of an amphibious fish-weapon like the pikes that actually kinda just hates being wielded around like a stick. It's also piercing to differentiate.  ## Changelog 🆑 Carlarc, Ghommie add: Adds rift fishing to the game. Includes new wacky fish! add: Drained and undrained influences can be fished in, the latter only by heretics. Fishing in an undrained influence shows a bobber floating over nothing to other people, so don't be stupid! add: influences cannot be bombed for fish. add: Heretics can now infuse their fishing rod, and fish for knowledge. /🆑 --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
||
|
Ghom
|
6c11961d4f | Improving the fish unit tests a little (#88397) | ||
|
Ghom
|
6b543476da |
Aquarium kits can now be printed + other tweaks. (#88068)
## About The Pull Request Aquarium kits can now be printed from service, cargo, science protolathes and the autolathe too, from half a sheet of metal. You still need the other materials to set it up but it should be fairy simple if you can access a proto/autolathe. The 'Growth/Reproduction' setting for aquariums has been renamed to "Safe Mode", which, on top of disabling features such as growth, reproduction, evolution, power generation etc etc, will also disable the water, temperature and food requirements for keeping the fish alive. Useful if you want a purely ornamental aquarium or you have to skidaddle somewhere else for a while. The lawyer, as well as prefilled aquariums start with 'Safe Mode' enabled. The 'Aggressive' fish trait has been replaced with 'Territorial', which is exactly the same but the fish won't lash out unless the aquarium is populated by five fishes or more. No more angelfish viciously attacking the guppy and goldfish in prefilled aquariums. Tweaked a couple values around hunger and fish health loss when starving or in a bad environment to cause slightly less damage. Lastly, added screentips to the aquarium component, which is something I've forgot to do in the PR that brought it. ## Why It's Good For The Game Aquariums may be a complex feature, but as far as I can tell, I had been neglecting the possibility of aquariums as simple room decoration for a while (outside of the beauty-related mechanics), and the constant maintenance (and perhaps a bit of knowhow) they require makes them awful at that. Also, the "growth/reproduction" setting really didn't have a reason to be before, since it didn't offer any tangible benifit to turn it off, so I had to revamped it. Also it's been proven by now that keeping aquariums as cargo-orderable stuff is just bad. As for the fish trait change, it just sucks to see the angelfish shank the goldfish with no way to solve it other than removing the hyper-aggressive killer fish from san diego fella. ## Changelog 🆑 balance: Aquarium kits can now be printed from cargo, service, science protolathes as well as the autolathe. They no longer have to be ordered from cargo. balance: Revamped the "Growth/Reproduction" setting for aquarium to "Safe Mode", which also disables the food, temperature and water requiremenets of aquariums, making it useful for purely decorative aquariums. balance: Replaced the "Aggressive" fish trait with "Territorial". No more angelfish shanking the goldfish and guppy in prefilled aquariums with less than 5 fishes. qol: Added screentips to aquariums. /🆑 |
||
|
Ghom
|
1dff5f6de3 |
Aquariums are now potential fishing spots. (#88243)
## About The Pull Request You can now fish from aquariums if you wish to. This includes some backend changes to make it possible for the fish table from get_fish_table() to contain instances, and all that it entails up to spawn_reward(), which is a requirement for the gimmick to respect the various traits and other variables of the already instantiated fish rather than read from cached properties. ## Why It's Good For The Game The fish progress score/index had only little nasty flaw that has been nagging me since day one: Not all fish species can be caught. Skipping McGill, which is a peculiar case that for cheevo purposes should be considered a standard goldfish, there is the one, unsignificant yet rare purple sludgefish which can only be gotten as a rare evolution of the generic sludgefish. Talk about petty, but this may be a long-term nit I prefer to handle right now. Also why not? The 'unmarine mastodon' is near impossible to get unless you somehow find a oil well which is locked behind a specific ruin. ## Changelog 🆑 fix: Aquariums are now potential fishing spots. /🆑 |
||
|
Ghom
|
6272b3680c |
You can use a fishing rod to snatch organs during organ manipulation surgery (feat organs sanity fix) (#87774)
## About The Pull Request This allows you to use a fishing rod during the "manipulate organs" step of the aforementioned surgery to snatch organs from a target. Unlike other fish sources, this one has a negative fishing difficulty of -20, which when summed with the default minigame difficulty should still result in a negative difficulty. In layman terms, this means the minigame is skipped here (unless you're wearing some clunky stuff like insulated or boxing gloves). It also has a wait time of 8 to 13 seconds versus the more random standard 3 to 25 seconds. A small side-effect of this is that explosions during the "manipulate organs" step will basically disembowel you, but it kinda fits anyway. By the by, because of this, there is a tiny chance bluespace fishing rods can yield you random organs. Worry not, they're newly generated, so you won't be snatching it from another player by accident (at least for now). ## Why It's Good For The Game It adds more possible weird and rare shenanigans involving surgery. ## Changelog 🆑 Add: You can use a fishing rod to snatch organs during organ manipulation surgery /🆑 |
||
|
Ghom
|
7663b39cc8 |
Refactoring aquariums into components (feat: portable fish tanks) (#87866)
## About The Pull Request I've been meaning to do this for some time. I need this for portable/handheld aquariums/fishtanks to be possible. I'll sprite and code them before I call this PR ready, however suggestions and code reviews are welcome in the meantime. Being a pretty heavy refactor, some things might break (we have more than a few unit tests so perhaps not) while others, coincidentally, might be fixed without me knowing. Anyway I'm sure this PR fixes aquarium beauty, which wasn't really working to begin with because the code was so fucking bad. Nothing really worth of a CL entry tho. TODO: - [x] handheld aquariums, craftable with a kit and little plastic or buyable from the fun vendor ig. - [x] an aquarium upgrade for handheld aquariums to bypass possible restrictions. - [x] update the beauty element to consider items, which shouldn't contribute to the area beauty when held or otherwise not on a turf. ## Why It's Good For The Game This should make handheld aquariums possible. ## Changelog 🆑 refactor: refactored aquariums heavily. Please report any fishy bug. add: Added portable/handheld fish tanks to the game. They can be crafted with an aquarium kit and 5 sheets of plastic. While portable, they cannot store fish that are too big or if there're too many already. This restriction can be removed by using the new "bluespace fish tank kit" techweb item. map: Replaced the lawyer's stationary pet aquarium with a fish tank, so you can carry McGill around. balance: Reduced the iron cost of stationary aquariums a little. /🆑 |
||
|
Ghom
|
b34043d520 |
[NO GBP] You can perform fish scanning experiments again (plus other stuff) (#87721)
## About The Pull Request I've accidentally assigned the FISH_FLAG_UPDATING_SIZE_AND_WEIGHT flag the same value of FISH_FLAG_EXPERIMENT_SCANNABLE, that's why I couldn't perform it while playing the game. Also, this PR fixes the broken interaction of catch'n'release, as well as a typo in the name of material fishing rods. ## Why It's Good For The Game I broke a couple things. |
||
|
Ghom
|
e6253c7812 |
Adds a score for all species of fish that you've caught. (#86049)
## About The Pull Request I'm adding a score that tracks which types of fish you've caught across multiple rounds. To do so, I had to add a new score subtype that manages the score value not being a number. Thankfully the achievement code is fairly flexible so not a whole lot had to be done, although I've to add a new column to the achievements table in the DB, because the 'value' is for integers, while we need one for text strings ~~(the contents of the list are converted to text with a delimiter before being saved cuz I'm not sure if and how our DM slash SQL integration handles using lists directly and I don't want to waste time finding it out)~~. EDIT: It's mostly done beside the reviews that are going to point out things that need to be changed. The UI changes are done. It's time for reviews. Here are screenshots of the UI with all fish still uncatched beside one (I've since then the typo on its name and removed an extra zero from the index number, as well as a nit with the spacing between cells):   ## Why It's Good For The Game We have about dozens over dozens of different fish in the game now, many of which are just fluff anyway. It's getting to the point it's perhaps doable to add a score or something to be a braggard about. ## Changelog 🆑 add: Added a new score that keeps track of all different fish that you've caught between shifts. server: Added a new schema table to store the aforementioned entries and the ckeys associated to them, with an additional timestamp column. /🆑 |
||
|
Ghom
|
c6e7150af2 | Minor fishing nits and tweaks (#87638) | ||
|
Ghom
|
2d7b8a5ff6 |
material fishing rods and material fish. (#87108)
## About The Pull Request The reason why I refactored material effects code is here. In this PR I add the possibility of printing fishing rods from different materials at your nearest autolathe, though it doesn't stop there. Each material has different values for (so far) fishing difficulty, casting range, experience gained and foremost the chance of catching fish made of the same material as the fishing rod used to catch it. The material the fish is made from can either increase or decrease the weight of the fish. In a many cases, material rods can also have other small effects on fishing, like removing the chances of duds even without a bait, or attracting shiny-loving fish, or passing some other fish trait checks. In a few cases, these fishing rods can have bigger, more impactful effects on fishing. That said, here's a list of more or less the effects (skipping very minor ones and those inherited from being items) and modifiers across materials so far, a few things will be added later: <details> <summary>Huge-ass list (out-fucking-dated now that I've added 5 more variables 😢)</summary> - Iron: +30% fish weight, 8% chance of material fish - Glass: +20% fish weight, +5 difficulty, +20% experience, 8% chance of material fish - Silver: +35% fish weight, -5 difficulty, - 15% experience, 15.5% chance of material fish - Gold: +50% fish weight, -10 difficulty, -25% experience, 20.5% material fish, +1 casting range - Diamond: +40% fish weight, -13 difficulty, -30% experience, 23% material fish, -1 casting range - Uranium: +100% fish weight, 8% material fish - Plasma: +30% fish weight, 8% material fish - Bluespace: +30% fish weight, -5 difficulty, -15% experience, 23% material fish, +5 range - - 33% chance of selecting a reward from (almost) any fishing source instead of the current one. - Bananium +20 difficulty, +60% experience, 38% material fish, +3 casting range - - 20% chance of fishing either a clownfish, lubefish, donkfish, soulfish or skin crab instead - Titanium: +20% fish weight, -5 difficulty, 8% material fish, +1 range - Runite: +50% fish weight, -18 difficulty, +220% experience, 38% material fish, +1 range - Plastic: -20% fish weight -5 difficulty, +20% experience, 8% material fish, +2 range - Wood: -50% fish weight, +8 difficulty, +30% experience, 13% material fish, -1 range - Adamantine: +60% fish weight, -23 difficulty, -40% experience, 33% material fish, +1 range - Mythril: +40% fish weight, -25 difficulty, -50% experience, 43% material fish, +2 range - Hot Ice: -10% fish weight, -10 diffiulty, -10% experience, 18% material fish, +1 range - Metal Hydrogen: -40% weight, -15 difficulty, -20% experience, 23% material, +4 range - Sand: +20% weight, +30 difficulty, -80% experience, 8% material, -2 range - Sandstone: +20% weight, +25 difficulty, -70% experience, 8% material, -2 range - Snow: -20% weight, +25 difficulty, -70% experience, 8% material, -2 range - Runed Metal: +50% weight, -12 diff, -10% experience, 38% material - Bronze, +40% weight, 13% material - Paper: -60% weight, +40 diff, -90% experience, 8% material, -2 range - - Has a 20% chance of fishing up an aggressive stickman - Cardboard: Same as above, but without the stickmen - Bone: +5% weight, +15 diff, -15% experience, 8% material, -2 range - - 20% chance of fishing up either a unmarine bonemass, a unmarine mastodon, a hostile skellie or rarely a single-use spectral instrument that can turn you or someone else into a spooky scary skeleton. - Bamboo: -50% weight, -4 difficulty, +30% experience, 13% material, -1 range - Zeukerite: 20% weight, -16 difficulty, -10% experience, 28% material - Plasteel: +75% weihgt, +5 difficulty, +10% experience, 8% material - Plastitanium: +10% weight, -10 difficulty, -5% experience, 8% material, +1 range - Plasmaglass: +20% weight, +5 difficulty, +30% experience, 8% material - Titanium Glass: +25% weight, -5 difficulty, +25% experience 8% material - Plastitanium Glass: +20% weight, +50% experience, 8% material - Alien Alloy: +140% weight, -25 difficulty, 33% material, -40% experience, +2 range - Hauntium (good luck using it): +40% weight, -30 difficulty, +50% experience, 38% material, +2 range - Meat: +13 difficulty, -20% experience, 28% material, -2 range - Pizza: -10% weight, +13 difficulty, -20% experience, 28% material, -2 range </details> ## Why It's Good For The Game I think it's nice to have two features interact with each other (fishing and materials), and it adds a layer of interesting uses to some materials. ## Changelog 🆑 add: Autolathes can now print fishing rods of different materials, which can increase or decrease fishing difficulty, casting range, and experience gained, and can have other interesting effects. /🆑 |
||
|
Majkl-J
|
e59d8ba64b | Merge commit '179a607a90ad7ec62bdaff4e6fe72af60ee56442' of https://github.com/tgstation/tgstation into upstream-24-10b | ||
|
Majkl-J
|
f8faccd70a | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-10a | ||
|
Waterpig
|
bb70889f6e |
TG Upstream Part 1
3591 individual conflicts Update build.js Update install_node.sh Update byond.js oh my fucking god hat slow huh holy shit we all fall down 2 more I missed 2900 individual conflicts 2700 Individual conflicts replaces yarn file with tg version, bumping us down to 2200-ish Down to 2000 individual conflicts 140 down mmm aaaaaaaaaaaaaaaaaaa not yt 575 soon 900 individual conflicts 600 individual conflicts, 121 file conflicts im not okay 160 across 19 files 29 in 4 files 0 conflicts, compiletime fix time some minor incap stuff missed ticks weird dupe definition stuff missed ticks 2 incap fixes undefs and pie fix Radio update and some extra minor stuff returns a single override no more dupe definitions, 175 compiletime errors Unticked file fix sound and emote stuff honk and more radio stuff |
||
|
Ghom
|
ab222330ef |
Squashs four fish boolean vars into a bitfield (plus VV support) (#86623)
## About The Pull Request this is a very marginal code improvement to fish. One bitfield is better than a bunch of booleans, and it lets me add more TRUE/FALSE settings in the future without having to make new vars for it. Also VV support for several vars (fish_traits will have to wait), if me or someone else wants to var-edit fish for testing purposes or whatsnot. ## Why It's Good For The Game Slight code improvement and var-edititing support. ## Changelog N/A |
||
|
Ghom
|
8d0e6734fe |
Fish (ya know, from fishing) is now edible (#86110)
## About The Pull Request Fish (the item that you catch with a fishing rod) now has an edible component attached to it, making it possible to eat them if you really have to, at the cost of eventually killing and deleting the fish, however, you normally shouldn't. Along with the seafood and meat foodtypes flags, it possess the gore and raw foodtypes too, making them pretty awful to eat unless you're a (non-vegan) lizard, felinid, or wearing the strange bandana*, which can only be found in the cqc kit case. Furthermore, it carry diseases like the ones from food left on the floors for too long, so a strong stomach is required to safely eat it even if you actually like it, dummy... UNLESS you fry or grill it, thus killing the diseases (as well as the fish) and removing both the gore and raw food types, then it becomes an actually ok meal... UNLESS you're dumb enough to eat a pufferfish, a donkfish or a slimefish. That is more or less the general rule. A few fish stray for it. For example, lavaloops are never raw (still gorey). The skeleton fish are never edibles, and holodeck fish is, well, holographic and thus disappears if you try to eat it. *the strange bandana is a reference to MSG, and this is a reference to the MGS3 fish eating animation. This is WIP btw, I'll have to test it and add some then polish it. ## Why It's Good For The Game Whole unprocessed fish should be technically edible, even if not safe to eat nine times out of ten. Also I kinda need this if I want to add a tasty fishing spot to the kitchen deepfriers. ## Changelog 🆑 add: Whole, unprocessed fish is now edible. However it's pretty much reccomended to grill or fry it for over 30 spess seconds before attempting to eat it. fix: germ-covered, dirty food no longer tries to infect you through contact. /🆑 |
||
|
Ghom
|
59e3f1a240 |
Fishing rewards are now chosen once the minigame starts, not beforehand (feat. Crushing the difficulty now skips the minigame) (#86175)
## About The Pull Request Rolling the reward up to 30 seconds before the minigame starts leaves ample room for conditions to mutate and unforeseeable events to happen, which can lead to more frequent issues. Furthermore, it makes more sense this way, since you aren't pulling a carp until it bites the hook. Also TIL that the difficulty of the fishing sources is added to the default difficulty of the minigame, which is 15 and doesn't replace it, which means most fishing spots have a default difficulty of 35 to 40, so I thought it'd be nice if you somehow were able to skip the minigame if you reduce the difficulty to 0 or less, which is totally possible with some prep. IIRC, using the athletics fishing gloves at maximum fitness level (21) + max fishing level (10) + settler quirk (5) + a favorite bait (5) can lower the difficulty by a whooping 41 points, so it's totally possible to achieve the skips on many fishing spots. Doing this however won't train your fishing skill. ## Why It's Good For The Game More stability. Also we skip the minigame entirely if it gets so easy it becomes another waiting phase with little to no input. ## Changelog 🆑 balance: With enough preparation, good skills and equipment, you can manage to skip the minigame phase of fishing by reducing the difficulty all the way down to 0. /🆑 |
||
|
Ghom
|
023bfd0e5d |
Autowiki for fishing. (#86035)
## About The Pull Request I've come to realize manually updating all fishing stuff on the very much outdated wiki would be a colossal pain in the rear, so I've decided to automate a few bits to generate autowiki lists containing information about fish, fish traits, bait, hooks, reels, fishng rods, fish sources and fish experiments. Now tested. ## Why It's Good For The Game Making a huge autowiki for a feature that's being constantly updated (by me) but still has a particularly lame and outdated page on the wiki. ## Changelog N/A |
||
|
Waterpig
|
4c4930c71d | Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit | ||
|
Ghom
|
10c2b7364e |
The fishening v3: Fishing lures. (#86007)
## About The Pull Request Over half of the line changes are merely from splitting the fish_types.dm into several files since it was over 1k lines already. One of the small issues with fishing right now is RNG. You want to get some specific fish, and you go through all the micromanaging with hooks, reels and baits only for the random number god to say "nope", and that's only going to get worse the more fish are in the game. However, I've a solution: (unconsumable/reusable) fishing lures, each of which attracts different fish based on different conditions. The only caveat is that they require to be spun at set intervals (usually 1 to 3 seconds, depending on the lure, with a second-long window). Worry not, there're visual cues in the form of a green/red light hovering the fishing float, so you won't get screwed up by the server slowing down or whatever. The whole box of lures (12 so far) can be from cargo for the fair price of 450 credits. I've also added 5 new fish: monkfish, plaice, pike, another punnier variant of the pike, perch and squid. The latter is quite special because of the ink production trait, which lets players use it to blind others at a close range and when butchered, it yields an ink sac, which can be processed into a can of squid ink (one less item exclusive to the produce console), or thrown at people in a sort-of-similar fashion of banana cream pies (except it's ink). <details> <summary>Images</summary> Fishing lures (forgot to take my cursor off the veggie one before the screenshot):  The five new fish:  </details> <details> <summary>A table of fish catchable wth each lure (excluding holodeck)</summary>  </details> A few more things in the CL, baitfish are a thing now. ## Why It's Good For The Game There should be ways to contrast some of the RNG fishing has. After all, it's only going to get more random the more fish are in the game. Furthermore, I find it disappointing that a lot of food stuff is exclusive to the ingredients console and there're no other ways to get it. ## Changelog 🆑 add: Added fishing lures to the game. They don't get used up like baits and let you catch specific kinds of fish, though they need to be spun every few seconds. The whole set can be ordered from cargo for 450 credits. balance: The magnet hook now removes dud chances. add: Added five new fish types: perch, two types of pike, monkfish, plaice and squid. Squids have a fairly special ink production trait, which lets you use them (unless dead) to ink people face at close range, and can be butchered for an ink sac, which can either be processed into canned squid ink, or thrown at someone. fix: Refactored throwing a little. Some items (specifically components/elements) won't be triggered when caught. no more plates shattering despite being caught for example. add: Goldfish, lavaloops, needlefish and armorfish can now be used as baits. /🆑 |
||
|
Ghom
|
73081bcff0 |
Add messages (paper, photos, cash) in bottles. (#85703)
## About The Pull Request This PR adds a new persistent feature: message inside bottles. These are basically glass bottles with inside a piece of paper, a photo or space cash (no holocredits, and most bills rarely go over 1000 credits anyway) from a previous round, which can be fished at the beach, or from the relative fishing portals. Each piece of written paper or photo that isn't map-loaded has a roughly a 0.2% chance to be added to the message bottles database at the end of the round. However, you can also manually toss a glass bottle with inside a paper/photo/bill into the ocean (or a fishing portal generator with the ocean/beach module loaded) for guaranteed results. The bottles are removed from the database once fished up by the by, unless tossed back into the ocean. I've also offset a couple bottle sprites that weren't properly aligned (for the message overlays). TODO: - [x] add a couple (20 prob or less) message bottle spawners to the beach away mission or something. - [x] add a few sounds for adding and removing the message from the bottle. (pickup/drop sounds already handle that) - [x] test it properly. ## Why It's Good For The Game I think it'd be neat to have a way to send photos, snarky "seek grass" messages, as well as the occasional financial aid to future players, and furthermore, another thing to tie fishing to. ## Changelog 🆑 add: You can place papers, photos and cash bills (no holochips) inside bottles and then toss them into the ocean (or fishing portal gen with relative settings) with right-click, for others to fish them up on future rounds. /🆑 |
||
|
Ghom
|
659e6f0ca2 |
Fishing expansion 2: one-year later boogaloo (#85252)
## About The Pull Request This PR mainly adds more fish and more fishing spots to the game, while refactoring a few aspects of the fishing minigame. Listing out with the new fish: - Arctic char: mainly filler content for the ice hole fishing spot - Sockeye Salmon: ditto but also provides better fillets that boost the quality of resulting food items when cooked or used in recipes - Soulfish: joke content, found by the cursed spring ruin - Skin Crab: also a joke found by the cursed spring - Bump-Fish: filler for the sand fishing spot - Burrower Crab: ditto, reusing a fish sprite I made last year - Sand Surfer: ditto - Three-Eyed Goldfish: It's a reference, doh - Stingray: A modestly weaponizable fish (whoops I've forgot to set the hit sounds), it possess a few traits that make it deliver bits of venom each time you hit someone with it - Swordfish: Huge-ass fish that may require two hands to wield (or not, if the RNG wants to make it smaller). Stats-wise, it's more or less the equivalent of the captain sabre, if not stronger (and more unwieldy due to size and weight). Becomes weaker when dead. Also gives better quality fillets. - Chainsawfish: A mutation of the goldfish with some size, weight and traits requirements, but can also be found on emagged fishing portals. Stronger than the swordfish, it behaves sort of like a chainsaw, with the similar tool behaviour and var values. Also becomes weaker when dead. As for the fishing spots, you can now fish on sand turfs, at the cursed springs or on ice. Rivers/jungle water now has its own fishing spot datum, and no longer uses the generic fishing portal one. To fish on ice, you first have to carve a hole with a pick or a shovel. I've also refactored the fish "AI" hardcoded stuff used in the fishing minigame into their own datums, which let me add a few fancier ways to how the fish moves during the minigame (i.e. the soulfish moving at 1 FPS or the chainsawfish getting faster and faster). As for the sword and chainsaw fish, their potential strength is balanced out by the need of keeping them alive, as well as the potential cumbersomeness, two-handed wielding and potential slowdown from the excessive weight of the fish (Thank you Big Slappy for the inspiration). Other minor changes include: Pufferfish giving better quality fillets (too bad they're poisonous, I'll go and make a skillchip to let cooks safely separate the poisonous liver from the fillets); McGill The lawyer's goldfish) having a 15% of being three-eyed; the aforementioned slowdown from fish weight and two-handed carry from fish size; a couple new fish icons (the ones that hint you on what you're trying to catch) for the fishing minigame; a few adjustments to prevent self-reproducing fish from ignoring the population cap and let fish with a stable population of 1 to crossbreed (also gotta make a different PR to let it happen rarely without the crossbreeding trait). This PR is still a WIP, gotta test it several times. ## Why It's Good For The Game Fishing is something I've been working on for about a year now, but there are still a few places where it's kinda lackluster, like there's not enough diverse fishing spots or useful fish (I'll be working on a separate PR to make the logistic of a carrying a fish around without letting it die a tad easier). Also, look at these sprites:  Can you guess which is which? ## Changelog For the sake of not dumping players with niche information 90% of the players won't understand, I'll keep the CL pretty generic 🆑 add: Added twelve new fish types to the game. Some are cool, other are not, some come with their own special traits and some are straight-up weapons. add: Added more fishing spots to the game. Sand, ice, rivers, the cursed spring... balance: A few fish like salmon, swordfish and pufferfish (poisonous btw) now give better quality fillets when butchered, which can improve the quality of food that uses them even further. balance: Excessive fish weight will make the fish slowier to carry, while excessive size may make it require two hands. balance: Adjusted size, weight and cooldowns of several fish, for the better. /🆑 |
||
|
StrangeWeirdKitten
|
38c3a6336d | Merge branch 'master' of https://github.com/skyrat-ss13/skyrat-tg into upstream-7-24/204 | ||
|
SkyratBot
|
68f4696e25 |
[MIRROR] You can now raise lobstrosities from chasms chrabs. (#29019)
* You can now raise lobstrosities from chasms chrabs. (#84969) ## About The Pull Request Lobstrosities can now be raised from aquarium icemoon/lavaland chrabs. First of all, you've to get a live chrab, an aquarium, and some fish feed. Second, you place the chrab inside the aquarium and turn the 'allow breeding' settting on (should probably rename it to a more apt name now). Keep the chrab well fed, and possibly with some friends and props in the same aquarium until it develops into a hopefully calm juveline lobstrosity and plops out of the aquarium (it can take some time). From there you can tame it by feeding it its favorite food: arms and lavaloop fish, and wait another dozen minutes for it to mature into a fully grown lobstrosity. Juveline lobstrosities are basically smaller and weaker lobstrosities, if not slightly faster in some ways. Unlike their taller counterparts, they can be tamed. Once done so, they'll retain their tamedness once grown up. Regardless, tamed lobstrosities can be given the pet command to fish for things by pointing at them. Thanks BenMatrix for the profound fisher component, woo. The chrab's weigth and size influence the growth speed of the first stage faster, meaning bigger chrabs (may require crossbreeding) will turn into juveline lobstrosities quickly. Amongst other things influencing the resulting mob are fish traits: Several traits have been given effects that apply to the mob, such as nocturnal regeneration, being venomous or being able to fly akin space carps. Also a new one that prevents the resulting lobstrosity from fully developing Now tested. ## Why It's Good For The Game I'm building upon fishing and aquarium stuff, which has been an interest of mine in a good while, though most of it doesn't have that many practical uses, I'm slowly trying to make it cooler, and chasm chrabs growing into lobstrosities is pretty much in line with the fluff texts for the fish. Eventually I'll have to add tips inside fishing toolboxes, otherwise people won't know even half of it. ## Changelog 🆑 add: You can raise lobstrosities from chasm chrabs inside an aquarium with the 'allow breeding' setting on. Keep the fish well fed, healthy and not lonely if you don't want an hostile one. add: Juveline lobstrosities (from chasms, plasma rivers, or aquariums, xenobio too) can be tamed with arms and lavaloop fishes. add: For lobstrosities grown from aquariums, they can have additional effects based on the fish traits they had in the aquarium, like being venomous or even flying. /🆑 * You can now raise lobstrosities from chasms chrabs. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
||
|
Ghom
|
c91c50f937 |
You can now raise lobstrosities from chasms chrabs. (#84969)
## About The Pull Request Lobstrosities can now be raised from aquarium icemoon/lavaland chrabs. First of all, you've to get a live chrab, an aquarium, and some fish feed. Second, you place the chrab inside the aquarium and turn the 'allow breeding' settting on (should probably rename it to a more apt name now). Keep the chrab well fed, and possibly with some friends and props in the same aquarium until it develops into a hopefully calm juveline lobstrosity and plops out of the aquarium (it can take some time). From there you can tame it by feeding it its favorite food: arms and lavaloop fish, and wait another dozen minutes for it to mature into a fully grown lobstrosity. Juveline lobstrosities are basically smaller and weaker lobstrosities, if not slightly faster in some ways. Unlike their taller counterparts, they can be tamed. Once done so, they'll retain their tamedness once grown up. Regardless, tamed lobstrosities can be given the pet command to fish for things by pointing at them. Thanks BenMatrix for the profound fisher component, woo. The chrab's weigth and size influence the growth speed of the first stage faster, meaning bigger chrabs (may require crossbreeding) will turn into juveline lobstrosities quickly. Amongst other things influencing the resulting mob are fish traits: Several traits have been given effects that apply to the mob, such as nocturnal regeneration, being venomous or being able to fly akin space carps. Also a new one that prevents the resulting lobstrosity from fully developing Now tested. ## Why It's Good For The Game I'm building upon fishing and aquarium stuff, which has been an interest of mine in a good while, though most of it doesn't have that many practical uses, I'm slowly trying to make it cooler, and chasm chrabs growing into lobstrosities is pretty much in line with the fluff texts for the fish. Eventually I'll have to add tips inside fishing toolboxes, otherwise people won't know even half of it. ## Changelog 🆑 add: You can raise lobstrosities from chasm chrabs inside an aquarium with the 'allow breeding' setting on. Keep the fish well fed, healthy and not lonely if you don't want an hostile one. add: Juveline lobstrosities (from chasms, plasma rivers, or aquariums, xenobio too) can be tamed with arms and lavaloop fishes. add: For lobstrosities grown from aquariums, they can have additional effects based on the fish traits they had in the aquarium, like being venomous or even flying. /🆑 |
||
|
Waterpig
|
7cb3b3f472 | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-07b | ||
|
SkyratBot
|
5afa528134 |
[MIRROR] Aquariums now influence area beauty based on their contents. (#28703)
* Aquariums now influence area beauty based on their contents. (#84677) ## About The Pull Request Aquariums now have a beauty element based on their contents. Props give a fixed beauty value, while for fish it depends on whether they're alive or not. Some fishes have a better score than others. A few, like the ratfish, even have negative beauty. Mobs with the morbid trait now get a positive moodlet when admiring an aquarium full of dead fish, and a negative one when fish are alive. Also, this brings a few improvements to bits of aquarium code. Namely the removal of a GetComponent call and a few balloon alert calls. ## Why It's Good For The Game Aquariums can be quite decorative at times. ## Changelog 🆑 add: Aquariums now influence the beauty score of an area based on their contents. add: Morbid people now get a positive moodlet when admiring an aquarium full of dead fish, and a negative one when fish are alive. /🆑 * Aquariums now influence area beauty based on their contents. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
||
|
Ghom
|
e6c094fcc2 |
Aquariums now influence area beauty based on their contents. (#84677)
## About The Pull Request Aquariums now have a beauty element based on their contents. Props give a fixed beauty value, while for fish it depends on whether they're alive or not. Some fishes have a better score than others. A few, like the ratfish, even have negative beauty. Mobs with the morbid trait now get a positive moodlet when admiring an aquarium full of dead fish, and a negative one when fish are alive. Also, this brings a few improvements to bits of aquarium code. Namely the removal of a GetComponent call and a few balloon alert calls. ## Why It's Good For The Game Aquariums can be quite decorative at times. ## Changelog 🆑 add: Aquariums now influence the beauty score of an area based on their contents. add: Morbid people now get a positive moodlet when admiring an aquarium full of dead fish, and a negative one when fish are alive. /🆑 |
||
|
Waterpig
|
00aa495320 | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-07a | ||
|
SkyratBot
|
cb7943b601 |
[MIRROR] Settler partially atomized into traits, ashwalkers given some settler traits (#28298)
* Settler partially atomized into traits, ashwalkers given some settler traits * Update declarations.dm --------- Co-authored-by: Joshua Kidder <49173900+Metekillot@users.noreply.github.com> Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> |
||
|
Joshua Kidder
|
94cf89f2d7 |
Settler partially atomized into traits, ashwalkers given some settler traits (#84090)
## About The Pull Request So my previous PR was to give ashwalker the settler trait so they'd get some of the benefits of settler (better riding, fishing, and taming) but it was suggested that Settler be atomized into different traits instead. I've done that here. Ashwalkers now get TRAIT_ROUGHRIDER TRAIT_BEAST_EMPATHY TRAIT_EXPERT_FISHER which will, respectively, make them better riders, better tamers, and better at fishing. I also made a small change to the riding code that references riding speed boosts for people with the ROUGHRIDER trait (would, at the moment, only be ashwalkers and settlers) that gives ashwalkers the maximum bonus, to represent their primal connection with the beasts in the area. ## Why It's Good For The Game Ashwalkers are described in the lore as being denizens of lavaland, the same as all the other messed up shit down there. This change brings them in line with that. The improvements to the handling of the settler trait will also open up avenues for expanding or improving on related systems ## Changelog 🆑 Bisar add: Ashwalkers are now better at riding, taming animals, and fishing. code: Behavior for the settler trait has been partially atomized into several traits instead. /🆑 --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@gmail.com> |
||
|
Waterpig
|
5da11912cb | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406a | ||
|
tralezab
|
d86ae35931 |
Fish update just dropped. New fish, aquarium type, two traits and a research node. (#83508)
## About The Pull Request ### New fish #### anxious zipzap An incredibly anxiety-ridden and electroreceptive fish. Worried about the walls of its tank closing in constantly. Both literally and as a general metaphorical unease about life's direction. It produces electricity, and HATES being with any other fish. One other zipzap is allowed at most.  #### monocloning jumpercable A surprisingly useful if nasty looking creation from the syndicate fish labs. Drop one in a tank, and watch it self-feed and multiply. Generates more and more power as a growing swarm! A far better option for power generation than the zipzap, but it's a syndicate fish. Get an emag or get very lucky!  Working spacebase example  ### Aquarium type Bioelectricity Generator! It boosts the power of electroreceptive fish to very dangerous levels! But, uh, you put a tesla coil, and voila! Free power! ...Free power if you keep the fish fed! More fish, more power!  You can convert an aquarium into a bioelectricity generator by researching the new node, "Marine Utility", from bio processing. Then you build the biogen upgrade kit and apply it to an already existing aquarium. ### Fish Traits #### Electrogenesis Trait turns the fish into a shock weapon while it's alive, and every time it feeds, it releases a weak tesla bolt to anyone close to the tank. #### Anxiety anxious fish die when any other fish are in the tank. Please keep them alone :[ ## Why It's Good For The Game Fish are great, but fish don't have anything to give back to the station, right? Well, there's some small stuff, but I wanted to add a bit of functionality towards being able to benefit from having fish. The anxiety trait with the zipzap gives spessmen a bit of a challenge. You can settle for one fish generating power per tank and do a multi-tank generation setup, or you can do some crossbreeding to make a fish WITH electroreceptive but WITHOUT anxiety. Neat! ## Changelog 🆑 add: New fish, the anxious zipzap add: New syndicate fish, the monocloning jumpercable add: New aquarium, the bioelectricity generator fix: Mixotrophic fish now properly lack food requirements /🆑 |
||
|
tralezab
|
af33a5fb06 |
Fish update just dropped. New fish, aquarium type, two traits and a research node. (#83508)
## About The Pull Request ### New fish #### anxious zipzap An incredibly anxiety-ridden and electroreceptive fish. Worried about the walls of its tank closing in constantly. Both literally and as a general metaphorical unease about life's direction. It produces electricity, and HATES being with any other fish. One other zipzap is allowed at most.  #### monocloning jumpercable A surprisingly useful if nasty looking creation from the syndicate fish labs. Drop one in a tank, and watch it self-feed and multiply. Generates more and more power as a growing swarm! A far better option for power generation than the zipzap, but it's a syndicate fish. Get an emag or get very lucky!  Working spacebase example  ### Aquarium type Bioelectricity Generator! It boosts the power of electroreceptive fish to very dangerous levels! But, uh, you put a tesla coil, and voila! Free power! ...Free power if you keep the fish fed! More fish, more power!  You can convert an aquarium into a bioelectricity generator by researching the new node, "Marine Utility", from bio processing. Then you build the biogen upgrade kit and apply it to an already existing aquarium. ### Fish Traits #### Electrogenesis Trait turns the fish into a shock weapon while it's alive, and every time it feeds, it releases a weak tesla bolt to anyone close to the tank. #### Anxiety anxious fish die when any other fish are in the tank. Please keep them alone :[ ## Why It's Good For The Game Fish are great, but fish don't have anything to give back to the station, right? Well, there's some small stuff, but I wanted to add a bit of functionality towards being able to benefit from having fish. The anxiety trait with the zipzap gives spessmen a bit of a challenge. You can settle for one fish generating power per tank and do a multi-tank generation setup, or you can do some crossbreeding to make a fish WITH electroreceptive but WITHOUT anxiety. Neat! ## Changelog 🆑 add: New fish, the anxious zipzap add: New syndicate fish, the monocloning jumpercable add: New aquarium, the bioelectricity generator fix: Mixotrophic fish now properly lack food requirements /🆑 |
||
|
Waterpig
|
e8f9767a11 | Merge remote-tracking branch 'Skyrat/upstream-merge-81373' into upstream-2024-3 | ||
|
SkyratBot
|
1e37ae9c01 |
[MIRROR] Adds an 'auto-reel' line reel to the fishing tech node. Minor gameplay changes to fishing. (#26580)
* Adds an 'auto-reel' line reel to the fishing tech node. Minor gameplay changes to fishing. (#81407) ## About The Pull Request This PR adds a new line reel, which speeds up the baiting phase of the fishing minigame and skips the biting phase, thus starting the minigame without the initial input from the player. The auto-reel line will also throw items (or other people/things, if you have the right hook) in your direction when snagged, with the added bonus of catching the item mid-air. Turn your fishing rod into a discount meat hook. I've lowered the deceleration coefficient and bounce threshold of the minigame by 1/4. My rationale is that these two numbers are a must lest we end up with an uncontrollable mess of a minigame, though they also feel like a sack of flour hitting gravel rn, making specific hooks like the bi-directional one and the weighted other a bit useless. Another change is to the baiting and biting phase. Previously, if you clicked anywhere during the baiting phase, it'd reset the whole timer back to any value between 1 and 30 seconds, spelling futility to the time you've just spent waiting. Now, it'll simply add another 4 seconds or so to the current timer, capping at 30s. One last thing*. Once the biting phase start, the faster your input is, the higher the starting completion of the minigame will be, and the other way around, if you're very slow. The difficulty variable can also lower the starting completion. *I lied. I've also added a short cooldown to casting a fishing rod so you can't just spam it. ## Why It's Good For The Game Finetuning the minigame, quality of life and balance, making fishing even more gimmicky. ## Changelog 🆑 Ghommie add: Added a new fishing line reel that speeds up the first half of the fishing minigame, and also let's you catch things from afar like a discount meat hook. balance: During the biting phase preceeding the actual minigame, initiating it as soon as the "!!!" alert pops up will net you an advantage. Conversely... qol: Clicking during the baiting phase will no longer wholly reset it and make you lose your patience. Instead, it'll delay the next phase by about 4 seconds. balance: The deceleration and bounce should feel less sudden and stiff, meaning the controls are 25% more slippery again. balance: Added a cooldown to spam-casting fishing rods. imageadd: Resprited line reels a little. /🆑 * Adds an 'auto-reel' line reel to the fishing tech node. Minor gameplay changes to fishing. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com> |
||
|
Ghom
|
a4cedb2dbe |
Adds an 'auto-reel' line reel to the fishing tech node. Minor gameplay changes to fishing. (#81407)
## About The Pull Request This PR adds a new line reel, which speeds up the baiting phase of the fishing minigame and skips the biting phase, thus starting the minigame without the initial input from the player. The auto-reel line will also throw items (or other people/things, if you have the right hook) in your direction when snagged, with the added bonus of catching the item mid-air. Turn your fishing rod into a discount meat hook. I've lowered the deceleration coefficient and bounce threshold of the minigame by 1/4. My rationale is that these two numbers are a must lest we end up with an uncontrollable mess of a minigame, though they also feel like a sack of flour hitting gravel rn, making specific hooks like the bi-directional one and the weighted other a bit useless. Another change is to the baiting and biting phase. Previously, if you clicked anywhere during the baiting phase, it'd reset the whole timer back to any value between 1 and 30 seconds, spelling futility to the time you've just spent waiting. Now, it'll simply add another 4 seconds or so to the current timer, capping at 30s. One last thing*. Once the biting phase start, the faster your input is, the higher the starting completion of the minigame will be, and the other way around, if you're very slow. The difficulty variable can also lower the starting completion. *I lied. I've also added a short cooldown to casting a fishing rod so you can't just spam it. ## Why It's Good For The Game Finetuning the minigame, quality of life and balance, making fishing even more gimmicky. ## Changelog 🆑 Ghommie add: Added a new fishing line reel that speeds up the first half of the fishing minigame, and also let's you catch things from afar like a discount meat hook. balance: During the biting phase preceeding the actual minigame, initiating it as soon as the "!!!" alert pops up will net you an advantage. Conversely... qol: Clicking during the baiting phase will no longer wholly reset it and make you lose your patience. Instead, it'll delay the next phase by about 4 seconds. balance: The deceleration and bounce should feel less sudden and stiff, meaning the controls are 25% more slippery again. balance: Added a cooldown to spam-casting fishing rods. imageadd: Resprited line reels a little. /🆑 |
||
|
nevimer
|
4d8898fdef |
Merge remote-tracking branch 'skrat/master' into upstream-2024-02-03
# Conflicts: # _maps/map_files/IceBoxStation/IceBoxStation.dmm # _maps/map_files/KiloStation/KiloStation.dmm # _maps/map_files/tramstation/tramstation.dmm # _maps/skyrat/automapper/automapper_config.toml # code/controllers/subsystem/statpanel.dm # code/datums/chatmessage.dm # code/datums/quirks/negative_quirks/claustrophobia.dm # code/game/objects/items/tools/weldingtool.dm # code/modules/client/preferences/middleware/quirks.dm # code/modules/mob/living/carbon/carbon_defense.dm # code/modules/mob/living/carbon/human/human_defense.dm # code/modules/mob/living/carbon/human/inventory.dm # code/modules/mob/living/living_say.dm # code/modules/modular_computers/file_system/programs/jobmanagement.dm # code/modules/projectiles/guns/energy/kinetic_accelerator.dm # code/modules/research/designs/mechfabricator_designs.dm # code/modules/research/machinery/_production.dm # code/modules/surgery/organs/internal/_internal_organ.dm # html/changelogs/archive/2024-01.yml # modular_skyrat/modules/automapper/code/area_spawn_entries.dm # modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm # modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm # modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm # modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm # modular_skyrat/modules/synths/code/bodyparts/power_cord.dm # tgstation.dme # tgui/packages/tgui/components/Dropdown.tsx # tgui/packages/tgui/components/Input.tsx # tgui/packages/tgui/interfaces/Fabrication/DesignBrowser.tsx # tgui/packages/tgui/interfaces/Jukebox.jsx # tgui/packages/tgui/interfaces/PreferencesMenu/QuirksPage.tsx # tgui/packages/tgui/interfaces/PreferencesMenu/data.ts # tgui/packages/tgui/interfaces/common/SearchBar.tsx |
||
|
SkyratBot
|
9e0936dfb6 |
[MIRROR] Un-codersprited fishes and the aquarium. [MDB IGNORE] (#26151)
* Un-codersprited fishes and the aquarium. (#80960) ## About The Pull Request I cannot make features and the such this month, so I may as well take some time to improve AnturK's abysmal codersprites. Some came out decent, some pretty good. Hopefully you can guess that's a catfish now. This PR includes a small bit of code changes concerning the aquarium and one of its props, both pretty bad-looking. I had to modify a dozen lines of code so that the aquarium stuff is aesthetically layered correctly (splitting it in multiple icon states), while also replacing the 'rock floor' prop with 'sand' because it looked pretty bad and hard to read. The lanternfish, goldfish and pufferfish still need to be resprited. I'll get to it in a later PR. ## Why It's Good For The Game So, I've recently checked out the sprites for fish on Goonstation, and remembered how bad ours are. I drew inspiration from the "googlier" eyes some of their fishes have, though nothing was copied. Hower, I'm still crediting Goonstation for reminding me how awful our codersprites are. Here's the after and before (angel fish missing from the latter 'cuz I was distracted):   In-game screenshot coming later, I need to update/downgrade my byond venrion because 1624 and 1625 are busted. ## Changelog 🆑 image: Resprited several fishes, and the aquarium. /🆑 * Un-codersprited fishes and the aquarium. --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
||
|
SkyratBot
|
ec2286db17 |
[MIRROR] Fishing hook and reel line tweaks (also qol for the fish bounties) [MDB IGNORE] (#26150)
* Fishing hook and reel line tweaks (also qol for the fish bounties) (#80599) ## About The Pull Request This PR includes a series of small changes and additions to hooks and reel lines, as well as the aforementioned bounties. My objective here is to make the (base) hook and reel line feel more useful. Ditto with a few other things. Here's the list of changes: - Almost all fishing rods come with a hook and reel line pre-installed. The rod from the fishing toolbox comes with separate hook and reel line. - Without a hook, you cannot fish. Without a reel line, the cast range is reduced (from 5 to 3). - Fishing with a reel line installed provides a mild boon to completion speed by default. - The sinewy reel line (craftable from lavaland mobs) can now be used to fish on lava / liquid plasma, but it's a bit stiff and gives a mild malus to completion speed. - Unlike other hooks, the rescue and jawed hooks now allow you to cast a line and reel in living mobs too, not only items. They even get a status alert they can click to un-snag themselves, or move away far enough to achieve the same effect. - Master fishing rod buffed. It now comes with a flexible reel line and weighted hook pre-installed, and can be cast further than other rods. - On top of that, the jawed hook will slow down living mobs snagged by it and is a bit harder to remove. - when casting a line, it will now show the icon of the current hook as projectile, not a generic one. - Reeling now correctly checks movement resistance and anchorage. - Reeling an object (or a mob) now plays a sound. Ditto for installing/removing slotted items. - A few balloon alert feedbacks. - Minor code improvements. - The jawed hook should look a smidge sharper. - reel lines are now small items. ## Why It's Good For The Game The base hook and reel line didn't do anything begin with, and you would do just fine without them. In the end it's just a bit unintuitive for them not to be a requirement. Beside that, it makes sense for the rescue hook to be able to snag mobs, so they may as well be used to drag people out of lava or liquid plasma. As for the jawed hook, it always felt to me a bit underwhelming and a bit of a filler I had cooked up on the moment. It really could have some 'tactical' utility in virtue of being one of those niche black market items. ## Changelog 🆑 add: Most fishing rods come with a hook and line preinstalled. Fishing toolboxes come with separate reel and lines as usual. balance: Fishing hooks are now required to fish. balance: Without a reel line, the range of fishing rods is reduced by two tiles. Conversely, having one installed gives a mild buff to the minigame completion speed. balance: The craftable sinewy reel line can now be used to fish on lava or liquid plasma, but it's a bit harder to use. balance: The rare-to-find-in-maintenance master fishing rod now comes with a flexible line and weighted hook preinstalled, and has better range than other rods. balance: Fishing reel lines are now small enough to fit pockets. add: The rescue and jawed hook can now snag and reel in mobs, not only items. The jawed hook also slows down when applied, a la beartrap. qol: Fish bounties now accept filled (stasis) fish cases. qol: Several balloon alerts for fishing rod interactions. fix: Reeling in items (and mobs) now respects movement resistance and anchorage. fix: Fixed the fishing rod equipment UI being too small to fit its components. sound: Reeling in something now plays a sound. /🆑 * Fishing hook and reel line tweaks (also qol for the fish bounties) --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
||
|
Ghom
|
380e2661c2 |
Un-codersprited fishes and the aquarium. (#80960)
## About The Pull Request I cannot make features and the such this month, so I may as well take some time to improve AnturK's abysmal codersprites. Some came out decent, some pretty good. Hopefully you can guess that's a catfish now. This PR includes a small bit of code changes concerning the aquarium and one of its props, both pretty bad-looking. I had to modify a dozen lines of code so that the aquarium stuff is aesthetically layered correctly (splitting it in multiple icon states), while also replacing the 'rock floor' prop with 'sand' because it looked pretty bad and hard to read. The lanternfish, goldfish and pufferfish still need to be resprited. I'll get to it in a later PR. ## Why It's Good For The Game So, I've recently checked out the sprites for fish on Goonstation, and remembered how bad ours are. I drew inspiration from the "googlier" eyes some of their fishes have, though nothing was copied. Hower, I'm still crediting Goonstation for reminding me how awful our codersprites are. Here's the after and before (angel fish missing from the latter 'cuz I was distracted):   In-game screenshot coming later, I need to update/downgrade my byond venrion because 1624 and 1625 are busted. ## Changelog 🆑 image: Resprited several fishes, and the aquarium. /🆑 |
||
|
Ghom
|
aa9caef0ed |
Fishing hook and reel line tweaks (also qol for the fish bounties) (#80599)
## About The Pull Request This PR includes a series of small changes and additions to hooks and reel lines, as well as the aforementioned bounties. My objective here is to make the (base) hook and reel line feel more useful. Ditto with a few other things. Here's the list of changes: - Almost all fishing rods come with a hook and reel line pre-installed. The rod from the fishing toolbox comes with separate hook and reel line. - Without a hook, you cannot fish. Without a reel line, the cast range is reduced (from 5 to 3). - Fishing with a reel line installed provides a mild boon to completion speed by default. - The sinewy reel line (craftable from lavaland mobs) can now be used to fish on lava / liquid plasma, but it's a bit stiff and gives a mild malus to completion speed. - Unlike other hooks, the rescue and jawed hooks now allow you to cast a line and reel in living mobs too, not only items. They even get a status alert they can click to un-snag themselves, or move away far enough to achieve the same effect. - Master fishing rod buffed. It now comes with a flexible reel line and weighted hook pre-installed, and can be cast further than other rods. - On top of that, the jawed hook will slow down living mobs snagged by it and is a bit harder to remove. - when casting a line, it will now show the icon of the current hook as projectile, not a generic one. - Reeling now correctly checks movement resistance and anchorage. - Reeling an object (or a mob) now plays a sound. Ditto for installing/removing slotted items. - A few balloon alert feedbacks. - Minor code improvements. - The jawed hook should look a smidge sharper. - reel lines are now small items. ## Why It's Good For The Game The base hook and reel line didn't do anything begin with, and you would do just fine without them. In the end it's just a bit unintuitive for them not to be a requirement. Beside that, it makes sense for the rescue hook to be able to snag mobs, so they may as well be used to drag people out of lava or liquid plasma. As for the jawed hook, it always felt to me a bit underwhelming and a bit of a filler I had cooked up on the moment. It really could have some 'tactical' utility in virtue of being one of those niche black market items. ## Changelog 🆑 add: Most fishing rods come with a hook and line preinstalled. Fishing toolboxes come with separate reel and lines as usual. balance: Fishing hooks are now required to fish. balance: Without a reel line, the range of fishing rods is reduced by two tiles. Conversely, having one installed gives a mild buff to the minigame completion speed. balance: The craftable sinewy reel line can now be used to fish on lava or liquid plasma, but it's a bit harder to use. balance: The rare-to-find-in-maintenance master fishing rod now comes with a flexible line and weighted hook preinstalled, and has better range than other rods. balance: Fishing reel lines are now small enough to fit pockets. add: The rescue and jawed hook can now snag and reel in mobs, not only items. The jawed hook also slows down when applied, a la beartrap. qol: Fish bounties now accept filled (stasis) fish cases. qol: Several balloon alerts for fishing rod interactions. fix: Reeling in items (and mobs) now respects movement resistance and anchorage. fix: Fixed the fishing rod equipment UI being too small to fit its components. sound: Reeling in something now plays a sound. /🆑 |
||
|
BurgerLUA
|
660790303a |
Makes Fishing Easier (#559)
Draft because untested. ## About The Pull Request Makes fishing significantly easier. ## Why It's Good For The Game Fishing has no right to be this hard. ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 BurgerBB balance: Makes fishing easier. /🆑 |
||
|
SkyratBot
|
13a9abdf2c |
[MIRROR] The fishing portal generator expansion (plus skill-chip) [MDB IGNORE] (#24052)
* The fishing portal generator expansion (plus skill-chip) (#78203) ## About The Pull Request This is a PR I worked on last month, but had to put on hold while dealing with some pressing issues with fishing feature, minigame and other stuff, and because I had to atomize out some of the stuff previously present here. I've expanded on the fishing portal generator to do something other than dispense guppies and goldfishes. It now has multiple settings, unlockable by performing scanning experiments for fish types, available from the get go, which also reward a meager amount of techweb points upon completion. The generator can now be built too. No longer it has to be ordered from cargo. It can also be emagged for the syndicate setting, tho right now it only dispenses donkfish and emulsijack, both otherwise impossible to get outside of... exodrone adventures. The advanced fishing rod now comes with an experiment handler component, specific to the fish scanning experiment, that automatically scans fished content. The node to get it now requires 2000 points and the first fish scanning exp to be unock. A new skillchip has been added, which adds a trait that changes the icon of the fish shown in the minigame UI, giving some clues on what the reward will be. The same trait is also gained by reaching the master (penultimate) level of the fishing skill. A new fish type has been added, with its own quirks. One of these quirks included temporarily switching movement direction of the bait. Currently, it can only be fished in the hyperspace and randomizer setting of the fishing portal. Screenshots:   ## Why It's Good For The Game The fishing portal generator is but a stale and underdeveloped prototype of the fishing feature right now, so much I was thinking of removing it at first. However, we also have a lot of fishes which are pretty much unfishable, so I came up with the idea of adding new portal settings that allow people to actually get them. As for the skillchip and trait, it's but an extra to both the vending machine in the library and the fishing skill itself, which has an overall humble impact on the minigame. ## Changelog 🆑 add: Expanded the fishing portal generator. It now comes with several portal options that can be unlocked by performing fish scanning experiments, which also award a modest amount of techweb points. balance: The fishing portal generator is now buildable and no longer orderable. The board can be printed from cargo, service and science lathes. balance: Advanced fishing tech is no longer a BEPIS design. It now requires the base fish scanning experiment and 2000 points to be unlocked. add: The advanced fishing rod now comes with an incorporated experiscanner specific for fish scanning. add: Added a new skillchip that may change the icon of the "fish" shown in the minigame UI to less generic ones. Reaching master level in fishing also does that. qol: The experiment handler UI no longer shows unselectable experiments. /🆑 * The fishing portal generator expansion (plus skill-chip) --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> |
