# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
* Autoylathe Complete.
All the errors with the autoylathe should be fixed for now
* Toylathe Tweaking and plastic's initializing.
Well, this gets plastics halfway there. The toylathe now has 8 categories to choose from and some other sutff. It's all coming back.
* TOY LATHE NOW ACCEPTING PLASTIC
TOYLATHE IS WORKING AND RUNNING PROPERLY. SOME GUNS HAVE BEEN ADDED AND WILL NEED MORE TIME TO ADD MORE GUNS.
* Toy Datum construction.
Building some datums for the toys for the autoylathe to print.
* Toys toys toys
Adding toys to the list woo
* Autoylathe complete.
Holy shit it's fucking done.
* Fixes a duplicate id.
Also adds some shit to the hacked list.
* Okay this shit needs to stop
Rogue indentations? Nani?
* ugh
fuck
* Rogue indents
* Power issues
Fixes power scaling and the draining an APC
* Rogue File deletion.
Part of an early experiment that didn't work out.
* Some other tweaks and shit
Moves datums to the autoylathe designs and also fixes a dumb mistake I made.
* Clamps?
Added a clamp. Who knew?
* Shit.
Won't compile if it keeps looking for a file that doesn't exist
* Woops
Deleted a line not paying attention
* reworked initialize
I think I did this right.
* Revert "reworked initialize"
This reverts commit 649c156baebd64b6cd84e95f2f4c3cbd70dabce7.
* Odd variables that don't have any other references in the coding.
Why are these even here? Seriously.
* UNUSED VARIABLE?!
NANI?! Deleted. Don't need em.
* Steampunk Watches! (#35187)
* Adds steampunk watches
* Adds steampunk watches to arcade machines
* The steampunk watch can now play a noise!
* Steampunk Watches!
