Collapsing fireplace logic into bonfire.

This commit is contained in:
MistakeNot4892
2024-01-18 22:38:31 +11:00
parent 00bed6e326
commit e272246877
40 changed files with 668 additions and 611 deletions
@@ -36,15 +36,12 @@
if(drying_state)
add_overlay(drying_state)
/obj/structure/drying_rack/attackby(var/atom/A, var/mob/user)
if(istype(A, /obj/item/stack/wetleather))
if(!drying) // If not drying anything, start drying the thing
if(user.unEquip(A, target = src))
drying = A
else // Drying something, add if possible
var/obj/item/stack/wetleather/W = A
W.transfer_to(drying, W.amount, TRUE)
update_icon()
/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
update_icon()
return TRUE
return ..()
@@ -1,6 +1,16 @@
/obj/item/stack/material/fuel // abstract type, do not use
var/bonfire_fuel_time = 1 MINUTE
/obj/item/stack/material/fuel/get_dryness_text(var/obj/rack)
var/moistness = drying_wetness / initial(drying_wetness)
if(moistness > 0.65)
return "fresh-cut"
if(moistness > 0.35)
return "somewhat dried"
if(moistness)
return "almost dried"
return "dried"
/obj/item/stack/material/fuel/wood
name = "wooden plank"
icon_state = "sheet-wood"
@@ -27,6 +37,10 @@
drying_wetness = null
bonfire_fuel_time = 6 MINUTES
/obj/item/stack/material/fuel/wood/dried/update_strings()
. = ..()
name = "dried [name]"
/obj/item/stack/material/fuel/wood/dried/sif
name = "dried sifwood plank"
color = "#0099cc"
@@ -62,6 +76,10 @@
plank_type = /obj/item/stack/material/fuel/wood/dried
bonfire_fuel_time = 8 MINUTES
/obj/item/stack/material/fuel/log/dried/update_strings()
. = ..()
name = "dried [name]"
/obj/item/stack/material/fuel/log/dried/sif
name = "dried sifwood log"
default_type = MAT_SIFLOG