mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-04 14:42:56 +00:00
9074629123
Adds fishbowls, fish tanks, and wall aquariums. - Buildable with glass - Fish Tanks and Wall Aquariums also have built-in lights that can be toggled - Wall Aquariums block atmos just like a full window or wall. Adds fish and fish/aquarium related items: - Goldfish, Clownfish, Sharks, and Baby Space Carp - Eggs can be obtained for each of these fish types and a dud egg type. - Fish food, fish nets, egg scoops, tank brushes - These are used to maintain your aquarium Adds new vendor: CritterCare! - Sells pet supplies and pet rocks! - Moved pet collars from the clothing machine into the CritterCare Adds new room/area: Pet Store! - Located between the Port Emergency Storage and Auxilary Tool Storage (across from the Vault) - Contains a CritterCare machine, 2 fishbowls, a bucket, and a sink Adjusts some Cargo order options! - New category: Vending - Contains all the vending machine refill crates - Renamed the Bartending Supply Crate to Bar Supply Crate to avoid confusion - Removes the coffee refill canisters from the Bar Supply Crate, placed them into the new Coffee Supply Crate - Adds new Clothing Supply Crate, contains refill canisters for the Hatlord 9000, Suitlord 9000, Shoelord 9000, and ClothesMate vendors - Adds new Pet Supply Crate, contains refill canisters for the new CritterCare vendor Makes the ClothesMate and CritterCare vendors constructable - Using a screwdriver on a vendor circuitboard will now have a chance to set it to the ClothesMate or CritterCare setting, in addition to the previously possible settings like Booze-o-mat and Shoelord 9000. New reagent: Fishwater - Obtained by using an empty reagent_container on any aquarium that has some water in it. - Ingesting fishwater has a 30% chance per cycle to make you vomit (what did you expect from dirty water and fish poo?) - Fishwater is good for botany, as it provides both water and nutrients to hydro trays ADDITIONAL FIXES! - Fixes the abandoned bar's misaligned area (mostly a mapper thing, will also ensure an APC in the area will properly power the entire area (and not space) - Fixes a couple instances of piping mistakes where there were manifolds and straight pipes on the same tile, preventing vent-crawlers from being able to navigate properly - One was in security, another was the back room of hydroponics - Fixed a missing pipe in the AI upload causing the vent to be disconnected from the pipe network
43 lines
1.2 KiB
Plaintext
43 lines
1.2 KiB
Plaintext
|
|
/obj/item/fish_eggs
|
|
name = "fish eggs"
|
|
desc = "Eggs laid by a fish. This cluster seems... empty?"
|
|
icon = 'icons/obj/fish_items.dmi'
|
|
icon_state = "eggs"
|
|
w_class = 2.0
|
|
var/fish_type = null //Holds the name of the fish that the egg is for
|
|
|
|
/obj/item/fish_eggs/New()
|
|
..()
|
|
|
|
var/global/list/fish_eggs_list = list("dud" = /obj/item/fish_eggs,
|
|
"goldfish" = /obj/item/fish_eggs/goldfish,
|
|
"clownfish" = /obj/item/fish_eggs/clownfish,
|
|
"shark" = /obj/item/fish_eggs/shark,
|
|
"babycarp" = /obj/item/fish_eggs/babycarp,
|
|
)
|
|
|
|
/obj/item/fish_eggs/goldfish
|
|
name = "goldfish eggs"
|
|
desc = "Goldfish eggs, surprisingly, don't contain actual gold."
|
|
icon_state = "gold_eggs"
|
|
fish_type = "goldfish"
|
|
|
|
/obj/item/fish_eggs/clownfish
|
|
name = "clownfish eggs"
|
|
desc = "Even as eggs, they are funnier than the clown. HONK!"
|
|
icon_state = "clown_eggs"
|
|
fish_type = "clownfish"
|
|
|
|
/obj/item/fish_eggs/shark
|
|
name = "shark eggs"
|
|
desc = "We're gonna need a- Oh wait, they're still eggs."
|
|
icon_state = "shark_eggs"
|
|
fish_type = "shark"
|
|
|
|
/obj/item/fish_eggs/babycarp
|
|
name = "baby space carp eggs"
|
|
desc = "Eggs from the substantially smaller form of the intergalactic terror."
|
|
icon_state = "babycarp_eggs"
|
|
fish_type = "babycarp"
|