bowls-unvanishing-plus-bigger-bottles

DopplerShift13 · Sep 20, 2024 · 2b2c48c · 2b2c48c
1 parent 79d7196
commit 2b2c48c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_upper.dmm b/_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_upper.dmm
@@ -349,6 +349,20 @@
 /obj/item/storage/fancy/candle_box,
 /turf/open/floor/stone/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
+"sB" = (
+/obj/structure/rack/wooden,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/reagent_containers/cup/glass/bottle{
+	pixel_x = -8
+	},
+/obj/item/reagent_containers/cup/glass/bottle{
+	pixel_x = 1
+	},
+/obj/item/reagent_containers/cup/glass/bottle{
+	pixel_x = 7
+	},
+/turf/open/floor/stone/icemoon,
+/area/ruin/unpowered/primitive_catgirl_den)
 "sE" = (
 /obj/structure/railing/wooden_fencing{
 	dir = 8
@@ -889,17 +903,17 @@
 /area/ruin/unpowered/primitive_catgirl_den)
 "XV" = (
 /obj/structure/rack/wooden,
-/obj/item/reagent_containers/cup/glass/bottle/small{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/wall_torch/spawns_lit/directional/west,
+/obj/item/reagent_containers/cup/glass/bottle{
 	pixel_x = -8
 	},
-/obj/item/reagent_containers/cup/glass/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle{
 	pixel_x = 1
 	},
-/obj/item/reagent_containers/cup/glass/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle{
 	pixel_x = 7
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/wall_torch/spawns_lit/directional/west,
 /turf/open/floor/stone/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "Yj" = (
@@ -930,16 +944,16 @@
 /area/ruin/unpowered/primitive_catgirl_den)
 "YZ" = (
 /obj/structure/rack/wooden,
-/obj/item/reagent_containers/cup/glass/bottle/small{
-	pixel_x = -8
-	},
-/obj/item/reagent_containers/cup/glass/bottle/small{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/reagent_containers/cup/glass/bottle{
 	pixel_x = 1
 	},
-/obj/item/reagent_containers/cup/glass/bottle/small{
+/obj/item/reagent_containers/cup/glass/bottle{
+	pixel_x = -8
+	},
+/obj/item/reagent_containers/cup/glass/bottle{
 	pixel_x = 7
 	},
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/stone/icemoon,
 /area/ruin/unpowered/primitive_catgirl_den)
 "Zv" = (
@@ -2192,7 +2206,7 @@ RX
 Uv
 Uv
 Uv
-YZ
+sB
 OG
 OG
 YZ

diff --git a/modular_doppler/hearthkin/primitive_production/code/ceramics.dm b/modular_doppler/hearthkin/primitive_production/code/ceramics.dm
@@ -140,6 +140,11 @@ GLOBAL_LIST_INIT(clay_recipes, list ( \
 	icon_state = "clay_bowl"
 	custom_materials = null
 
+/obj/item/reagent_containers/cup/bowl/ceramic/update_icon_state()
+	if(!reagents.total_volume)
+		icon_state = "clay_bowl"
+	return ..()
+
 /obj/item/ceramic/cup
 	name = "ceramic cup"
 	desc = "A piece of clay with high walls, in the shape of a cup. It can hold 120 units."

diff --git a/modular_doppler/hearthkin/tribal_extended/code/crafting.dm b/modular_doppler/hearthkin/tribal_extended/code/crafting.dm
@@ -19,7 +19,7 @@
 	fill_icon_state = "fullbowl"
 	fill_icon = 'icons/obj/mining_zones/ash_flora.dmi'
 
-/obj/item/reagent_containers/cup/bowl/mushroom_bowl/update_icon_state()
+/obj/item/reagent_containers/cup/bowl/wood_bowl/update_icon_state()
 	if(!reagents.total_volume)
 		icon_state = "wood_bowl"
 	return ..()