Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Aquariums now have an internal feed storage. Fish catalogs as 25cr goodies. #224

Merged
merged 1 commit into from
Oct 23, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24488
Original PR: tgstation/tgstation#78958

About The Pull Request

Added a reagent holder to aquarium tanks and some code to enable the fish to be automatically fed at selectable intervals of 1 minute to 7 (default 3). The holder can be accessed and filled by opening the control panel, and emptied with a plunger if necessary. Simple plumbing compatibility has been added as well, in case you think the 6 units of capacity of the reagent holder (enough to feed a fish 60 times) are not enough. The preset fishing tank starts with enough feed to keep its contents alive for 30 minutes.

Beside that, I've fixed a small oversight with the fish analyzer goodie pack. It should cost 150, not 500.
The fish catalog is now a goodie pack you can get as a goodie for dirt cheap (25 creds) and a subtype of book/manual, so there's a slim chance you may find it at the library or somewhere else.
Fixed a small oversight inside the fish catalog.
Mapped in a single aquarium kit for each station map, in the service hallway/storage room where the techfab and cargo consoles are also found.
Aquarium kits are now compatible with slapcrafting.

Why It's Good For The Game

Aquariums require too much maintainance for a gimmick, and it's quite awful to see the fish inside preset aquariums die 5 minutes into the round. Also, you cannot get fish catalogs anywhere but from the aquarium kit crate, which costs 1k credits, though its pertinence with fishing goes beyond aquarium stuff.
Lastiy, I think it's good to give the crew a free aquarium kit. The price of the supply pack is a bit out of reach for many, service could use a bit of fisciculture too (I may make it a service pack later, so that it can be ordered through the service console).

Changelog

🆑 Ghommie
add: Aquariums now have a small internal reagent holder, accessible when the panel is open and used to automatically feed the fishes at selectable intervals, also compatible with plumbing.
add: Fish catalogs can now be bought as a goodie pack, for 25 cr, or rarely found at the library or maints.
fix: Fixed the prices of fish analyzers. It's supposed to be 150 cr, not 500.
map: Added an aquarium kit to each station, found in the room where the service techfab and order console also are.
qol: Aquarium kits are now compatible with slapcrafting (crafted by hitting them with the required material without opening the menu).
balance: Moved the aquarium kit and fish supply packs from the "General" section to "Service" and "Livestock" respectively, meaning they can be ordered for free from the service orders console.
/:cl:

…s 25cr goodies. [MDB IGNORE] (#24488)

* Aquariums now have an internal feed storage. Fish catalogs as 25cr goodies. (#78958)

## About The Pull Request
Added a reagent holder to aquarium tanks and some code to enable the
fish to be automatically fed at selectable intervals of 1 minute to 7
(default 3). The holder can be accessed and filled by opening the
control panel, and emptied with a plunger if necessary. Simple plumbing
compatibility has been added as well, in case you think the 6 units of
capacity of the reagent holder (enough to feed a fish 60 times) are not
enough. The preset fishing tank starts with enough feed to keep its
contents alive for 30 minutes.

Beside that, I've fixed a small oversight with the fish analyzer goodie
pack. It should cost 150, not 500.
The fish catalog is now a goodie pack you can get as a goodie for dirt
cheap (25 creds) and a subtype of `book/manual`, so there's a slim
chance you may find it at the library or somewhere else.
Fixed a small oversight inside the fish catalog.
Mapped in a single aquarium kit for each station map, in the service
hallway/storage room where the techfab and cargo consoles are also
found.
Aquarium kits are now compatible with slapcrafting.

## Why It's Good For The Game
Aquariums require too much maintainance for a gimmick, and it's quite
awful to see the fish inside preset aquariums die 5 minutes into the
round. Also, you cannot get fish catalogs anywhere but from the aquarium
kit crate, which costs 1k credits, though its pertinence with fishing
goes beyond aquarium stuff.
Lastiy, I think it's good to give the crew a free aquarium kit. The
price of the supply pack is a bit out of reach for many, service could
use a bit of fisciculture too (I may make it a service pack later, so
that it can be ordered through the service console).

## Changelog

:cl:
add: Aquariums now have a small internal reagent holder, accessible when
the panel is open and used to automatically feed the fishes at
selectable intervals, also compatible with plumbing.
add: Fish catalogs can now be bought as a goodie pack, for 25 cr, or
rarely found at the library or maints.
fix: Fixed the prices of fish analyzers. It's supposed to be 150 cr, not
500.
map: Added an aquarium kit to each station, found in the room where the
service techfab and order console also are.
qol: Aquarium kits are now compatible with slapcrafting (crafted by
hitting them with the required material without opening the menu).
balance: Moved the aquarium kit and fish supply packs from the "General"
section to "Service" and "Livestock" respectively, meaning they can be
ordered for free from the service orders console.
/:cl:

* Aquariums now have an internal feed storage. Fish catalogs as 25cr goodies.

* UpdatePaths

---------

Co-authored-by: Ghom <[email protected]>
Co-authored-by: Giz <[email protected]>
@AnywayFarus AnywayFarus merged commit d7976cd into master Oct 23, 2023
23 checks passed
@AnywayFarus AnywayFarus deleted the upstream-mirror-24488 branch October 23, 2023 08:06
Iajret pushed a commit that referenced this pull request Jan 3, 2024
* Refactors Crystal Warp Theme datum to use Dimensional Theme datum (#80661)

## About The Pull Request

`/datum/crystal_warp_theme` and `/datum/dimension_theme` both do very
similar, if not identical behaviors, so we can combine them pretty
painlessly.

## Why It's Good For The Game

This gives the crystal more options for themes to pick from, and the
dimensional anomaly more wacky themes to pick from.

## Changelog

:cl: Melbert
refactor: Refactored the area transformation colossus crystal effect to
use the same system dimensional anomalies use. That means the colossus
crystal now has access to some dimensional themes (bamboo, plasma,
glass) and the dimensional anomaly now has access to some colossus
themes (jungle, alien).
/:cl:

* Refactors Crystal Warp Theme datum to use Dimensional Theme datum

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants