Just in case

shiptest-ss13 · Apr 17, 2024 · 786014b · 786014b
1 parent 28a90f7
commit 786014b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
@@ -2751,7 +2751,7 @@
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "gib2-old"
 	},
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/grey/directional/south{
 	desc = "It looks incredibly comfy, and expensive. Theres a little note on the side, explaining how its made of %100 real cow skin.";
 	name = "Cowskin chair"
 	},

diff --git a/_maps/shuttles/independent/independent_tranquility.dmm b/_maps/shuttles/independent/independent_tranquility.dmm
@@ -6458,10 +6458,9 @@
 /obj/item/clothing/under/pants/camo,
 /obj/item/clothing/suit/hooded/wintercoat/captain,
 /obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---",
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+	name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
 	},
-/obj/structure/chair/comfy/brown,
+/obj/structure/chair/comfy/orange/directional/south,
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},

diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -380,18 +380,15 @@
 	pixel_x = 28
 	},
 /obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---",
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+	name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
 	},
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 4
 	},
-/obj/structure/chair/sofa/right{
-	dir = 8
-	},
+/obj/structure/chair/sofa/brown/right/directional/west,
 /obj/structure/closet/emcloset/wall/directional/east,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
@@ -3609,18 +3606,15 @@
 	pixel_y = -28
 	},
 /obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---",
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+	name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
 	},
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 6
 	},
 /obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 6
 	},
-/obj/structure/chair/sofa/left{
-	dir = 8
-	},
+/obj/structure/chair/sofa/brown/left/directional/west,
 /obj/structure/closet/firecloset/wall/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -3605,12 +3605,9 @@
 /obj/item/gun/energy/e_gun/mini,
 /obj/item/gun/energy/e_gun/mini,
 /obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---",
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/structure/chair/comfy/brown{
-	dir = 1
+	name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
 	},
+/obj/structure/chair/comfy/orange/directional/north,
 /obj/structure/closet/secure_closet/wall/directional/west{
 	icon_door = "sec_wall";
 	icon_state = "sec_wall";