Refactors the code for Microwaves, Ovens, Grills, and Candy Makers to
utilize a shared parent which holds the common procs.
- This means any new additions or fixes will only need to be implemented
in one place, rather than 4, to affect them all.
- Also reduces file sizes on the individual machines' files by removing
a lot of the duplicate code
Updated the code for the kitchen machines to be more modular and fixed
some issues.
- Replaced color macros with span classes
- Replaced hardcoded names with src references
- Each machine has a cook_verbs list which is used to create the in use
message (Microwaving in progress)
- Each machine has variables to define the icon states for the different
states of the machine (on, off, broken, dirty, open).
- Changed a few formerly global variables to not be global, as this
would cause issues with the shared code (microwave with candy maker
recipes for example)
Fixed a bug where the microwave would be considered "full" before having
all of the ingredients for a recipe
- Created a new proc to count the number of items and fruits in a recipe
to determine the max_n_items value
Map Edits to Cyberiad and associated Z-levels for pathing changes
(map-merged)
- MetaStation will need to be updated as well, I'll do this in another
PR unless someone else beats me to it.
This commit does the following:
- Fixed MetaStation Compile (Pandemic board removed)
- Updated Blueshield's office to the latest Cyberiad version
- Updated NanoTrasen Representative's office to the latest Cyberiad
version
- Fixed a minor area issue in arrivals
- Placed the mechanic's podbay in maintnance above Engineering
- Moved mechanic's spawn point to mechanic's podbay
Fixes the reagent grinder machines not properly grinding tomato into
ketchup and rice into rice
Updates botany code to use qdel over del to help alleviate potential lag
from del calls
Removes the PanDEMIC 2200 board from Tech Storage and the Circuit
Imprinter, as the computer it builds has been commented out for a long
time. Also deletes the commented out code (over 250 lines of commented
out code deleted)
This fixes the wardrobe base type creating items, which was fine when
wardrobes didn't call their parent's New proc, but was causing literally
every wardrobe to contain some junk now that they do.
The base wardrobe type's items have been moved to a new "generic"
wardrobe, which is now used in the derelicts and an unused away mission,
replacing mapped instances of the base type.
Fixes a number of space vents not being connected to pipes, should let
them function as intended.
- Also replaced their vents with "On" vents, just to be sure
Tweaked the configuration of the incinerator's pipes, general
functionality unchanged.
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
I've moved the photocopiers and newscasters in both rooms. It was previously difficult to access the newscasters and light fixtures, should be much easier now.
Also changed the direction of a scrubber in the Blueshield's office, as it was facing the wrong direction.
This commit modifies metastation to actually be playable on our code
Squashed Commits:
- [META] Fixes emergency shuttle being stuck
- Toxins Mixing fix: chamber floor > engine
- Adds research outpost + Chem lab to routpost
- Add vox raider ship, fix pods and a few shuttle zones.
- Remove step_x so TRAVIS likes it
- Finish spawn points, add telepad.
- Replace showroom with NT-rep/Blueshield Office
Don't worry, the nuke keg is in the meeting room.
- Convert art storage to barber shop, place artvend in tool storage
- Buncha medbay tweaks, 2nd surgery table, body scanners, fixed sleepers,
minor balance changes.
- Add Mr. Changs to dorms
- Update meta to latest paracode
- Fix punpun
- Atmos volume pumps, atmos control console
- Add chicken statue to Mr. Chang's (*cry), Bar smartfridge
- Fix mr. changs statue and chairs
- Add togglable polarized windows to surgery, so surgeons can prevent seeing
other surgery procedures if necessary
- Actually add atmos control comp
- Hydro trays are no longer dirt
- Fix brig windoors
- Fix escape shuttle sleepers
