mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-08 16:41:58 +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
85 lines
2.0 KiB
Plaintext
85 lines
2.0 KiB
Plaintext
/obj/item/weapon/vending_refill
|
|
name = "resupply canister"
|
|
var/machine_name = "Generic"
|
|
|
|
icon = 'icons/obj/vending_restock.dmi'
|
|
icon_state = "refill_snack"
|
|
item_state = "restock_unit"
|
|
flags = CONDUCT
|
|
force = 7.0
|
|
throwforce = 10.0
|
|
throw_speed = 1
|
|
throw_range = 7
|
|
w_class = 4.0
|
|
|
|
var/charges = 0 //how many restocking "charges" the refill has
|
|
|
|
/obj/item/weapon/vending_refill/New(amt = -1)
|
|
..()
|
|
name = "\improper [machine_name] restocking unit"
|
|
if(isnum(amt) && amt > -1)
|
|
charges = amt
|
|
|
|
/obj/item/weapon/vending_refill/examine(mob/user)
|
|
..()
|
|
if(charges)
|
|
user << "It can restock [charges] item(s)."
|
|
else
|
|
user << "It's empty!"
|
|
|
|
//NOTE I decided to go for about 1/3 of a machine's capacity
|
|
|
|
/obj/item/weapon/vending_refill/boozeomat
|
|
machine_name = "Booze-O-Mat"
|
|
icon_state = "refill_booze"
|
|
charges = 46//of 138
|
|
|
|
/obj/item/weapon/vending_refill/coffee
|
|
machine_name = "hot drinks"
|
|
icon_state = "refill_joe"
|
|
charges = 28//of 85
|
|
|
|
/obj/item/weapon/vending_refill/snack
|
|
machine_name = "Getmore Chocolate Corp"
|
|
charges = 16//of 48
|
|
|
|
/obj/item/weapon/vending_refill/cola
|
|
machine_name = "Robust Softdrinks"
|
|
icon_state = "refill_cola"
|
|
charges = 21//of 65
|
|
|
|
/obj/item/weapon/vending_refill/cigarette
|
|
machine_name = "cigarette"
|
|
icon_state = "refill_smoke"
|
|
charges = 9// of 30
|
|
|
|
/obj/item/weapon/vending_refill/autodrobe
|
|
machine_name = "AutoDrobe"
|
|
icon_state = "refill_costume"
|
|
charges = 19// of 58
|
|
|
|
/obj/item/weapon/vending_refill/hatdispenser
|
|
machine_name = "hat"
|
|
icon_state = "refill_costume"
|
|
charges = 18// of 56
|
|
|
|
/obj/item/weapon/vending_refill/suitdispenser
|
|
machine_name = "suit"
|
|
icon_state = "refill_costume"
|
|
charges = 68// of 206
|
|
|
|
/obj/item/weapon/vending_refill/shoedispenser
|
|
machine_name = "shoe"
|
|
icon_state = "refill_costume"
|
|
charges = 30// of 91
|
|
|
|
/obj/item/weapon/vending_refill/clothing
|
|
machine_name = "ClothesMate"
|
|
icon_state = "refill_clothes"
|
|
charges = 20// of 62
|
|
|
|
/obj/item/weapon/vending_refill/crittercare
|
|
machine_name = "CritterCare"
|
|
icon_state = "refill_pet"
|
|
charges = 17// of 54
|