From 3d2092885fcb2a27b3ded34c9ef1a49eafb38f64 Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Sat, 17 Sep 2022 06:51:02 -0300 Subject: [PATCH] Bronze/Glass ashtray now can be made (#19056) * ashtray crafting * added timers --- code/game/objects/items/stacks/sheets/glass.dm | 3 ++- code/game/objects/items/stacks/sheets/sheet_types.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 0b3cba83dc6..aec25681b82 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -19,7 +19,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \ new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \ new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \ - new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \ + new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE), \ + new/datum/stack_recipe("glass ashtray", /obj/item/ashtray/glass, 1, time = 10), \ )) /obj/item/stack/sheet/glass diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1287f4dfb45..f366f2ac1e5 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -40,6 +40,7 @@ GLOBAL_LIST_INIT(metal_recipes, list( new /datum/stack_recipe("wheelchair", /obj/structure/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1), new /datum/stack_recipe("psychiatrist bed", /obj/structure/bed/psych, 5, one_per_turf = 1, on_floor = 1), + new /datum/stack_recipe("bronze ashtray", /obj/item/ashtray/bronze, 1, time = 10), null, new /datum/stack_recipe_list("office chairs",list( new /datum/stack_recipe("dark office chair", /obj/structure/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), @@ -529,7 +530,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list( new /datum/stack_recipe("pill bottle", /obj/item/storage/pill_bottle), \ new /datum/stack_recipe("IV bag", /obj/item/reagent_containers/iv_bag, 2), \ new /datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("plastic ashtray", /obj/item/ashtray/plastic, 1, time = 10), \ new /datum/stack_recipe("plastic fork", /obj/item/kitchen/utensil/pfork, 1, on_floor = 1), \ new /datum/stack_recipe("plastic spoon", /obj/item/kitchen/utensil/pspoon, 1, on_floor = 1), \ new /datum/stack_recipe("plastic spork", /obj/item/kitchen/utensil/pspork, 1, on_floor = 1), \