Merge pull request #4154 from out-of-phaze/feature/shaded-wood

Change non-furniture wood on Shaded Hills to walnut, tweak lanterns
NebulaSS13 · Jul 5, 2024 · fce13c2 · fce13c2
2 parents 57863c3 + c04852c
commit fce13c2
Show file tree

Hide file tree

Showing 16 changed files with 290 additions and 260 deletions.
diff --git a/code/game/objects/items/blades/_blade.dm b/code/game/objects/items/blades/_blade.dm
@@ -65,7 +65,7 @@
 		)
 		switch(w_class)
 			if(0 to ITEM_SIZE_SMALL)
-				initial_tool_qualities[TOOL_HATCHET] = TOOL_QUALITY_NONE
+				pass()
 			if(ITEM_SIZE_SMALL to ITEM_SIZE_NORMAL) // Since ITEM_SIZE_SMALL was already covered, this is just ITEM_SIZE_NORMAL.
 				initial_tool_qualities[TOOL_HATCHET] = TOOL_QUALITY_WORST
 			if(ITEM_SIZE_NORMAL to ITEM_SIZE_LARGE)

diff --git a/code/game/objects/items/flame/flame_fuelled_lantern.dm b/code/game/objects/items/flame/flame_fuelled_lantern.dm
@@ -10,7 +10,8 @@
 	slot_flags          = SLOT_LOWER_BODY
 	lit_light_power     = 0.7
 	lit_light_range     = 6
-	max_fuel            = 120
+	max_fuel            = 60
+	_fuel_spend_amt     = (1 / 60) // a full lantern should last an hour
 	material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC
 	material            = /decl/material/solid/metal/copper
 	can_manually_light  = FALSE

diff --git a/code/game/objects/structures/compost.dm b/code/game/objects/structures/compost.dm
@@ -199,3 +199,11 @@ var/global/const/COMPOST_WORM_HUNGER_FACTOR = MINIMUM_CHEMICAL_VOLUME
 /obj/structure/reagent_dispensers/compost_bin/get_alt_interactions(var/mob/user)
 	. = ..()
 	LAZYREMOVE(., /decl/interaction_handler/toggle_open/reagent_dispenser)
+
+/obj/structure/reagent_dispensers/compost_bin/ebony
+	material = /decl/material/solid/organic/wood/ebony
+	color = /decl/material/solid/organic/wood/ebony::color
+
+/obj/structure/reagent_dispensers/compost_bin/walnut
+	material = /decl/material/solid/organic/wood/walnut
+	color = /decl/material/solid/organic/wood/walnut::color
diff --git a/code/game/objects/structures/doors/_door.dm b/code/game/objects/structures/doors/_door.dm
@@ -201,35 +201,32 @@
 
 /obj/structure/door/wood
 	material = /decl/material/solid/organic/wood
+	color = /decl/material/solid/organic/wood::color
 
 /obj/structure/door/mahogany
 	material = /decl/material/solid/organic/wood/mahogany
+	color = /decl/material/solid/organic/wood/mahogany::color
 
 /obj/structure/door/maple
 	material = /decl/material/solid/organic/wood/maple
+	color = /decl/material/solid/organic/wood/maple::color
 
 /obj/structure/door/ebony
 	material = /decl/material/solid/organic/wood/ebony
+	color = /decl/material/solid/organic/wood/ebony::color
 
 /obj/structure/door/walnut
 	material = /decl/material/solid/organic/wood/walnut
+	color = /decl/material/solid/organic/wood/walnut::color
 
 /obj/structure/door/wood/saloon
 	material = /decl/material/solid/organic/wood
 	opacity = FALSE
 
-/obj/structure/door/wood/ebony
-	material = /decl/material/solid/organic/wood/ebony
-	color = /decl/material/solid/organic/wood/ebony::color
-
 /obj/structure/door/wood/saloon/ebony
 	material = /decl/material/solid/organic/wood/ebony
 	color = /decl/material/solid/organic/wood/ebony::color
 
-/obj/structure/door/wood/walnut
-	material = /decl/material/solid/organic/wood/walnut
-	color = /decl/material/solid/organic/wood/walnut::color
-
 /obj/structure/door/wood/saloon/walnut
 	material = /decl/material/solid/organic/wood/walnut
 	color = /decl/material/solid/organic/wood/walnut::color

diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm
@@ -27,12 +27,29 @@
 /obj/structure/railing/mapped/no_density
 	density = FALSE
 
-/obj/structure/railing/mapped/ebony
-	material = /decl/material/solid/organic/wood/ebony
+/obj/structure/railing/mapped/wooden
+	material = /decl/material/solid/organic/wood
 	parts_type = /obj/item/stack/material/plank
-	color = WOOD_COLOR_BLACK
+	color = WOOD_COLOR_GENERIC
 	paint_color = null
 
+// Subtypes.
+#define WOOD_RAILING_SUBTYPE(material_name) \
+/obj/structure/railing/mapped/wooden/##material_name { \
+	material = /decl/material/solid/organic/wood/##material_name; \
+	color = /decl/material/solid/organic/wood/##material_name::color; \
+}
+
+WOOD_RAILING_SUBTYPE(fungal)
+WOOD_RAILING_SUBTYPE(ebony)
+WOOD_RAILING_SUBTYPE(walnut)
+WOOD_RAILING_SUBTYPE(maple)
+WOOD_RAILING_SUBTYPE(mahogany)
+WOOD_RAILING_SUBTYPE(bamboo)
+WOOD_RAILING_SUBTYPE(yew)
+
+#undef WOOD_RAILING_SUBTYPE
+
 /obj/structure/railing/Process()
 	if(!material || !material.radioactivity)
 		return

diff --git a/code/game/objects/structures/wall_sconce.dm b/code/game/objects/structures/wall_sconce.dm
@@ -31,11 +31,14 @@
 	directional_offset  = @'{"NORTH":{"y":24}, "SOUTH":{"y":-1}, "EAST":{"x":10,"y":10}, "WEST":{"x":-10,"y":10}}'
 	/// Reference to the currently attached item.
 	var/obj/item/flame/light_source
+	/// Whether or not the light source, if present, is automatically lit on Initialize.
+	var/start_lit = FALSE
 
 /obj/structure/wall_sconce/Initialize(var/ml, var/_mat, var/_reinf_mat, var/supplied_dir)
 
 	if(ispath(light_source))
 		light_source = new light_source(src)
+	if(start_lit && istype(light_source))
 		light_source.light(null, no_message = TRUE)
 
 	. = ..()

diff --git a/maps/shaded_hills/shaded_hills-dungeon.dmm b/maps/shaded_hills/shaded_hills-dungeon.dmm
@@ -57,7 +57,7 @@
 /turf/floor/natural/rock/basalt,
 /area/shaded_hills/caves/dungeon/poi)
 "Xx" = (
-/turf/wall/log/ebony,
+/turf/wall/log/walnut,
 /area/shaded_hills/caves/dungeon)
 "YN" = (
 /turf/floor/natural/path/running_bond/basalt,

diff --git a/maps/shaded_hills/shaded_hills-grassland.dmm b/maps/shaded_hills/shaded_hills-grassland.dmm
@@ -15,7 +15,7 @@
 /turf/floor/natural/grass,
 /area/shaded_hills/outside)
 "dB" = (
-/turf/wall/log/ebony,
+/turf/wall/log/walnut,
 /area/shaded_hills/caves/unexplored)
 "ee" = (
 /turf/floor/natural/path/running_bond/basalt,
@@ -55,7 +55,7 @@
 /area/shaded_hills/outside/river)
 "iP" = (
 /obj/structure/fire_source/firepit/basalt,
-/obj/item/stack/material/log/mapped/ebony/ten,
+/obj/item/stack/material/log/mapped/walnut/ten,
 /turf/floor/natural/barren,
 /area/shaded_hills/outside)
 "jj" = (
@@ -111,9 +111,9 @@
 /turf/floor/natural/barren,
 /area/shaded_hills/caves/entrance)
 "nl" = (
-/obj/structure/door/wood/ebony,
+/obj/structure/door/walnut,
 /obj/abstract/exterior_marker/inside,
-/turf/floor/wood/ebony,
+/turf/floor/wood/walnut,
 /area/shaded_hills/outside)
 "oo" = (
 /obj/item/stack/material/ore/handful/sand,
@@ -147,7 +147,7 @@
 /area/shaded_hills/caves/unexplored)
 "ul" = (
 /obj/abstract/exterior_marker/inside,
-/turf/floor/wood/ebony,
+/turf/floor/wood/walnut,
 /area/shaded_hills/outside)
 "vX" = (
 /turf/floor/natural/path/running_bond/basalt,
@@ -162,7 +162,7 @@
 /turf/floor/natural/dirt,
 /area/shaded_hills/outside)
 "xC" = (
-/turf/floor/wood/ebony,
+/turf/floor/wood/walnut,
 /area/shaded_hills/outside)
 "yA" = (
 /obj/abstract/landmark/latejoin/observer,
@@ -191,7 +191,7 @@
 /turf/floor/woven,
 /area/shaded_hills/outside)
 "EE" = (
-/turf/floor/wood/ebony,
+/turf/floor/wood/walnut,
 /area/shaded_hills/outside/river)
 "EL" = (
 /obj/abstract/exterior_marker/inside,
@@ -209,13 +209,13 @@
 /area/shaded_hills/outside)
 "ES" = (
 /obj/abstract/exterior_marker/inside,
-/turf/wall/log/ebony,
+/turf/wall/log/walnut,
 /area/shaded_hills/outside)
 "EV" = (
 /turf/floor/natural/mud/water/deep,
 /area/shaded_hills/caves/river)
 "Fg" = (
-/obj/structure/door/wood/ebony,
+/obj/structure/door/walnut,
 /obj/abstract/exterior_marker/inside,
 /turf/floor/natural/path/basalt,
 /area/shaded_hills/outside)
@@ -262,7 +262,7 @@
 /turf/floor/natural/rock/basalt,
 /area/shaded_hills/outside)
 "JN" = (
-/turf/wall/log/ebony,
+/turf/wall/log/walnut,
 /area/shaded_hills/outside/river)
 "Kd" = (
 /turf/floor/natural/mud,
@@ -369,7 +369,7 @@
 /turf/floor/natural/rock/basalt,
 /area/shaded_hills/caves/unexplored/south)
 "ZV" = (
-/turf/wall/log/ebony,
+/turf/wall/log/walnut,
 /area/shaded_hills/outside)
 
 (1,1,1) = {"