Fixes/tweaks from testing bonfires and cooking.

This commit is contained in:
MistakeNot4892
2024-01-18 23:03:39 +11:00
parent e272246877
commit 8bb0fbcd1a
13 changed files with 122 additions and 84 deletions
@@ -20,6 +20,7 @@
destruction_desc = "splinters"
sheet_singular_name = "plank"
sheet_plural_name = "planks"
var/drying_rack_type = /obj/structure/drying_rack/wood
/datum/material/wood/generate_recipes()
..()
@@ -42,7 +43,7 @@
new /datum/stack_recipe("coilgun stock", /obj/item/coilgun_assembly, 5, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("crude fishing rod", /obj/item/material/fishing_rod/built, 8, time = 10 SECONDS, pass_stack_color = TRUE, recycle_material = "[name]"),
new /datum/stack_recipe("noticeboard", /obj/structure/noticeboard, 1, recycle_material = "[name]"),
new /datum/stack_recipe("drying rack", /obj/structure/drying_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"),
new /datum/stack_recipe("drying rack", drying_rack_type, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"),
new /datum/stack_recipe("roofing tile", /obj/item/stack/tile/roofing, 3, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("shovel", /obj/item/shovel/wood, 2, time = 10, on_floor = TRUE, supplied_material = "[name]")
)
@@ -52,6 +53,7 @@
stack_type = /obj/item/stack/material/fuel/wood/sif
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) // Alien wood would presumably be more interesting to the analyzer.
drying_rack_type = /obj/structure/drying_rack/sifwood
/datum/material/wood/sif/generate_recipes()
..()
@@ -11,7 +11,7 @@
no_variants = FALSE
max_amount = 20
stacktype = "wetleather"
drying_wetness = 30
drying_wetness = 120
dried_type = /obj/item/stack/material/leather
/obj/item/stack/wetleather/get_drying_state(var/obj/rack)
@@ -1,10 +1,20 @@
/obj/structure/drying_rack
name = "drying rack"
desc = "A rack used to stretch leather out and hold it taut during the tanning process."
desc = "A rack used to hold meat or vegetables for drying, or to stretch leather out and hold it taut during the tanning process."
icon = 'icons/obj/drying_rack.dmi'
icon_state = "rack"
var/dismantle_product = /obj/item/stack/material/steel
var/dismantle_amount = 3
var/obj/item/drying
/obj/structure/drying_rack/wood
icon_state = "rack_wooden"
dismantle_product = /obj/item/stack/material/fuel/wood
/obj/structure/drying_rack/sifwood
icon_state = "rack_wooden_sif"
dismantle_product = /obj/item/stack/material/fuel/wood/sif
/obj/structure/drying_rack/Initialize()
. = ..()
START_PROCESSING(SSobj, src) // SSObj fires ~every 2s , starting from wetness 30 takes ~1m
@@ -36,13 +46,28 @@
if(drying_state)
add_overlay(drying_state)
/obj/structure/drying_rack/attackby(var/obj/item/I, var/mob/user)
if(istype(I) && I.is_dryable() && !istype(I, /obj/item/stack/material/fuel))
if(user.unEquip(I))
I.forceMove(src)
drying = I
/obj/structure/drying_rack/attackby(var/obj/item/W, var/mob/user)
if(W.is_wrench())
playsound(src, W.usesound, 75, 1)
visible_message(SPAN_NOTICE("\The [user] begins dismantling \the [src]."))
if(do_after(user, 5 SECONDS * W.toolspeed))
visible_message(SPAN_NOTICE("\The [user] dismantles \the [src]."))
if(drying)
drying.dropInto(loc)
drying = null
if(dismantle_product && dismantle_amount)
new dismantle_product(loc, dismantle_amount)
qdel(src)
return TRUE
if(!drying && W.is_dryable() && !istype(W, /obj/item/stack/material/fuel))
if(user.unEquip(W))
W.forceMove(src)
drying = W
update_icon()
return TRUE
return ..()
/obj/structure/drying_rack/attack_hand(var/mob/user)
@@ -20,7 +20,7 @@
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
no_variants = FALSE
drying_wetness = 50
drying_wetness = 120
dried_type = /obj/item/stack/material/fuel/wood/dried
bonfire_fuel_time = 3 MINUTES
@@ -57,7 +57,7 @@
description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks."
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
drying_wetness = 80
drying_wetness = 180
dried_type = /obj/item/stack/material/fuel/log/dried
bonfire_fuel_time = 4 MINUTES
var/plank_type = /obj/item/stack/material/fuel/wood