From 98f697fd62f605dbd736de36dfe3d5ce6b9394c0 Mon Sep 17 00:00:00 2001
From: LordNest <77477080+LordNest@users.noreply.github.com>
Date: Sun, 29 Oct 2023 01:32:02 +0400
Subject: [PATCH] Remove CMO/RD bedroom window, add flowers to the church
 (#1246)

---
 maps/sierra/z1-z5_sierra.dmm | 42 ++++++++++--------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index 9d7375ff261b7..5977bb1c9ad38 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -5040,9 +5040,6 @@
 /obj/structure/bed/chair/office/comfy/purple{
 	dir = 1
 	},
-/obj/structure/curtain/bed{
-	pixel_y = 32
-	},
 /turf/simulated/floor/wood/mahogany,
 /area/crew_quarters/heads/office/rd/cobed)
 "aLi" = (
@@ -37688,6 +37685,10 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/item/reagent_containers/food/snacks/grown/poppy,
+/obj/item/reagent_containers/food/snacks/grown/poppy,
+/obj/item/reagent_containers/food/snacks/grown/poppy,
+/obj/item/reagent_containers/food/snacks/grown/poppy,
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "fIJ" = (
@@ -46494,12 +46495,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/seconddeck/fore)
-"hbp" = (
-/obj/wallframe_spawn/reinforced/polarized/full{
-	id = "cmo_rd_dorms_windows"
-	},
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/office/rd/cobed)
 "hbv" = (
 /obj/structure/cable/green{
 	d2 = 8;
@@ -46817,9 +46812,6 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/hallway/primary/bridgedeck/aft)
 "hdJ" = (
-/obj/structure/hygiene/toilet{
-	dir = 8
-	},
 /obj/floor_decal/industrial/warning{
 	dir = 1
 	},
@@ -48686,7 +48678,6 @@
 /area/maintenance/seconddeck/foreport)
 "hvd" = (
 /obj/floor_decal/techfloor,
-/obj/decal/cleanable/remains,
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai_upload)
 "hvh" = (
@@ -58012,9 +58003,6 @@
 /obj/floor_decal/corner/purple/border{
 	dir = 8
 	},
-/obj/structure/curtain/bed{
-	pixel_y = 32
-	},
 /turf/simulated/floor/wood/mahogany,
 /area/crew_quarters/heads/office/rd/cobed)
 "iSd" = (
@@ -103467,9 +103455,6 @@
 /obj/floor_decal/corner/paleblue/border{
 	dir = 8
 	},
-/obj/structure/curtain/bed{
-	pixel_y = -32
-	},
 /turf/simulated/floor/wood/maple,
 /area/crew_quarters/heads/office/cmo/cobed)
 "pQe" = (
@@ -106815,9 +106800,6 @@
 /area/exploration_shuttle/cargo_r)
 "qrt" = (
 /obj/structure/bed/chair/office/comfy/teal,
-/obj/structure/curtain/bed{
-	pixel_y = -32
-	},
 /turf/simulated/floor/wood/maple,
 /area/crew_quarters/heads/office/cmo/cobed)
 "qrB" = (
@@ -109015,9 +108997,6 @@
 /obj/floor_decal/carpet/purple{
 	dir = 9
 	},
-/obj/structure/curtain/bed{
-	pixel_y = 32
-	},
 /turf/simulated/floor/carpet/purple,
 /area/crew_quarters/heads/office/rd/cobed)
 "qKw" = (
@@ -120193,6 +120172,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/item/reagent_containers/food/snacks/grown/harebell,
+/obj/item/reagent_containers/food/snacks/grown/harebell,
+/obj/item/reagent_containers/food/snacks/grown/harebell,
+/obj/item/reagent_containers/food/snacks/grown/harebell,
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "ssT" = (
@@ -128179,9 +128162,6 @@
 /obj/floor_decal/carpet/blue2{
 	dir = 10
 	},
-/obj/structure/curtain/bed{
-	pixel_y = -32
-	},
 /turf/simulated/floor/carpet/blue3,
 /area/crew_quarters/heads/office/cmo/cobed)
 "tDf" = (
@@ -337345,7 +337325,7 @@ lsb
 alE
 tvm
 pQa
-hbp
+hdc
 iRR
 rJe
 xgE
@@ -337547,7 +337527,7 @@ lsb
 via
 ibt
 qrt
-hbp
+hdc
 aLc
 dVH
 gip
@@ -337749,7 +337729,7 @@ lsb
 rGX
 xBo
 tCS
-hbp
+hdc
 qKs
 xjd
 jWq