Merge pull request #4516 from noelle-lavenza/feature/barrel-lid

Add barrel lids and filling overlays, fix missing hoe, increase grass contrast
NebulaSS13 · Oct 10, 2024 · 5178787 · 5178787
2 parents d43a689 + 5e79ba9
commit 5178787
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/code/game/objects/structures/_structure_materials.dm b/code/game/objects/structures/_structure_materials.dm
@@ -36,7 +36,7 @@
 /obj/structure/proc/update_material_name(var/override_name)
 	var/base_name = override_name || initial(name)
 	if(istype(material))
-		SetName("[material.solid_name] [base_name]")
+		SetName("[material.adjective_name] [base_name]")
 	else
 		SetName(base_name)
 

diff --git a/code/game/objects/structures/barrel.dm b/code/game/objects/structures/barrel.dm
@@ -4,7 +4,7 @@
 	icon                      = 'icons/obj/structures/barrel.dmi'
 	icon_state                = ICON_STATE_WORLD
 	anchored                  = TRUE
-	atom_flags                = ATOM_FLAG_CLIMBABLE | ATOM_FLAG_OPEN_CONTAINER
+	atom_flags                = ATOM_FLAG_CLIMBABLE
 	matter                    = null
 	material                  = /decl/material/solid/organic/wood
 	color                     = /decl/material/solid/organic/wood::color
@@ -42,9 +42,21 @@
 		return
 	var/primary_mat = reagents?.get_primary_reagent_name()
 	if(primary_mat)
-		SetName("[material.solid_name] [initial(name)] of [primary_mat]")
+		update_material_name("[initial(name)] of [primary_mat]")
 	else
-		SetName("[material.solid_name] [initial(name)]")
+		update_material_name()
+	update_icon()
+
+/obj/structure/reagent_dispensers/barrel/on_update_icon()
+	. = ..()
+	if(ATOM_IS_OPEN_CONTAINER(src))
+		if(reagents)
+			var/overlay_amount = NONUNIT_CEILING(reagents.total_liquid_volume / reagents.maximum_volume * 100, 10)
+			var/image/filling_overlay = overlay_image(icon, "[icon_state]-[overlay_amount]", reagents.get_color(), RESET_COLOR | RESET_ALPHA)
+			add_overlay(filling_overlay)
+		add_overlay(overlay_image(icon, "[icon_state]-lidopen", material.color, RESET_COLOR))
+	else
+		add_overlay(overlay_image(icon, "[icon_state]-lidclosed", material.color, RESET_COLOR))
 
 /obj/structure/reagent_dispensers/barrel/ebony
 	material = /decl/material/solid/organic/wood/ebony

diff --git a/icons/obj/structures/barrel.dmi b/icons/obj/structures/barrel.dmi
diff --git a/icons/turf/flooring/grass.dmi b/icons/turf/flooring/grass.dmi
diff --git a/maps/shaded_hills/shaded_hills-inn.dmm b/maps/shaded_hills/shaded_hills-inn.dmm
@@ -861,7 +861,7 @@
 /obj/item/seeds/extracted/valerian,
 /obj/item/seeds/extracted/yarrow,
 /obj/item/seeds/extracted/yarrow,
-/obj/item/tool/shovel/wood/walnut,
+/obj/item/tool/hoe/wood/walnut,
 /turf/floor/dirt,
 /area/shaded_hills/outside/shrine)
 "Ay" = (