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.
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
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.
Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard
Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds
Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.
Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.
This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
Portable generators properly drop their fuel when deconstructed
Portable generators need their cover open to be destructed now
Fixed a runtime error when building a portable generator with a 2s wire
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.
To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"
If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
-Sorted the dispensable chemicals list alphabetically.
-Made the chemical dispenser use process() instead of calling itself in a spawn()
-Made the receiver and broadcaster easier to build (less parts)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4256 316c924e-a436-60f5-8080-3fe189b3f50e
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.
r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds
[VGTG]
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
You can now access a hidden maintenance interface in all the telecomm machinery by using a Multitool on them.
You can now build telecommunication machines, albeit they require a substantial amount of research and materials to make. Added in a few new stock parts constructable in the R&D Protolathe.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2844 316c924e-a436-60f5-8080-3fe189b3f50e
Doubled the burntime for candles.
I did test these, but knowing my luck, something else broke.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2235 316c924e-a436-60f5-8080-3fe189b3f50e
-Various item have had their tech origins updated or added to.
-Items that just use metal or glass have their materials origin lowered
-Items that use more advance materials have their materials tech origin raised to equal the uncommon material.
Engineering Tech research:
-Engineering tech origin, because Materials tech origin is just for being able to manipulate rare/ new materials for production.
-Engineering tech field focuses on various engineering items, and will increase in scale as time goes on.
-Various items (especially tools and mech parts) use the engineering tech origin.
Mining tools update:
- Drills can dig up sand.
- Plasma cutters can cut down walls and girders, and set fire to thermite, and be used in the reinforced wall deconstruction stages in place of the welder.
- Diamond drills can drill though walls, and girders, and can drill through the plating of reinforced walls.
Tech Origin changes and Circuit boards:
-If it requires a special material to make, it now have a materials origin equal to that special material. General glass circuit boards do not require materials research.
-Engineering research should be applied (reasonably) to the board if it is a machine, computers should stick to programing (even if the computer is related to an engineering field).
-Still a work in progress, as always.
Last update:
-Shovel sprite is back to being a digging shovel in style, a scooping shovel is terrible at digging. I should know, I've dug many holes in my days, and a scooping shovel is terrible, and a spade head is much better.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1654 316c924e-a436-60f5-8080-3fe189b3f50e
- Added design for mech fabricator circuitboard.
- Added origin_tech for some mech equipment.
- Examining mecha chassis will show what construction step you're currently on.
- Made Gygax construction reversible.
- Moved global_iterator.dm and construction_datum.dm to code/datums/helper_datums
- Split mecha_construction.dm into mecha_parts.dm and mecha_construction_paths.dm
- Fixed wrong logic for mecha dna-checks.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1402 316c924e-a436-60f5-8080-3fe189b3f50e
- Added a new trait to cameras: Hardened. Hardened is a modifier to the chance a camera will be affected by an EMP. By default, all cameras are affected 100% of the time by a full strength EMP. Will add some hardening to existing cameras once some pending map changes get finished.
- New R&D Invention: LARGE GRENADES. You can now put basically any container (except blender jugs) into it and they affect a larger area. Want a 100 x 100 unit grenade? You now can! The basic casings are made in a protolathe (Materials 3, Combat 3). Unless you've developed them a lot, you'll occasionally get duds (which just spits out the beakers). Duds can be deconstructed in the DA to improve reliability.
- On a related note, an unintended side effect of making large beakers hold more has been fixed.
- Constructible frames, after the circuit board has been inserted, can be right-click/examined to reveal what parts it needs to be finished.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1146 316c924e-a436-60f5-8080-3fe189b3f50e
- Fixed some machine-board design issues. Mainly that they make the machine rather then the board :x
- Autolathe, Protolathe and Circuit Imprinter now dump out any materials you stored in it if you dismantle them. Reagents get dumped into any beakers that were required to make the damn thing in the first place.
- AI upload computer can now be deconstructed. However, it can't be deconstructed unless you right click and select "accessinternals." Otherwise, it disassembles like a normal computer.
- Circuit Imprinter now accepts gold and diamond sheets. Bling bling.
- AI modules now require gold and/or diamond to be constructed.
- Server Room rearrange. Also, server room has a "lobby" area where you can go without freezing/suffocating.
- New "R&D Server" and "Server Control" control computer added to the server room. Instead of uploading to eachother, R&D consoles now upload to all servers they have access rights to and download from all servers they have download rights from. New R&D consoles have no upload or download rights but any that start on the map at round start do. The new console allows for the changing of server access and manipulation of server data. Servers can also be hacked. This can result in either the device being disabled (can't upload/download data), hacked (any console can download data from it), or electrified (derp, ow). The Server Control console also can delete data from servers.
- R&D Console's "Connect/Disconnect" from network setting determines whether it shows up on the Server Control's menu when looking at what devices it can give/take server access from. Note: The server room and the server control needs RD access. If you don't have that, that's what emags are for :3
- ADMIN NOTE: There is also a master Server and Server Control on centcom. Whenever data is sync'ed to the network, it automatically uploads (but not downloads) data from the centcom server. This is so that if a griffan destroys the servers on the station, you can restore the lost progress. Only the centcom Server control can transfer data between servers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1140 316c924e-a436-60f5-8080-3fe189b3f50e
- Uranium coins can now be produced from the mint. You can also produce more then 10 coins at a time.
- Two new more advanced versions of the PACMAN type portable generator: SUPERPACMAN (runs off of uranium coins, produces ~10,000 power base; requires Materials 5 and power tech 4) and MRSPACMAN (runs off of diamond coins, produces ~20,000 power base; requires materials 6 and power tech 5). Construction nearly identical to the basic PACMAN generator.
- Fixed some R&D bugs. Always forgetting something. Copy/paste is the devil.
- Tweaked nuclear gun slightly. I need to make a better R&D readme one of these days...
- Tier 3 stock parts added. These often require rare mateirals (such as from mining) and aren't 100% reliable. However, they do allow some machines to become quite powerful...
Note: Since I forgot it in the last update: To use the generators, you have to wrench them into place over a wire connected to the powergrid you want to pump power
into.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1116 316c924e-a436-60f5-8080-3fe189b3f50e
- PACMAN-type portable power generator now producable through the R&D system. You insert solid plasma coins (minted from solid plasma which you get from miners) into the generator and when you turn it on, it produces power (~5000 for a baseline model). Useful for powering small powernets/rooms. More powerful generators will be added eventually. To unlock the design, you need Plasma Technology 2 and Power Storage 3. To construct, it's 5 metal (Machine Frame) => cable => PACMAN board => 1 matter bin, 1 micro laser, 2 pieces of cable, and a capacitor => Screwdriver to finish. Screwdriver => Crowbar to start the deconstruction process. If not 100% reliable, the device will break down eventually.
- R&D console disk commands now actually work. Derp.
- In the R&D console settings menu, you can reset the console's R&D database to the default data. Make sure to backup data onto disk if you don't want to lose it!
- Instruction manuals in mech_construction.dm and mining.dm moved to code\game\objects\items\weapons\manuals.dm to make them easier to find. Condensed down some of the redundant code.
- R&Dinstruction manual added to the R&D lab.
- Fixed a pair of Destructive Analyzer bugs. If an object contains a mob (such as an intellicard with an AI in it), it runs the death routine for that mob.
- Protolathe now accepts uranium. GO FORTH, COMRADES.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1114 316c924e-a436-60f5-8080-3fe189b3f50e
