From 0e2b4e1977548bb454f3e6f9d239ef43ebe74fe0 Mon Sep 17 00:00:00 2001 From: swindly Date: Sat, 21 Dec 2019 15:43:36 +0000 Subject: [PATCH] Adds logs as parts of bonfires and blacklists steel-caps from them (#48312) * blacklists steel logs from bonfire * adds logs as bonfire part --- code/datums/components/crafting/recipes.dm | 2 ++ code/modules/hydroponics/grown/towercap.dm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 3d886d59dc8..e3d242d663e 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -613,6 +613,8 @@ name = "Bonfire" time = 60 reqs = list(/obj/item/grown/log = 5) + parts = list(/obj/item/grown/log = 5) + blacklist = list(/obj/item/grown/log/steel) result = /obj/structure/bonfire category = CAT_PRIMAL diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index f2209d151b4..1ef4393de02 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -216,8 +216,8 @@ to_chat(user, "You need to extinguish [src] before removing the logs!") return if(!has_buckled_mobs() && do_after(user, 50, target = src)) - for(var/I in 1 to 5) - var/obj/item/grown/log/L = new /obj/item/grown/log(src.loc) + for(var/obj/item/grown/log/L in contents) + L.forceMove(drop_location()) L.pixel_x += rand(1,4) L.pixel_y += rand(1,4) if(can_buckle || grill)