Merge pull request #4673 from out-of-phaze/feature/covered-well

Add covered wells

code/game/objects/structures/well.dm

@@ -49,6 +49,10 @@
 	. = ..()
 	if(reagents?.total_volume)
 		add_overlay(overlay_image(icon, "[icon_state]-fluid", reagents.get_color(), (RESET_COLOR | RESET_ALPHA)))
+	if(istype(reinf_material)) // reinf_material -> roof and posts, at this point in time
+		var/image/roof_image = overlay_image(icon, "[icon_state]-roof", reinf_material.color, RESET_COLOR | RESET_ALPHA | KEEP_APART)
+		roof_image.pixel_y = 16 // we have to use 32x32 sprites but want this to be, effectively, 48x32
+		add_overlay(roof_image)
 
 /obj/structure/reagent_dispensers/well/on_reagent_change()
 	if(!(. = ..()))
@@ -81,6 +85,9 @@
 /obj/structure/reagent_dispensers/well/mapped
 	auto_refill = /decl/material/liquid/water
 
+/obj/structure/reagent_dispensers/well/mapped/covered
+	reinf_material = /decl/material/solid/organic/wood/walnut
+
 /obj/structure/reagent_dispensers/well/wall_fountain
 	name            = "wall fountain"
 	desc            = "An intricately-constructed fountain set into a wall."

maps/shaded_hills/shaded_hills-inn.dmm

@@ -771,10 +771,6 @@
 /obj/structure/closet/crate/chest/ebony,
 /turf/floor/path/basalt,
 /area/shaded_hills/general_store)
-"wA" = (
-/obj/abstract/exterior_marker/inside,
-/turf/floor/dirt,
-/area/shaded_hills/outside/downlands)
 "xh" = (
 /obj/structure/table/wood/ebony,
 /obj/item/chems/condiment/large/salt,
@@ -1212,10 +1208,6 @@
 	},
 /turf/floor/wood/walnut,
 /area/shaded_hills/inn)
-"Iz" = (
-/obj/abstract/exterior_marker/inside,
-/turf/wall/brick/basalt,
-/area/shaded_hills/outside/downlands)
 "IB" = (
 /obj/structure/door/walnut,
 /obj/abstract/landmark/lock_preset/shaded_hills/shrine,
@@ -1324,8 +1316,7 @@
 /turf/floor/path/basalt,
 /area/shaded_hills/outside/downlands)
 "Lj" = (
-/obj/structure/reagent_dispensers/well/mapped,
-/obj/abstract/exterior_marker/inside,
+/obj/structure/reagent_dispensers/well/mapped/covered,
 /turf/floor/dirt,
 /area/shaded_hills/outside/downlands)
 "Ly" = (
@@ -7835,9 +7826,9 @@ HI
 HI
 HI
 TR
-Iz
-Iz
-Iz
+TR
+TR
+TR
 TR
 TR
 EV
@@ -7987,9 +7978,9 @@ HI
 HI
 TR
 TR
-wA
-wA
-wA
+TR
+TR
+TR
 TR
 TR
 EV
@@ -8139,9 +8130,9 @@ HI
 HI
 TR
 TR
-wA
+TR
 Lj
-wA
+TR
 TR
 TR
 EV
@@ -8291,9 +8282,9 @@ HI
 HI
 TR
 TR
-wA
-wA
-wA
+TR
+TR
+TR
 TR
 TR
 TR
@@ -8443,9 +8434,9 @@ HI
 HI
 HI
 TR
-Iz
-Iz
-Iz
+TR
+TR
+TR
 TR
 TR
 EV