diff --git a/code/datums/components/crafting/recipes/archery.dm b/code/datums/components/crafting/recipes/archery.dm
index fa5368a433..90bc69d5da 100644
--- a/code/datums/components/crafting/recipes/archery.dm
+++ b/code/datums/components/crafting/recipes/archery.dm
@@ -5,7 +5,7 @@
/datum/crafting_recipe/shortbow
name = "Shortbow"
result = /obj/item/gun/launcher/crossbow/bow
- reqs = list(list(/obj/item/stack/material/wood = 10),
+ reqs = list(list(/obj/item/stack/material/fuel/wood = 10),
list(/obj/item/stack/material/cloth = 5))
time = 120
category = CAT_WEAPONRY
@@ -14,7 +14,7 @@
/datum/crafting_recipe/arrow_sandstone
name = "Wood Arrow (Sandstone Tip)"
result = /obj/item/arrow/wood
- reqs = list(list(/obj/item/stack/material/wood = 2),
+ reqs = list(list(/obj/item/stack/material/fuel/wood = 2),
list(/obj/item/stack/material/sandstone = 2))
time = 2 SECONDS
category = CAT_WEAPONRY
@@ -23,7 +23,7 @@
/datum/crafting_recipe/arrow_marble
name = "Wood Arrow (Marble Tip)"
result = /obj/item/arrow/wood
- reqs = list(list(/obj/item/stack/material/wood = 2),
+ reqs = list(list(/obj/item/stack/material/fuel/wood = 2),
list(/obj/item/stack/material/marble = 2))
time = 2 SECONDS
category = CAT_WEAPONRY
@@ -32,7 +32,7 @@
/datum/crafting_recipe/arrow_chitin
name = "Wood Arrow (Chitin Tip)"
result = /obj/item/arrow/wood/chitin
- reqs = list(list(/obj/item/stack/material/wood = 2),
+ reqs = list(list(/obj/item/stack/material/fuel/wood = 2),
list(/obj/item/stack/material/chitin = 2),
list(/obj/item/stack/material/cloth = 1))
time = 3 SECONDS
@@ -73,7 +73,7 @@
/datum/crafting_recipe/arrow_wood_material
name = "Wood Arrow (Crude Tip)"
result = /obj/item/material/arrow/crude
- reqs = list(list(/obj/item/stack/material/wood = 2),
+ reqs = list(list(/obj/item/stack/material/fuel/wood = 2),
list(/obj/item/material/knife/machete/hatchet/stone = 1),
list(/obj/item/stack/material/cloth = 1))
parts = list(
diff --git a/code/datums/looping_sounds/item_sounds.dm b/code/datums/looping_sounds/item_sounds.dm
index 39845b8484..d280b9f85a 100644
--- a/code/datums/looping_sounds/item_sounds.dm
+++ b/code/datums/looping_sounds/item_sounds.dm
@@ -44,6 +44,8 @@
speed = clamp(speed, 1, 3)
return ..(starttime, mid_sounds[speed])
+// Fire crackles were originally sourced from freesound.org and cut
+// up/faded in Audacity but I have lost the original source link. :(
/datum/looping_sound/fire_crackles
start_sound = 'sound/ambience/firecrackle01.ogg'
start_length = 10
diff --git a/code/game/gamemodes/cult/cultify/obj.dm b/code/game/gamemodes/cult/cultify/obj.dm
index a0f03a3f6d..4a7717abc9 100644
--- a/code/game/gamemodes/cult/cultify/obj.dm
+++ b/code/game/gamemodes/cult/cultify/obj.dm
@@ -14,7 +14,7 @@
new /obj/structure/cult/pylon(loc)
..()
-/obj/item/stack/material/wood/cultify()
+/obj/item/stack/material/fuel/wood/cultify()
return
/obj/item/book/cultify()
diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm
index 0c05b55c21..e0cf2131f7 100644
--- a/code/game/machinery/wall_frames.dm
+++ b/code/game/machinery/wall_frames.dm
@@ -129,7 +129,7 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "nboard00"
refund_amt = 4
- refund_type = /obj/item/stack/material/wood
+ refund_type = /obj/item/stack/material/fuel/wood
build_machine_type = /obj/structure/noticeboard
/obj/item/frame/mirror
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 693addef52..54800eef6f 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -514,8 +514,8 @@
/obj/item/stack/material/glass{amount = 10},
/obj/item/stack/material/glass/reinforced{amount = 10},
/obj/item/stack/material/plastic{amount = 10},
- /obj/item/stack/material/wood{amount = 10},
- /obj/item/stack/material/wood/sif{amount = 10},
+ /obj/item/stack/material/fuel/wood{amount = 10},
+ /obj/item/stack/material/fuel/wood/sif{amount = 10},
/obj/item/stack/material/cardboard{amount = 10},
/obj/item/stack/rods{amount = 10},
/obj/item/stack/material/sandstone{amount = 10},
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index a5c1c94b79..5f568ba0d1 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -78,7 +78,7 @@
update_icon()
return TRUE
- if(istype(W, /obj/item/stack/material/wood) || istype(W, /obj/item/stack/material/log) )
+ if(istype(W, /obj/item/stack/material/fuel/wood) || istype(W, /obj/item/stack/material/fuel/log) )
add_fuel(W, user)
return TRUE
@@ -112,9 +112,9 @@
/obj/structure/bonfire/proc/get_fuel_amount()
var/F = 0
for(var/A in contents)
- if(istype(A, /obj/item/stack/material/wood))
+ if(istype(A, /obj/item/stack/material/fuel/wood))
F += 0.5
- if(istype(A, /obj/item/stack/material/log))
+ if(istype(A, /obj/item/stack/material/fuel/log))
F += 1.0
return F
@@ -135,7 +135,7 @@
if(get_fuel_amount() >= 10)
to_chat(user, "\The [src] already has enough fuel!")
return FALSE
- if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) )
+ if(istype(new_fuel, /obj/item/stack/material/fuel/wood) || istype(new_fuel, /obj/item/stack/material/fuel/log) )
var/obj/item/stack/F = new_fuel
var/obj/item/stack/S = F.split(1)
if(S)
@@ -156,13 +156,13 @@
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
- if(istype(consumed_fuel, /obj/item/stack/material/log))
+ if(istype(consumed_fuel, /obj/item/stack/material/fuel/log))
next_fuel_consumption = world.time + 2 MINUTES
qdel(consumed_fuel)
update_icon()
return TRUE
- else if(istype(consumed_fuel, /obj/item/stack/material/wood)) // One log makes two planks of wood.
+ else if(istype(consumed_fuel, /obj/item/stack/material/fuel/wood)) // One log makes two planks of wood.
next_fuel_consumption = world.time + 1 MINUTE
qdel(consumed_fuel)
update_icon()
@@ -312,7 +312,7 @@
var/heating_power = 40000
/obj/structure/fireplace/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/stack/material/wood) || istype(W, /obj/item/stack/material/log) )
+ if(istype(W, /obj/item/stack/material/fuel/wood) || istype(W, /obj/item/stack/material/fuel/log) )
add_fuel(W, user)
else if(W.is_hot())
@@ -327,9 +327,9 @@
/obj/structure/fireplace/proc/get_fuel_amount()
var/F = 0
for(var/A in contents)
- if(istype(A, /obj/item/stack/material/wood))
+ if(istype(A, /obj/item/stack/material/fuel/wood))
F += 0.5
- if(istype(A, /obj/item/stack/material/log))
+ if(istype(A, /obj/item/stack/material/fuel/log))
F += 1.0
return F
@@ -344,7 +344,7 @@
if(get_fuel_amount() >= 10)
to_chat(user, "\The [src] already has enough fuel!")
return FALSE
- if(istype(new_fuel, /obj/item/stack/material/wood) || istype(new_fuel, /obj/item/stack/material/log) )
+ if(istype(new_fuel, /obj/item/stack/material/fuel/wood) || istype(new_fuel, /obj/item/stack/material/fuel/log) )
var/obj/item/stack/F = new_fuel
var/obj/item/stack/S = F.split(1)
if(S)
@@ -358,22 +358,17 @@
return FALSE
/obj/structure/fireplace/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
- if(!istype(consumed_fuel))
+
+ if(!istype(consumed_fuel, /obj/item/stack/material/fuel))
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
- if(istype(consumed_fuel, /obj/item/stack/material/log))
- next_fuel_consumption = world.time + 2 MINUTES
- qdel(consumed_fuel)
- update_icon()
- return TRUE
+ var/obj/item/stack/material/fuel/fuel_stack = consumed_fuel
+ next_fuel_consumption = world.time + max(1 MINUTE, fuel_stack + bonfire_fuel_time)
+ fuel_stack.use(1)
+ update_icon()
+ return TRUE
- else if(istype(consumed_fuel, /obj/item/stack/material/wood)) // One log makes two planks of wood.
- next_fuel_consumption = world.time + 1 MINUTE
- qdel(consumed_fuel)
- update_icon()
- return TRUE
- return FALSE
/obj/structure/fireplace/proc/check_oxygen()
var/datum/gas_mixture/G = loc.return_air()
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 2a2ce6742d..9f682ec563 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -26,7 +26,7 @@
if(!T)
to_chat(user, "You can't open this here!")
if(W.is_crowbar())
- new /obj/item/stack/material/wood(src)
+ new /obj/item/stack/material/fuel/wood(src)
for(var/atom/movable/AM in contents)
if(AM.simulated)
diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm
index 3afd4276ee..7cdea0e42c 100644
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -192,7 +192,7 @@
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_1"
base_state = "pine"
- product = /obj/item/stack/material/log
+ product = /obj/item/stack/material/fuel/log
shake_animation_degrees = 3
/obj/structure/flora/tree/pine/choose_icon_state()
@@ -235,7 +235,7 @@
icon = 'icons/obj/flora/palmtrees.dmi'
icon_state = "palm1"
base_state = "palm"
- product = /obj/item/stack/material/log
+ product = /obj/item/stack/material/fuel/log
product_amount = 5
health = 200
max_health = 200
@@ -251,7 +251,7 @@
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_1"
base_state = "tree"
- product = /obj/item/stack/material/log
+ product = /obj/item/stack/material/fuel/log
product_amount = 5
health = 200
max_health = 200
@@ -265,7 +265,7 @@
icon = 'icons/obj/flora/jungletreesmall.dmi'
icon_state = "tree"
base_state = "tree"
- product = /obj/item/stack/material/log
+ product = /obj/item/stack/material/fuel/log
product_amount = 10
health = 400
max_health = 400
@@ -280,7 +280,7 @@
icon = 'icons/obj/flora/jungletree.dmi'
icon_state = "tree"
base_state = "tree"
- product = /obj/item/stack/material/log
+ product = /obj/item/stack/material/fuel/log
product_amount = 20
health = 800
max_health = 800
@@ -309,7 +309,7 @@
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_sif"
base_state = "tree_sif"
- product = /obj/item/stack/material/log/sif
+ product = /obj/item/stack/material/fuel/log/sif
catalogue_data = list(/datum/category_item/catalogue/flora/sif_tree)
randomize_size = TRUE
diff --git a/code/modules/hydroponics/_hydro_setup.dm b/code/modules/hydroponics/_hydro_setup.dm
index 7761b746e7..aae4245342 100644
--- a/code/modules/hydroponics/_hydro_setup.dm
+++ b/code/modules/hydroponics/_hydro_setup.dm
@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(plant_mob_products, list(
GLOBAL_LIST_INIT(plant_item_products, list(
/obj/item/stack/material/cloth = 30,
/obj/item/stack/material/wax = 20,
- /obj/item/stack/material/log = 30,
+ /obj/item/stack/material/fuel/log = 30,
/obj/item/stack/material/resin = 10,
/obj/item/material/shard/shrapnel = 2,
/obj/item/ore = 5,
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 82d6c7ba65..be9f5930a2 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -213,9 +213,9 @@
var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)
if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR)
for(var/i=0,i<2,i++)
- var/obj/item/stack/material/wood/NG = new (user.loc)
+ var/obj/item/stack/material/fuel/wood/NG = new (user.loc)
if(flesh_colour) NG.color = flesh_colour
- for (var/obj/item/stack/material/wood/G in user.loc)
+ for (var/obj/item/stack/material/fuel/wood/G in user.loc)
if(G==NG)
continue
if(G.amount>=G.max_amount)
diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm
index 4be5e0fb31..fd427c29f4 100644
--- a/code/modules/hydroponics/seedtypes/mushrooms.dm
+++ b/code/modules/hydroponics/seedtypes/mushrooms.dm
@@ -132,7 +132,7 @@
display_name = "tower caps"
chems = list("woodpulp" = list(10,1))
mutants = list("redcap")
- has_item_product = /obj/item/stack/material/log
+ has_item_product = /obj/item/stack/material/fuel/log
/datum/seed/mushroom/towercap/New()
..()
@@ -209,4 +209,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#e29cd2")
set_trait(TRAIT_PLANT_COLOUR,"#f8e6f4")
set_trait(TRAIT_PLANT_ICON,"mushroom9")
- set_trait(TRAIT_SPORING, TRUE)
\ No newline at end of file
+ set_trait(TRAIT_SPORING, TRUE)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index fb3cb932db..c877fab4ca 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -47,7 +47,7 @@
to_chat(user, "You begin dismantling \the [src].")
if(do_after(user,25 * O.toolspeed))
to_chat(user, "You dismantle \the [src].")
- new /obj/item/stack/material/wood(get_turf(src), 3)
+ new /obj/item/stack/material/fuel/wood(get_turf(src), 3)
for(var/obj/item/book/b in contents)
b.loc = (get_turf(src))
qdel(src)
diff --git a/code/modules/materials/fifty_spawner_mats.dm b/code/modules/materials/fifty_spawner_mats.dm
index 58a9d95f08..09803bb1be 100644
--- a/code/modules/materials/fifty_spawner_mats.dm
+++ b/code/modules/materials/fifty_spawner_mats.dm
@@ -98,19 +98,19 @@
/obj/fiftyspawner/wood
name = "stack of wood"
- type_to_spawn = /obj/item/stack/material/wood
+ type_to_spawn = /obj/item/stack/material/fuel/wood
/obj/fiftyspawner/sifwood
name = "stack of alien wood"
- type_to_spawn = /obj/item/stack/material/wood/sif
+ type_to_spawn = /obj/item/stack/material/fuel/wood/sif
/obj/fiftyspawner/log
name = "stack of logs"
- type_to_spawn = /obj/item/stack/material/log
+ type_to_spawn = /obj/item/stack/material/fuel/log
/obj/fiftyspawner/log/sif
name = "stack of alien logs"
- type_to_spawn = /obj/item/stack/material/log/sif
+ type_to_spawn = /obj/item/stack/material/fuel/log/sif
/obj/fiftyspawner/cloth
name = "stack of cloth"
@@ -143,4 +143,4 @@
//R-UST port
/obj/fiftyspawner/deuterium
name = "stack of deuterium"
- type_to_spawn = /obj/item/stack/material/deuterium
\ No newline at end of file
+ type_to_spawn = /obj/item/stack/material/deuterium
diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm
index 11190228bf..847649a975 100644
--- a/code/modules/materials/materials/organic/wood.dm
+++ b/code/modules/materials/materials/organic/wood.dm
@@ -1,6 +1,6 @@
/datum/material/wood
name = MAT_WOOD
- stack_type = /obj/item/stack/material/wood
+ stack_type = /obj/item/stack/material/fuel/wood
icon_colour = "#9c5930"
integrity = 50
icon_base = "wood"
@@ -49,7 +49,7 @@
/datum/material/wood/sif
name = MAT_SIFWOOD
- stack_type = /obj/item/stack/material/wood/sif
+ 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.
@@ -67,7 +67,7 @@
/datum/material/wood/log
name = MAT_LOG
icon_base = "log"
- stack_type = /obj/item/stack/material/log
+ stack_type = /obj/item/stack/material/fuel/log
sheet_singular_name = null
sheet_plural_name = "pile"
pass_stack_colors = TRUE
@@ -82,4 +82,4 @@
name = MAT_SIFLOG
icon_colour = "#0099cc" // Cyan-ish
stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
- stack_type = /obj/item/stack/material/log/sif
+ stack_type = /obj/item/stack/material/fuel/log/sif
diff --git a/code/modules/materials/sheets/organic/wood.dm b/code/modules/materials/sheets/organic/wood.dm
index 866c5b3c5d..9ba91418ea 100644
--- a/code/modules/materials/sheets/organic/wood.dm
+++ b/code/modules/materials/sheets/organic/wood.dm
@@ -1,4 +1,7 @@
-/obj/item/stack/material/wood
+/obj/item/stack/material/fuel // abstract type, do not use
+ var/bonfire_fuel_time = 1 MINUTE
+
+/obj/item/stack/material/fuel/wood
name = "wooden plank"
icon_state = "sheet-wood"
default_type = MAT_WOOD
@@ -7,13 +10,29 @@
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
no_variants = FALSE
+ drying_wetness = 50
+ dried_type = /obj/item/stack/material/fuel/wood/dried
+ bonfire_fuel_time = 3 MINUTES
-/obj/item/stack/material/wood/sif
- name = "alien wooden plank"
+/obj/item/stack/material/fuel/wood/sif
+ name = "sifwood plank"
+ color = "#0099cc"
+ default_type = MAT_SIFWOOD
+ dried_type = /obj/item/stack/material/fuel/wood/dried/sif
+
+// Dried subtypes are just used for fuel calc in bonfires, they should be otherwise identical.
+/obj/item/stack/material/fuel/wood/dried
+ name = "dried wooden plank"
+ dried_type = null
+ drying_wetness = null
+ bonfire_fuel_time = 6 MINUTES
+
+/obj/item/stack/material/fuel/wood/dried/sif
+ name = "dried sifwood plank"
color = "#0099cc"
default_type = MAT_SIFWOOD
-/obj/item/stack/material/log
+/obj/item/stack/material/fuel/log
name = "log"
icon_state = "sheet-log"
default_type = MAT_LOG
@@ -22,17 +41,34 @@
max_amount = 25
w_class = ITEMSIZE_HUGE
description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks."
- var/plank_type = /obj/item/stack/material/wood
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
+ drying_wetness = 80
+ dried_type = /obj/item/stack/material/fuel/log/dried
+ bonfire_fuel_time = 4 MINUTES
+ var/plank_type = /obj/item/stack/material/fuel/wood
-/obj/item/stack/material/log/sif
- name = "alien log"
+/obj/item/stack/material/fuel/log/sif
+ name = "sifwood log"
default_type = MAT_SIFLOG
color = "#0099cc"
- plank_type = /obj/item/stack/material/wood/sif
+ plank_type = /obj/item/stack/material/fuel/wood/sif
+ dried_type = /obj/item/stack/material/fuel/log/dried/sif
-/obj/item/stack/material/log/attackby(var/obj/item/W, var/mob/user)
+/obj/item/stack/material/fuel/log/dried
+ name = "dried log"
+ drying_wetness = null
+ dried_type = null
+ plank_type = /obj/item/stack/material/fuel/wood/dried
+ bonfire_fuel_time = 8 MINUTES
+
+/obj/item/stack/material/fuel/log/dried/sif
+ name = "dried sifwood log"
+ default_type = MAT_SIFLOG
+ color = "#0099cc"
+ plank_type = /obj/item/stack/material/fuel/wood/dried/sif
+
+/obj/item/stack/material/fuel/log/attackby(var/obj/item/W, var/mob/user)
if(!istype(W) || W.force <= 0)
return ..()
if(W.sharp && W.edge)
@@ -41,13 +77,13 @@
if(do_after(user, time, src) && use(1))
to_chat(user, "You cut up a log into planks.")
playsound(src, 'sound/effects/woodcutting.ogg', 50, 1)
- var/obj/item/stack/material/wood/existing_wood = null
- for(var/obj/item/stack/material/wood/M in user.loc)
+ var/obj/item/stack/material/fuel/wood/existing_wood = null
+ for(var/obj/item/stack/material/fuel/wood/M in user.loc)
if(M.material.name == src.material.name)
existing_wood = M
break
- var/obj/item/stack/material/wood/new_wood = new plank_type(user.loc)
+ var/obj/item/stack/material/fuel/wood/new_wood = new plank_type(user.loc)
new_wood.amount = 2
if(existing_wood && new_wood.transfer_to(existing_wood))
to_chat(user, "You add the newly-formed wood to the stack. It now contains [existing_wood.amount] planks.")
@@ -57,4 +93,4 @@
/obj/item/stack/material/grass
name = "grass"
icon_state = "tile_grass"
- default_type = "grass"
\ No newline at end of file
+ default_type = "grass"
diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
index b10a7a9fa8..0b15a72d41 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
@@ -41,8 +41,8 @@
/mob/living/simple_mob/animal/space/tree/death()
..(null,"is hacked into pieces!")
playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
- new /obj/item/stack/material/wood(loc)
+ new /obj/item/stack/material/fuel/wood(loc)
qdel(src)
/decl/mob_organ_names/tree
- hit_zones = list("trunk", "branches", "twigs")
\ No newline at end of file
+ hit_zones = list("trunk", "branches", "twigs")
diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm
index 2958dedae7..4c6ecd8a5c 100644
--- a/code/modules/persistence/noticeboard.dm
+++ b/code/modules/persistence/noticeboard.dm
@@ -71,7 +71,7 @@
/obj/structure/noticeboard/proc/dismantle()
for(var/thing in notices)
remove_paper(thing, skip_icon_update = TRUE)
- new /obj/item/stack/material/wood(get_turf(src))
+ new /obj/item/stack/material/fuel/wood(get_turf(src))
qdel(src)
/obj/structure/noticeboard/Destroy()
@@ -187,7 +187,7 @@
/obj/structure/noticeboard/anomaly/Initialize()
. = ..()
-
+
var/obj/item/paper/P = new()
P.name = "Memo RE: proper analysis procedure"
P.info = "
We keep test dummies in pens here for a reason, so standard procedure should be to activate newfound alien artifacts and place the two in close proximity. Promising items I might even approve monkey testing on."
diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm
index 46dce07ed8..3603d2db35 100644
--- a/code/modules/persistence/storage/smartfridge.dm
+++ b/code/modules/persistence/storage/smartfridge.dm
@@ -35,7 +35,7 @@
/obj/item/stack/material/steel = 150,
/obj/item/stack/material/glass = 150,
/obj/item/stack/material/copper = 150,
- /obj/item/stack/material/wood = 150,
+ /obj/item/stack/material/fuel/wood = 150,
/obj/item/stack/material/plastic = 150,
/obj/item/stack/material/phoron = 100,
/obj/item/stack/material/plasteel = 50,
diff --git a/maps/cynosure/submaps/9x8/GamesRoom.dmm b/maps/cynosure/submaps/9x8/GamesRoom.dmm
index e645987162..b3f1d1ea25 100644
--- a/maps/cynosure/submaps/9x8/GamesRoom.dmm
+++ b/maps/cynosure/submaps/9x8/GamesRoom.dmm
@@ -136,7 +136,7 @@
/turf/simulated/floor/wood,
/area/template_noop)
"D" = (
-/obj/item/stack/material/wood{
+/obj/item/stack/material/fuel/wood{
amount = 24
},
/obj/machinery/light_construct/small{
diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm
index 1208e4c87e..4581d0803d 100644
--- a/maps/northern_star/polaris-1.dmm
+++ b/maps/northern_star/polaris-1.dmm
@@ -761,7 +761,7 @@
"aoG" = (/turf/simulated/floor/wood,/area/vacant/vacant_site)
"aoH" = (/obj/random/drinkbottle,/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/drinkbottle,/turf/simulated/floor/wood,/area/vacant/vacant_site)
"aoI" = (/obj/structure/table,/obj/item/stack/material/steel{amount = 2},/obj/random/maintenance/engineering,/turf/simulated/floor,/area/vacant/vacant_site)
-"aoJ" = (/obj/item/stack/material/wood{amount = 24},/turf/simulated/floor/wood,/area/vacant/vacant_site)
+"aoJ" = (/obj/item/stack/material/fuel/wood{amount = 24},/turf/simulated/floor/wood,/area/vacant/vacant_site)
"aoK" = (/obj/item/stack/tile/wood,/turf/simulated/floor,/area/vacant/vacant_site)
"aoL" = (/obj/machinery/camera/network/security{c_tag = "SEC - Interrogation Observation"; dir = 4},/obj/structure/table/standard,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/folder/red,/obj/item/pen,/obj/item/radio/intercom{broadcasting = 0; dir = 8; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = -21; pixel_y = 0},/turf/simulated/floor/tiled,/area/security/interrogation)
"aoM" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/computer/security/telescreen{layer = 4; name = "Observation Screen"; network = list("Interrogation"); pixel_x = 0; pixel_y = -34},/obj/structure/bed/chair,/turf/simulated/floor/tiled,/area/security/interrogation)
@@ -2559,8 +2559,8 @@
"aXk" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/obj/machinery/door/window/southleft,/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
"aXl" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/obj/machinery/door/window/southright,/obj/item/clothing/suit/space,/obj/item/clothing/head/helmet/space,/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
"aXm" = (/obj/structure/table/rack,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/suit_cooling_unit,/obj/item/suit_cooling_unit,/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/emergency/eva)
-"aXn" = (/obj/item/stack/material/wood{amount = 24},/turf/simulated/floor,/area/ai_monitored/storage/emergency/eva)
-"aXo" = (/obj/item/stack/material/wood,/turf/simulated/floor,/area/ai_monitored/storage/emergency/eva)
+"aXn" = (/obj/item/stack/material/fuel/wood{amount = 24},/turf/simulated/floor,/area/ai_monitored/storage/emergency/eva)
+"aXo" = (/obj/item/stack/material/fuel/wood,/turf/simulated/floor,/area/ai_monitored/storage/emergency/eva)
"aXp" = (/obj/machinery/newscaster{pixel_y = 32},/obj/effect/floor_decal/corner/brown/full{dir = 1},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
"aXq" = (/obj/structure/closet/crate,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
"aXr" = (/obj/effect/floor_decal/corner/yellow{dir = 4},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva)
diff --git a/maps/northern_star/polaris-4.dmm b/maps/northern_star/polaris-4.dmm
index d1350723a6..e08165059c 100644
--- a/maps/northern_star/polaris-4.dmm
+++ b/maps/northern_star/polaris-4.dmm
@@ -51,7 +51,7 @@
"aY" = (/obj/machinery/door/airlock/hatch,/turf/simulated/floor/tiled/white/airless,/area/wreck/main)
"aZ" = (/obj/structure/window/phoronreinforced,/turf/simulated/floor/tiled/airless,/area/wreck/main)
"ba" = (/obj/item/flashlight/flare,/turf/simulated/floor/tiled/airless,/area/wreck/main)
-"bb" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/ore/iron,/obj/item/ore/iron,/obj/item/ore/iron,/turf/simulated/floor/airless,/area/wreck/main)
+"bb" = (/obj/item/stack/material/fuel/wood,/obj/item/stack/material/fuel/wood,/obj/structure/ore_box,/obj/item/ore/iron,/obj/item/ore/iron,/obj/item/ore/iron,/turf/simulated/floor/airless,/area/wreck/main)
"bc" = (/obj/item/clothing/head/helmet/space/deathsquad,/obj/structure/table/rack,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/tiled/airless,/area/wreck/main)
"bd" = (/obj/structure/grille,/turf/simulated/floor/airless{icon_state = "white"},/area/mine/explored)
"be" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/main)
@@ -91,7 +91,7 @@
"bM" = (/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/airless,/area/wreck/main)
"bN" = (/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/tiled/airless,/area/wreck/main)
"bR" = (/obj/structure/largecrate/hoverpod,/turf/simulated/floor/airless,/area/wreck/main)
-"bS" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/effect/decal/mecha_wreckage/hoverpod,/turf/simulated/floor/airless,/area/wreck/main)
+"bS" = (/obj/item/stack/material/fuel/wood,/obj/item/stack/material/fuel/wood,/obj/item/stack/material/fuel/wood,/obj/effect/decal/mecha_wreckage/hoverpod,/turf/simulated/floor/airless,/area/wreck/main)
"bT" = (/obj/item/stack/material/steel,/obj/item/stack/material/steel,/turf/simulated/floor/tiled/airless,/area/wreck/main)
"bU" = (/obj/structure/table/rack,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/airless,/area/wreck/main)
"bV" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/airless,/area/wreck/main)
@@ -560,4 +560,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
"}
-
diff --git a/maps/northern_star/polaris-5.dmm b/maps/northern_star/polaris-5.dmm
index b9e912fc14..19836f468f 100644
--- a/maps/northern_star/polaris-5.dmm
+++ b/maps/northern_star/polaris-5.dmm
@@ -1700,7 +1700,7 @@
"GJ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway)
"GK" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway)
"GL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway)
-"GM" = (/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/wood{amount = 30},/obj/item/stack/material/plastic{amount = 10},/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/engineering/storage)
+"GM" = (/obj/item/stack/material/plasteel{amount = 10},/obj/item/stack/material/fuel/wood{amount = 30},/obj/item/stack/material/plastic{amount = 10},/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/engineering/storage)
"GN" = (/obj/structure/table/rack,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/shoes/magboots,/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/item/storage/briefcase/inflatable,/turf/simulated/floor/tiled,/area/outpost/engineering/storage)
"GO" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor,/area/outpost/engineering/atmospherics)
"GP" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/outpost/engineering/atmospherics)
diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm
index 279185ac98..bc226a9ff8 100644
--- a/maps/southern_cross/southern_cross-1.dmm
+++ b/maps/southern_cross/southern_cross-1.dmm
@@ -8717,7 +8717,7 @@
/turf/simulated/floor,
/area/construction/firstdeck/construction4)
"arH" = (
-/obj/item/stack/material/wood{
+/obj/item/stack/material/fuel/wood{
amount = 24
},
/turf/simulated/floor/wood,
diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm
index 4a61d42940..4eb1a5e3e1 100644
--- a/maps/southern_cross/southern_cross-3.dmm
+++ b/maps/southern_cross/southern_cross-3.dmm
@@ -5630,8 +5630,8 @@
/area/surface/outpost/main/bar)
"mq" = (
/obj/structure/table,
-/obj/item/stack/material/wood,
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/floor/plating,
/area/surface/outpost/main/bar)
"mr" = (
diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm
index 5f88b256b9..8adab740d6 100644
--- a/maps/southern_cross/southern_cross-5.dmm
+++ b/maps/southern_cross/southern_cross-5.dmm
@@ -97,7 +97,7 @@
"bW" = (/obj/effect/overlay/wallrot,/turf/simulated/wall/skipjack,/area/wreck/ufoship)
"bX" = (/obj/structure/window/phoronreinforced,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
"bY" = (/obj/item/flashlight/flare,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
-"bZ" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/structure/ore_box,/obj/item/ore/iron,/obj/item/ore/iron,/obj/item/ore/iron,/turf/simulated/floor/airless,/area/wreck/ufoship)
+"bZ" = (/obj/item/stack/material/fuel/wood,/obj/item/stack/material/fuel/wood,/obj/structure/ore_box,/obj/item/ore/iron,/obj/item/ore/iron,/obj/item/ore/iron,/turf/simulated/floor/airless,/area/wreck/ufoship)
"ca" = (/obj/item/clothing/head/helmet/space/deathsquad,/obj/structure/table/rack,/obj/effect/decal/cleanable/molten_item,/turf/simulated/floor/tiled/airless,/area/wreck/ufoship)
"cb" = (/obj/machinery/compressor{dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
"cc" = (/obj/machinery/crystal,/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel,/turf/simulated/floor/reinforced/phoron,/area/wreck/ufoship)
@@ -150,7 +150,7 @@
"cX" = (/turf/simulated/shuttle/wall,/area/wreck/supplyshuttle)
"cY" = (/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
"cZ" = (/obj/structure/largecrate/hoverpod,/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
-"da" = (/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/item/stack/material/wood,/obj/effect/decal/mecha_wreckage/hoverpod,/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
+"da" = (/obj/item/stack/material/fuel/wood,/obj/item/stack/material/fuel/wood,/obj/item/stack/material/fuel/wood,/obj/effect/decal/mecha_wreckage/hoverpod,/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
"db" = (/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
"dc" = (/obj/item/frame/light,/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
"dd" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/airless,/area/wreck/supplyshuttle)
@@ -416,4 +416,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
"}
-
diff --git a/maps/submaps/surface_submaps/plains/Oldhouse.dmm b/maps/submaps/surface_submaps/plains/Oldhouse.dmm
index f78f651ff0..07d6625f36 100644
--- a/maps/submaps/surface_submaps/plains/Oldhouse.dmm
+++ b/maps/submaps/surface_submaps/plains/Oldhouse.dmm
@@ -4,7 +4,7 @@
"d" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/Oldhouse)
"e" = (/obj/structure/window/reinforced/full,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"f" = (/obj/structure/table/woodentable,/obj/effect/decal/cleanable/cobweb2,/obj/random/maintenance/clean/anom,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"g" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"g" = (/obj/item/stack/material/fuel/wood,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"h" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"i" = (/turf/simulated/floor/wood,/area/submap/Oldhouse)
"j" = (/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
@@ -14,16 +14,16 @@
"n" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"o" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse)
"p" = (/turf/simulated/floor/wood{icon_state = "wood_broken2"},/area/submap/Oldhouse)
-"q" = (/obj/item/stack/material/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"q" = (/obj/item/stack/material/fuel/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"r" = (/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
"s" = (/turf/simulated/floor/wood{icon_state = "wood_broken4"},/area/submap/Oldhouse)
"t" = (/obj/structure/table/woodentable,/obj/item/paper,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"u" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"v" = (/obj/structure/bed/chair/wood{dir = 1; icon_state = "wooden_chair"},/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"w" = (/obj/item/stack/material/wood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"w" = (/obj/item/stack/material/fuel/wood,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"x" = (/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/wood{icon_state = "wood_broken6"},/area/submap/Oldhouse)
"y" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/wood,/area/submap/Oldhouse)
-"z" = (/obj/structure/table/woodentable,/obj/item/stack/material/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
+"z" = (/obj/structure/table/woodentable,/obj/item/stack/material/fuel/wood,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"A" = (/obj/structure/bed,/obj/item/bedsheet,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"B" = (/obj/structure/bed/chair/comfy/teal,/turf/simulated/floor/wood,/area/submap/Oldhouse)
"C" = (/obj/structure/bookcase,/turf/simulated/floor/carpet/turcarpet,/area/submap/Oldhouse)
diff --git a/maps/submaps/surface_submaps/plains/bonfire.dmm b/maps/submaps/surface_submaps/plains/bonfire.dmm
index 25ce7928ff..32a8c07a3c 100644
--- a/maps/submaps/surface_submaps/plains/bonfire.dmm
+++ b/maps/submaps/surface_submaps/plains/bonfire.dmm
@@ -1,5 +1,5 @@
"a" = (/turf/template_noop,/area/submap/bonfire)
-"b" = (/obj/item/stack/material/log/sif,/turf/template_noop,/area/submap/bonfire)
+"b" = (/obj/item/stack/material/fuel/log/sif,/turf/template_noop,/area/submap/bonfire)
"c" = (/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
"d" = (/obj/item/flame/lighter/random,/turf/template_noop,/area/submap/bonfire)
"e" = (/obj/item/reagent_containers/food/drinks/bottle/orangejuice,/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
@@ -7,7 +7,7 @@
"g" = (/obj/structure/bonfire/sifwood,/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
"h" = (/obj/item/material/knife/machete,/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
"i" = (/obj/item/clothing/head/helmet/material/makeshift,/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
-"j" = (/obj/item/stack/material/log/sif,/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
+"j" = (/obj/item/stack/material/fuel/log/sif,/turf/simulated/floor/outdoors/dirt,/area/submap/bonfire)
(1,1,1) = {"
aaaaaaaaaa
diff --git a/maps/submaps/surface_submaps/plains/camp1.dmm b/maps/submaps/surface_submaps/plains/camp1.dmm
index 0db623c4bb..4f477464bd 100644
--- a/maps/submaps/surface_submaps/plains/camp1.dmm
+++ b/maps/submaps/surface_submaps/plains/camp1.dmm
@@ -7,7 +7,7 @@
"g" = (/obj/machinery/space_heater,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
"h" = (/obj/structure/simple_door/sifwood,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
"i" = (/obj/structure/table/rack,/obj/item/gun/launcher/crossbow,/obj/item/stack/rods{amount = 17},/obj/random/tool/anom,/turf/simulated/floor/outdoors/dirt{outdoors = 0},/area/submap/camp1)
-"j" = (/obj/item/stack/material/log/sif{amount = 25},/turf/template_noop,/area/template_noop)
+"j" = (/obj/item/stack/material/fuel/log/sif{amount = 25},/turf/template_noop,/area/template_noop)
"k" = (/obj/structure/table/bench/wooden,/turf/simulated/floor/outdoors/dirt,/area/submap/camp1)
"l" = (/turf/simulated/floor/outdoors/dirt,/area/submap/camp1)
"m" = (/obj/item/material/knife/machete/hatchet,/turf/template_noop,/area/template_noop)
diff --git a/maps/submaps/surface_submaps/plains/oldhotel.dmm b/maps/submaps/surface_submaps/plains/oldhotel.dmm
index cb31c1aeec..aba8229032 100644
--- a/maps/submaps/surface_submaps/plains/oldhotel.dmm
+++ b/maps/submaps/surface_submaps/plains/oldhotel.dmm
@@ -8,7 +8,7 @@
"da" = (/obj/structure/bed/chair/sofa/teal/right,/turf/simulated/floor/carpet/blue,/area/submap/oldhotel)
"dc" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/oracarpet,/area/submap/oldhotel)
"dn" = (/obj/structure/table/woodentable,/obj/item/flame/candle/everburn,/turf/simulated/floor/wood,/area/submap/oldhotel)
-"dr" = (/obj/item/stack/material/log/sif,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
+"dr" = (/obj/item/stack/material/fuel/log/sif,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
"dz" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{dir = 4; pixel_x = -28},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
"dL" = (/obj/structure/window/reinforced/full,/obj/structure/grille/rustic,/turf/simulated/floor/tiled/asteroid_steel,/area/submap/oldhotel)
"eK" = (/obj/structure/bonfire/sifwood,/obj/structure/grille/rustic,/turf/simulated/floor/outdoors/dirt,/area/submap/oldhotel)
diff --git a/maps/submaps/surface_submaps/plains/priderock.dmm b/maps/submaps/surface_submaps/plains/priderock.dmm
index 518ce1715d..f84dca6842 100644
--- a/maps/submaps/surface_submaps/plains/priderock.dmm
+++ b/maps/submaps/surface_submaps/plains/priderock.dmm
@@ -8,7 +8,7 @@
"jM" = (/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/obj/item/towel/random,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"md" = (/obj/random/trash,/turf/template_noop,/area/submap/priderock)
"nG" = (/obj/structure/railing,/obj/random/junk,/obj/item/bone/ribs,/obj/item/bone/skull,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
-"nV" = (/obj/item/stack/material/log/sif,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
+"nV" = (/obj/item/stack/material/fuel/log/sif,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"qh" = (/obj/structure/cliff/automatic{dir = 8},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"qP" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
"qY" = (/obj/structure/cliff/automatic{dir = 9},/obj/structure/railing{dir = 1},/obj/structure/railing{dir = 8},/turf/simulated/floor/outdoors/dirt,/area/submap/priderock)
diff --git a/maps/submaps/surface_submaps/plains/smol2.dmm b/maps/submaps/surface_submaps/plains/smol2.dmm
index b0ff55c5e0..d4c66c214c 100644
--- a/maps/submaps/surface_submaps/plains/smol2.dmm
+++ b/maps/submaps/surface_submaps/plains/smol2.dmm
@@ -2,7 +2,7 @@
"b" = (/turf/template_noop,/area/submap/smol2)
"c" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/smol2)
"d" = (/turf/simulated/mineral/ignore_mapgen,/area/submap/smol2)
-"e" = (/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/obj/item/stack/material/wood/sif,/turf/template_noop,/area/submap/smol2)
+"e" = (/obj/item/stack/material/fuel/wood/sif,/obj/item/stack/material/fuel/wood/sif,/obj/item/stack/material/fuel/wood/sif,/obj/item/stack/material/fuel/wood/sif,/obj/item/stack/material/fuel/wood/sif,/obj/item/stack/material/fuel/wood/sif,/turf/template_noop,/area/submap/smol2)
"f" = (/obj/structure/table/woodentable,/turf/template_noop,/area/submap/smol2)
"g" = (/obj/item/stack/medical/splint,/obj/item/reagent_containers/pill/tramadol,/obj/random/firstaid,/turf/template_noop,/area/submap/smol2)
"h" = (/obj/effect/decal/cleanable/blood,/turf/template_noop,/area/submap/smol2)
diff --git a/maps/submaps/surface_submaps/wilderness/CaveS.dmm b/maps/submaps/surface_submaps/wilderness/CaveS.dmm
index 33793ca512..86cebaa68b 100644
--- a/maps/submaps/surface_submaps/wilderness/CaveS.dmm
+++ b/maps/submaps/surface_submaps/wilderness/CaveS.dmm
@@ -161,10 +161,10 @@
/turf/simulated/floor/wood/sif,
/area/submap/CaveS)
"oA" = (
-/obj/item/stack/material/wood/sif,
-/obj/item/stack/material/wood/sif,
-/obj/item/stack/material/wood/sif,
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/obj/effect/spider/stickyweb,
/turf/simulated/floor/wood/sif/broken,
/area/submap/CaveS)
@@ -390,9 +390,9 @@
/turf/simulated/floor/outdoors/grass/sif/forest,
/area/submap/CaveS)
"Lk" = (
-/obj/item/stack/material/wood/sif,
-/obj/item/stack/material/wood/sif,
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/turf/simulated/floor/wood/sif,
/area/submap/CaveS)
"LF" = (
diff --git a/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm b/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm
index aaf24817d4..72a75ef2ba 100644
--- a/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm
+++ b/maps/submaps/surface_submaps/wilderness/GovPatrol.dmm
@@ -7,7 +7,7 @@
"g" = (/obj/item/storage/box/flare,/obj/random/medical/lite/anom,/turf/template_noop,/area/submap/GovPatrol)
"h" = (/obj/item/ammo_casing,/turf/template_noop,/area/submap/GovPatrol)
"i" = (/obj/item/clothing/under/solgov/utility/sifguard,/obj/item/clothing/shoes/boots/jackboots,/obj/effect/decal/remains,/turf/template_noop,/area/submap/GovPatrol)
-"j" = (/obj/item/stack/material/wood/sif,/turf/template_noop,/area/submap/GovPatrol)
+"j" = (/obj/item/stack/material/fuel/wood/sif,/turf/template_noop,/area/submap/GovPatrol)
"k" = (/obj/item/gun/projectile/shotgun/pump/rifle/lever,/turf/template_noop,/area/submap/GovPatrol)
"l" = (/obj/structure/bonfire/sifwood,/turf/template_noop,/area/submap/GovPatrol)
"m" = (/obj/effect/decal/remains,/turf/template_noop,/area/submap/GovPatrol)
diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm
index c1cfdd8c1b..8b267bbcd3 100644
--- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm
@@ -136,7 +136,7 @@
"cF" = (/obj/structure/simple_door/wood,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
"cG" = (/obj/structure/toilet{dir = 8; icon_state = "toilet00"},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
"cH" = (/obj/machinery/shower{dir = 8; icon_state = "shower"},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
-"cI" = (/obj/item/stack/material/wood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
+"cI" = (/obj/item/stack/material/fuel/wood,/turf/simulated/floor/holofloor/wood,/area/submap/Manor1)
"cJ" = (/obj/machinery/shower{dir = 8; icon_state = "shower"},/obj/structure/curtain/open/shower,/obj/random/soap,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
"cK" = (/obj/structure/table/standard,/obj/random/medical/pillbottle,/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
"cL" = (/obj/structure/toilet{dir = 1; icon_state = "toilet00"},/turf/simulated/floor/tiled/hydro,/area/submap/Manor1)
diff --git a/maps/submaps/surface_submaps/wilderness/Shelter.dmm b/maps/submaps/surface_submaps/wilderness/Shelter.dmm
index 9b86fca133..e9270254a8 100644
--- a/maps/submaps/surface_submaps/wilderness/Shelter.dmm
+++ b/maps/submaps/surface_submaps/wilderness/Shelter.dmm
@@ -15,11 +15,11 @@
/area/submap/Shelter1)
"dZ" = (
/obj/structure/girder,
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/turf/simulated/floor/plating,
/area/submap/Shelter1)
"ee" = (
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/obj/item/stack/rods,
/obj/item/material/shard/shrapnel,
/turf/simulated/floor/plating,
@@ -80,7 +80,7 @@
/turf/simulated/floor/wood/sif,
/area/submap/Shelter1)
"sh" = (
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/turf/simulated/floor/wood/sif/broken,
/area/submap/Shelter1)
"sv" = (
@@ -111,7 +111,7 @@
/turf/simulated/floor/outdoors/dirt,
/area/submap/Shelter1)
"xq" = (
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/obj/random/mob/robotic/hivebot/melee,
/obj/machinery/light/small{
dir = 1
@@ -281,7 +281,7 @@
/turf/simulated/floor/wood/sif/broken,
/area/submap/Shelter1)
"WG" = (
-/obj/item/stack/material/wood/sif,
+/obj/item/stack/material/fuel/wood/sif,
/obj/item/material/shard/shrapnel,
/turf/simulated/floor/outdoors/rocks/caves,
/area/submap/Shelter1)
diff --git a/maps/submaps/surface_submaps/wilderness/collapsedmine.dmm b/maps/submaps/surface_submaps/wilderness/collapsedmine.dmm
index 0cc08ff862..bc07055a62 100644
--- a/maps/submaps/surface_submaps/wilderness/collapsedmine.dmm
+++ b/maps/submaps/surface_submaps/wilderness/collapsedmine.dmm
@@ -1020,7 +1020,7 @@
/turf/simulated/mineral/floor/ignore_mapgen,
/area/submap/CollapsedMine)
"rl" = (
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/floor/tiled/techfloor,
/area/submap/CollapsedMine)
"rm" = (
@@ -1150,7 +1150,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/submap/CollapsedMine)
"tR" = (
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/mineral/floor/ignore_mapgen,
/area/submap/CollapsedMine)
"tU" = (
@@ -1185,7 +1185,7 @@
/obj/effect/floor_decal/corner/yellow/border{
dir = 4
},
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/floor/tiled/techfloor,
/area/submap/CollapsedMine)
"uC" = (
@@ -1335,7 +1335,7 @@
/area/submap/CollapsedMine)
"wB" = (
/obj/effect/spider/stickyweb,
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/mineral/floor/ignore_mapgen,
/area/submap/CollapsedMine)
"wF" = (
@@ -2489,7 +2489,7 @@
/obj/effect/floor_decal/corner/yellow/border{
dir = 1
},
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/floor/tiled/techfloor,
/area/submap/CollapsedMine)
"Nn" = (
@@ -2828,7 +2828,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/submap/CollapsedMine)
"TR" = (
-/obj/item/stack/material/wood,
+/obj/item/stack/material/fuel/wood,
/turf/simulated/floor/wood,
/area/submap/CollapsedMine)
"TV" = (