From e71d23fc39d27e41e1bc43b0102adbc01a7e2064 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sun, 29 Dec 2019 02:51:49 -0500 Subject: [PATCH] more fixes --- .../game/objects/items/stacks/sheets/glass.dm | 2 +- code/modules/crafting/glassware.dm | 111 +++++++++--------- 2 files changed, 54 insertions(+), 59 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index b5fdf0c23e..e30956265b 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ null, \ new/datum/stack_recipe_list("glass working bases", list( \ new/datum/stack_recipe("chem dish", /obj/item/glasswork/glass_base/dish, 10), \ - new/datum/stack_recipe("lens", /obj/item/glasswork/glass_base/lens, 15), \ + new/datum/stack_recipe("lens", /obj/item/glasswork/glass_base/glass_lens, 15), \ new/datum/stack_recipe("spout flask", /obj/item/glasswork/glass_base/spouty, 20), \ new/datum/stack_recipe("small bulb flask", /obj/item/glasswork/glass_base/flask_small, 5), \ new/datum/stack_recipe("large bottle flask", /obj/item/glasswork/glass_base/flask_large, 15), \ diff --git a/code/modules/crafting/glassware.dm b/code/modules/crafting/glassware.dm index e0508dd571..2bea9b4f7c 100644 --- a/code/modules/crafting/glassware.dm +++ b/code/modules/crafting/glassware.dm @@ -27,7 +27,6 @@ desc = "A sheet of glass set aside for glass working" icon_state = "glass_base" var/next_step = null - var/make = null var/rod = /obj/item/glasswork/blowing_rod /obj/item/lens @@ -43,8 +42,7 @@ /obj/item/glasswork/glass_base/dish name = "Glass Fodder Sheet" desc = "A set of glass sheets set aside for glass working, this one is ideal for a small glass dish. Needs to be cut with some tools." - next_step = /obj/item/glasswork/glass_base/dish/part1 - make = /obj/item/reagent_containers/glass/beaker/glass_dish + next_step = /obj/item/glasswork/glass_base/dish_part1 /obj/item/glasswork/glass_base/dish/attackby(obj/item/I, mob/user, params) ..() @@ -52,15 +50,16 @@ new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/dish/part1 +/obj/item/glasswork/glass_base/dish_part1 name = "Half Chem Dish Sheet" desc = "A sheet of glass cut in half, looks like it still needs some more cutting down" icon_state = "glass_base_half" + next_step = /obj/item/reagent_containers/glass/beaker/glass_dish -/obj/item/glasswork/glass_base/dish/part1/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/dish_part1/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_GLASS_CUT) - new make(user.loc, 1) + new next_step(user.loc, 1) qdel(src) //////////////////////Lens////////////////////////// @@ -72,87 +71,86 @@ /obj/item/glasswork/glass_base/glass_lens name = "Glass Fodder Sheet" desc = "A set of glass sheets set aside for glass working, this one is ideal for a small glass lens. Needs to be cut with some tools." - next_step = /obj/item/glasswork/glass_base/glass_lens/part1 - make = /obj/item/lens + next_step = /obj/item/glasswork/glass_base/glass_lens_part1 -/obj/item/glasswork/glass_base/lens/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_GLASS_CUT) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/glass_lens/part1 +/obj/item/glasswork/glass_base/glass_lens_part1 name = "Glass Fodder Sheet" desc = "Cut glass ready to be heated. Needs to be heated with some tools." icon_state = "glass_base_half" - next_step = /obj/item/glasswork/glass_base/glass_lens/part2 + next_step = /obj/item/glasswork/glass_base/glass_lens_part2 -/obj/item/glasswork/glass_base/glass_lens/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens_part1/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_WELDER) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/glass_lens/part2 +/obj/item/glasswork/glass_base/glass_lens_part2 name = "Glass Fodder Sheet" desc = "Cut glass that has been heated. Needs to be heated more with some tools." icon_state = "glass_base_heat" - next_step = /obj/item/glasswork/glass_base/glass_lens/part3 + next_step = /obj/item/glasswork/glass_base/glass_lens_part3 -/obj/item/glasswork/glass_base/glass_lens/part2/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens_part2/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_WELDER) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/glass_lens/part3 +/obj/item/glasswork/glass_base/glass_lens_part3 name = "Glass Fodder Sheet" desc = "Cut glass that has been heated into a blob of hot glass. Needs to be placed onto a blow tube." icon_state = "glass_base_molding" - next_step = /obj/item/glasswork/glass_base/glass_lens/part4 + next_step = /obj/item/glasswork/glass_base/glass_lens_part4 -/obj/item/glasswork/glass_base/glass_lens/part3/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens_part3/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_BLOW) new next_step(user.loc, 1) qdel(src) qdel(I) -/obj/item/glasswork/glass_base/glass_lens/part4 +/obj/item/glasswork/glass_base/glass_lens_part4 name = "Glass Fodder Sheet" desc = "Cut glass that has been heated into a blob of hot glass. Needs to be cut off onto a blow tube." icon_state = "blowing_rods_inuse" - next_step = /obj/item/glasswork/glass_base/glass_lens/part5 + next_step = /obj/item/glasswork/glass_base/glass_lens_part5 -/obj/item/glasswork/glass_base/glass_lens/part4/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens_part4/attackby(obj/item/I, mob/user, params) ..() if(tool_behaviour == TOOL_GLASS_CUT) new next_step(user.loc, 1) new rod(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/glass_lens/part5 +/obj/item/glasswork/glass_base/glass_lens_part5 name = "Unpolished glass lens" desc = "A small unpolished glass lens. Could be polished with some cloth." icon_state = "glass_optics" - next_step = /obj/item/glasswork/glass_base/glass_lens/part6 + next_step = /obj/item/glasswork/glass_base/glass_lens_part6 -/obj/item/glasswork/glass_base/glass_lens/part5/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens_part5/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/sheet/cloth)) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/glass_lens/part6 +/obj/item/glasswork/glass_base/glass_lens_part6 name = "Unrefined glass lens" desc = "A small polished glass lens. Just needs to be refined with some sandstone." icon_state = "glass_optics" - next_step = null + next_step = /obj/item/lens -/obj/item/glasswork/glass_base/glass_lens/part6/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glass_lens_part6/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/sheet/mineral/sandstone)) - new make(user.loc, 1) + new next_step(user.loc, 1) qdel(src) //////////////////////Spouty Flask////////////////// @@ -164,8 +162,7 @@ /obj/item/glasswork/glass_base/spouty name = "Glass Fodder Sheet" desc = "A set of glass sheets set aside for glass working, this one is ideal for a spout beaker. Needs to be cut with some tools." - next_step = /obj/item/glasswork/glass_base/spouty/part2 - make = /obj/item/reagent_containers/glass/beaker/flaskspouty + next_step = /obj/item/glasswork/glass_base/spouty_part2 /obj/item/glasswork/glass_base/spouty/attackby(obj/item/I, mob/user, params) ..() @@ -173,41 +170,41 @@ new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/spouty/part2 +/obj/item/glasswork/glass_base/spouty_part2 name = "Glass Fodder Sheet" desc = "Cut glass that has been heated. Needs to be heated with some tools." icon_state = "glass_base_half" - next_step = /obj/item/glasswork/glass_base/spouty/part3 + next_step = /obj/item/glasswork/glass_base/spouty_part3 -/obj/item/glasswork/glass_base/spouty/part2/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/spouty_part2/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_WELDER) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/spouty/part3 +/obj/item/glasswork/glass_base/spouty_part3 name = "Glass Fodder Sheet" desc = "Cut glass that has been heated into a blob of hot glass. Needs to be placed onto a blow tube." icon_state = "glass_base_molding" - next_step = /obj/item/glasswork/glass_base/spouty/part4 + next_step = /obj/item/glasswork/glass_base/spouty_part4 -/obj/item/glasswork/glass_base/glass_lens/part3/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/spouty_part3/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_BLOW) new next_step(user.loc, 1) qdel(src) qdel(I) -/obj/item/glasswork/glass_base/spouty/part4 +/obj/item/glasswork/glass_base/spouty_part4 name = "Glass Fodder Sheet" desc = "Cut glass that has been heated into a blob of hot glass. Needs to be cut off onto a blow tube." icon_state = "blowing_rods_inuse" - next_step = null + next_step = /obj/item/reagent_containers/glass/beaker/flaskspouty -/obj/item/glasswork/glass_base/spouty/part4/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/spouty_part4/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_GLASS_CUT) - new make(user.loc, 1) + new next_step(user.loc, 1) new rod(user.loc, 1) qdel(src) @@ -220,8 +217,7 @@ /obj/item/glasswork/glass_base/flask_small name = "Glass Fodder Sheet" desc = "A set of glass sheets set aside for glass working, this one is ideal for a small flask. Needs to be heated with some tools." - next_step = /obj/item/glasswork/glass_base/flask_small/part1 - make = /obj/item/reagent_containers/glass/beaker/flask_small + next_step = /obj/item/glasswork/glass_base/flask_small_part1 /obj/item/glasswork/glass_base/flask_small/attackby(obj/item/I, mob/user, params) ..() @@ -229,29 +225,29 @@ new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/flask_small/part1 +/obj/item/glasswork/glass_base/flask_small_part1 name = "Metled Glass" desc = "A blob of metled glass, this one is ideal for a small flask. Needs to be blown with some tools." icon_state = "glass_base_molding" - next_step = /obj/item/glasswork/glass_base/flask_small/part2 + next_step = /obj/item/glasswork/glass_base/flask_small_part2 -/obj/item/glasswork/glass_base/flask_small/part1/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/flask_small_part1/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_BLOW) new next_step(user.loc, 1) qdel(src) qdel(I) -/obj/item/glasswork/glass_base/flask_small/part2 +/obj/item/glasswork/glass_base/flask_small_part2 name = "Metled Glass" desc = "A blob of metled glass on the end of a blowing rod. Needs to be cut off with some tools." icon_state = "blowing_rods_inuse" - next_step = null + next_step = /obj/item/reagent_containers/glass/beaker/flask_small -/obj/item/glasswork/glass_base/flask_small/part2/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/flask_small_part2/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_GLASS_CUT) - new make(user.loc, 1) + new next_step(user.loc, 1) new rod(user.loc, 1) qdel(src) @@ -264,8 +260,7 @@ /obj/item/glasswork/glass_base/flask_large name = "Glass Fodder Sheet" desc = "A set of glass sheets set aside for glass working, this one is ideal for a large flask. Needs to be heated with some tools." - next_step = /obj/item/glasswork/glass_base/flask_large/part1 - make = /obj/item/reagent_containers/glass/beaker/flask_large + next_step = /obj/item/glasswork/glass_base/flask_large_part1 /obj/item/glasswork/glass_base/flask_large/attackby(obj/item/I, mob/user, params) ..() @@ -273,28 +268,28 @@ new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/glass_base/flask_large/part1 +/obj/item/glasswork/glass_base/flask_large_part1 name = "Metled Glass" desc = "A blob of metled glass, this one is ideal for a large flask. Needs to be blown with some tools." icon_state = "glass_base_molding" - next_step = /obj/item/glasswork/glass_base/flask_large/part2 + next_step = /obj/item/glasswork/glass_base/flask_large_part2 -/obj/item/glasswork/glass_base/flask_large/part1/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/flask_large_part1/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_BLOW) new next_step(user.loc, 1) qdel(src) qdel(I) -/obj/item/glasswork/glass_base/flask_large/part2 +/obj/item/glasswork/glass_base/flask_large_part2 name = "Metled Glass" desc = "A blob of metled glass on the end of a blowing rod. Needs to be cut off with some tools." icon_state = "blowing_rods_inuse" - next_step = null + next_step = /obj/item/reagent_containers/glass/beaker/flask_large -/obj/item/glasswork/glass_base/flask_large/part2/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/flask_large_part2/attackby(obj/item/I, mob/user, params) ..() if(I.tool_behaviour == TOOL_GLASS_CUT) - new make(user.loc, 1) + new next_step(user.loc, 1) new rod(user.loc, 1) qdel(src)