From b350436fbce3e3240bf2e976f5b6729f95ea70c5 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Tue, 7 Apr 2020 18:31:23 -0400 Subject: [PATCH] working --- .../crafting/glassware/glassware.dm | 3 +- .../crafting/glassware/lens_crafting.dm | 64 +++++++++---------- .../items/stacks/sheets/sheet_types.dm | 2 +- code/modules/cargo/exports/parts.dm | 2 +- 4 files changed, 34 insertions(+), 37 deletions(-) diff --git a/code/datums/components/crafting/glassware/glassware.dm b/code/datums/components/crafting/glassware/glassware.dm index cf57dac7ce..2b57837c5d 100644 --- a/code/datums/components/crafting/glassware/glassware.dm +++ b/code/datums/components/crafting/glassware/glassware.dm @@ -163,12 +163,11 @@ desc = "A small polished glass lens. Just needs to be refined with some sandstone." icon = 'icons/obj/glass_ware.dmi' icon_state = "glass_optics" - next_step = /obj/item/glasswork/lens + next_step = /obj/item/glasswork/glass_base/lens /obj/item/glasswork/glass_base/glass_lens_part6/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stack/sheet/mineral/sandstone)) - if(do_after(user,20, target = src)) new next_step(user.loc, 1) qdel(src) diff --git a/code/datums/components/crafting/glassware/lens_crafting.dm b/code/datums/components/crafting/glassware/lens_crafting.dm index 63e5385bbf..117df25a30 100644 --- a/code/datums/components/crafting/glassware/lens_crafting.dm +++ b/code/datums/components/crafting/glassware/lens_crafting.dm @@ -1,97 +1,95 @@ //This file is for crafting using a lens! -/obj/item/glasswork/lens +/obj/item/glasswork/glass_base/lens name = "Optical lens" desc = "Good for selling or crafting, by itself its useless" icon = 'icons/obj/glass_ware.dmi' icon_state = "glass_optics" //Laser pointers - 2600 -/obj/item/glasswork/laserpointer_shell +/obj/item/glasswork/glass_base/laserpointer_shell name = "Laser pointer assembly" desc = "Good for selling or crafting, by itself its useless. Needs a power capactor." icon_state = "laser_case" icon = 'icons/obj/glass_ware.dmi' - next_step = /obj/item/glasswork/laserpointer_shell_1 + next_step = /obj/item/glasswork/glass_base/laserpointer_shell_1 -/obj/item/glasswork/laserpointer_shell/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/laserpointer_shell/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/stock_parts/capacitor)) - if(do_after(user,60, target = src)) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/laserpointer_shell_1 +/obj/item/glasswork/glass_base/laserpointer_shell_1 name = "Laser pointer assembly" desc = "Good for selling or crafting, by itself its useless. Needs a glass lens." icon_state = "laser_wire" icon_state = "laser_case" - next_step = /obj/item/glasswork/laserpointer_shell_2 + next_step = /obj/item/glasswork/glass_base/laserpointer_shell_2 -/obj/item/glasswork/laserpointer_shell_1/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/laserpointer_shell_1/attackby(obj/item/I, mob/user, params) ..() - if(istype(I, /obj/item/glasswork/lens)) - if(do_after(user,60, target = src)) + if(istype(I, /obj/item/glasswork/glass_base/lens)) new next_step(user.loc, 1) qdel(src) -/obj/item/glasswork/laserpointer_shell_2 +/obj/item/glasswork/glass_base/laserpointer_shell_2 name = "Laser pointer assembly" desc = "Good for selling or crafting, by itself its useless. Needs to be screwed together." icon_state = "laser_wire" icon_state = "laser_case" next_step = /obj/item/laser_pointer/blue/handmade -/obj/item/glasswork/laserpointer_shell_2/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/laserpointer_shell_2/attackby(obj/item/I, mob/user, params) ..() - if(istype(I.tool_behaviour == TOOL_SCREW)) - if(do_after(user,60, target = src)) - new next_step(user.loc, 1) - qdel(src) + if(I.tool_behaviour == TOOL_SCREWDRIVER) + if(do_after(user,260, target = src)) + new next_step(user.loc, 1) + qdel(src) //NERD SHIT - 5000 -/obj/item/glasswork/glasses_frame +/obj/item/glasswork/glass_base/glasses_frame name = "Glasses Frame" desc = "Good for crafting a pare of glasses, by itself its useless. Just add a pare of lens." icon = 'icons/obj/glass_ware.dmi' icon_state = "frames" - next_step = /obj/item/glasswork/glasses_frame_1 + next_step = /obj/item/glasswork/glass_base/glasses_frame_1 -/obj/item/glasswork/glasses_frame/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glasses_frame/attackby(obj/item/I, mob/user, params) ..() - if(istype(I, /obj/item/glasswork/lens)) + if(istype(I, /obj/item/glasswork/glass_base/lens)) if(do_after(user,60, target = src)) - new next_step(user.loc, 1) - qdel(src) + new next_step(user.loc, 1) + qdel(src) -/obj/item/glasswork/glasses_frame_1 +/obj/item/glasswork/glass_base/glasses_frame_1 name = "Glasses Frame" desc = "Good for crafting a pare of glasses, by itself its useless. Just add a the other lens." icon = 'icons/obj/glass_ware.dmi' icon_state = "frames_1" - next_step = /obj/item/glasswork/glasses_frame_2 + next_step = /obj/item/glasswork/glass_base/glasses_frame_2 -/obj/item/glasswork/glasses_frame_1/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glasses_frame_1/attackby(obj/item/I, mob/user, params) ..() - if(istype(I, /obj/item/glasswork/lens)) + if(istype(I, /obj/item/glasswork/glass_base/lens)) if(do_after(user,60, target = src)) - new next_step(user.loc, 1) - qdel(src) + new next_step(user.loc, 1) + qdel(src) -/obj/item/glasswork/glasses_frame_2 +/obj/item/glasswork/glass_base/glasses_frame_2 name = "Glasses Frame" desc = "Good for crafting a pare of glasses, by itself its useless. Just adjust the pices into the frame with a screwdriver." icon = 'icons/obj/glass_ware.dmi' icon_state = "frames_2" next_step = /obj/item/glasswork/glasses -/obj/item/glasswork/laserpointer_shell_2/attackby(obj/item/I, mob/user, params) +/obj/item/glasswork/glass_base/glasses_frame_2/attackby(obj/item/I, mob/user, params) ..() - if(istype(I.tool_behaviour == TOOL_SCREW)) + if(I.tool_behaviour == TOOL_SCREWDRIVER) if(do_after(user,180, target = src)) - new next_step(user.loc, 1) - qdel(src) + new next_step(user.loc, 1) + qdel(src) /obj/item/glasswork/glasses name = "Hand Made Glasses" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 7446709012..45dc1b65ea 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -769,7 +769,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list( new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \ new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \ new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 10, time = 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/laserpointer_shell, 30, time = 10), \ + new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/glass_base/laserpointer_shell, 30), \ new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2))) /obj/item/stack/sheet/plastic diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm index 6714212d9a..d31b788e01 100644 --- a/code/modules/cargo/exports/parts.dm +++ b/code/modules/cargo/exports/parts.dm @@ -112,7 +112,7 @@ /datum/export/glasswork_lens cost = 1800 unit_name = "small glass lens" - export_types = list(/obj/item/glasswork/lens) + export_types = list(/obj/item/glasswork/glass_base/lens) /datum/export/glasswork_spouty cost = 1200