Aquariums and Pet Rocks!

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

code/game/objects/items/stacks/sheets/glass.dm

@@ -68,7 +68,7 @@
 		return 0
 	var/title = "Sheet-Glass"
 	title += " ([src.amount] sheet\s left)"
-	switch(alert(title, "Would you like full tile glass or one direction?", "One Direction", "Full Window", "Cancel", null))
+	switch(input(title, "What would you like to construct?") in list("One Direction Window", "Full Window", "Fishbowl", "Fish Tank", "Wall Aquarium", "Cancel"))
 		if("One Direction")
 			if(!src)	return 1
 			if(src.loc != user)	return 1
@@ -118,6 +118,24 @@
 			W.anchored = 0
 			W.air_update_turf(1)
 			src.use(2)
+		if("Fish Tank")
+			if(!src)	return 1
+			if(src.loc != user)	return 1
+			if(src.amount < 3)
+				user << "\red You need more glass to do that."
+				return 1
+			var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/tank(user.loc, 0)
+			F.air_update_turf(1)
+			src.use(3)
+		if("Wall Aquarium")
+			if(!src)	return 1
+			if(src.loc != user)	return 1
+			if(src.amount < 4)
+				user << "\red You need more glass to do that."
+				return 1
+			var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/wall(user.loc, 0)
+			F.air_update_turf(1)
+			src.use(4)
 	return 0
 
 

code/game/objects/items/toys.dm

@@ -1365,4 +1365,27 @@ obj/item/toy/cards/deck/syndicate/black
 	new /obj/item/toy/character/thief(src)
 	new /obj/item/toy/character/wizard(src)
 	new /obj/item/toy/character/cthulhu(src)
-	new /obj/item/toy/character/lich(src)
+	new /obj/item/toy/character/lich(src)
+
+
+//Pet Rocks, just like from the 70's!
+
+/obj/item/toy/pet_rock
+	name = "pet rock"
+	desc = "The perfect pet!"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "pet_rock"
+	w_class = 2
+	force = 5
+	throwforce = 5
+	attack_verb = list("attacked", "bashed", "smashed", "stoned")
+
+/obj/item/toy/pet_rock/fred
+	name = "fred"
+	desc = "Fred, the bestest boy pet in the whole wide universe!"
+	icon_state = "fred"
+
+/obj/item/toy/pet_rock/roxie
+	name = "roxie"
+	desc = "Roxie, the bestest girl pet in the whole wide universe!"
+	icon_state = "roxie"

code/game/objects/items/weapons/vending_items.dm

@@ -76,4 +76,9 @@
 /obj/item/weapon/vending_refill/clothing
 	machine_name = "ClothesMate"
 	icon_state = "refill_clothes"
-	charges = 20// of 62
+	charges = 20// of 62
+
+/obj/item/weapon/vending_refill/crittercare
+	machine_name = "CritterCare"
+	icon_state = "refill_pet"
+	charges = 17// of 54