[Ready to merge] Au-toy-lathe (#5534)
* 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.
This commit is contained in:
@@ -458,6 +458,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
|
||||
desc = "Compress dinosaur over millions of years, then refine, split and mold, and voila! You have plastic."
|
||||
singular_name = "plastic sheet"
|
||||
icon_state = "sheet-plastic"
|
||||
materials = list(MAT_PLASTIC=MINERAL_MATERIAL_AMOUNT)
|
||||
throwforce = 7
|
||||
merge_type = /obj/item/stack/sheet/plastic
|
||||
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
icon_state = "waterballoon-e"
|
||||
item_state = "balloon-empty"
|
||||
|
||||
|
||||
/obj/item/toy/balloon/New()
|
||||
create_reagents(10)
|
||||
..()
|
||||
@@ -287,7 +286,6 @@
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
|
||||
/obj/item/toy/windupToolbox
|
||||
name = "windup toolbox"
|
||||
desc = "A replica toolbox that rumbles when you turn the key."
|
||||
@@ -334,7 +332,7 @@
|
||||
|
||||
/obj/item/toy/katana
|
||||
name = "replica katana"
|
||||
desc = "Woefully underpowered in D20."
|
||||
desc = "Woefully underpowered in D20. Almost has a sharp edge."
|
||||
icon = 'icons/obj/items_and_weapons.dmi'
|
||||
icon_state = "katana"
|
||||
item_state = "katana"
|
||||
|
||||
Reference in New Issue
Block a user