Merge branch 'master' into wipm4ra0110

maps/map_files/golden_arrow/golden_arrow.dmm

@@ -156,6 +156,11 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/hangar)
+"aO" = (
+/obj/item/prop/colony/game,
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer,
+/area/golden_arrow/dorms)
 "aQ" = (
 /obj/structure/sign/safety/galley{
 	pixel_y = 29
@@ -1220,10 +1225,10 @@
 	},
 /area/golden_arrow/platoon_sergeant)
 "gL" = (
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/light{
 	dir = 8
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3075,6 +3080,9 @@
 /obj/structure/machinery/power/apc/almayer{
 	dir = 8
 	},
+/obj/structure/bed/chair{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3147,6 +3155,9 @@
 /area/golden_arrow/canteen)
 "sR" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed/chair{
+	dir = 8
+	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/dorms)
 "sS" = (
@@ -3418,11 +3429,6 @@
 /turf/open/floor/almayer,
 /area/golden_arrow/hangar)
 "uH" = (
-/obj/structure/largecrate/random/case/small,
-/obj/item/toy/deck{
-	pixel_x = -6;
-	pixel_y = 6
-	},
 /obj/structure/sign/poster{
 	desc = "One of those hot, tanned babes back the beaches of good ol' Earth.";
 	icon_state = "poster12";
@@ -3432,6 +3438,9 @@
 	serial_number = 12
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -3668,6 +3677,9 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/bed/chair{
+	dir = 8
+	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/dorms)
 "wa" = (
@@ -4014,11 +4026,17 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/briefing)
+"yw" = (
+/obj/item/toy/deck/uno,
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer,
+/area/golden_arrow/dorms)
 "yx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
 	},
+/obj/structure/machinery/computer/arcade,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -6009,6 +6027,10 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/medical)
+"JL" = (
+/obj/structure/bed/chair,
+/turf/open/floor/almayer,
+/area/golden_arrow/dorms)
 "JP" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -6146,6 +6168,7 @@
 /area/golden_arrow/hangar)
 "KK" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -6536,6 +6559,7 @@
 /obj/structure/machinery/light{
 	dir = 4
 	},
+/obj/structure/largecrate/random/case/small,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -7847,6 +7871,11 @@
 	icon_state = "cargo_arrow"
 	},
 /area/golden_arrow/prep_hallway)
+"Tb" = (
+/obj/item/toy/deck,
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer,
+/area/golden_arrow/dorms)
 "Tc" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -8281,6 +8310,13 @@
 	icon_state = "plate"
 	},
 /area/golden_arrow/hangar)
+"Vz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/golden_arrow/dorms)
 "VG" = (
 /turf/open/floor/almayer{
 	dir = 5;
@@ -18250,11 +18286,11 @@ Sy
 mk
 vk
 Vp
-EQ
+KZ
 gL
 sk
 uH
-Vp
+wl
 Vp
 wd
 XQ
@@ -18403,10 +18439,10 @@ Vr
 As
 Vp
 EQ
-wl
-wl
+JL
+Tb
 KK
-EQ
+JL
 Vp
 OG
 XI
@@ -18555,10 +18591,10 @@ rJ
 As
 Vp
 EF
-wl
-wl
-wl
-KZ
+JL
+aO
+yw
+Vz
 Vp
 xm
 XI