Merge pull request #18948 from Niknakflak/ShuttleChanges

Changes the shuttlebar back to pre-revert state

_maps/shuttles/emergency_bar.dmm

@@ -188,7 +188,9 @@
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
 "aG" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool{
+	can_buckle = 1
+	},
 /turf/open/floor/plasteel/grimy,
 /area/shuttle/escape)
 "aH" = (
@@ -235,7 +237,10 @@
 /turf/open/floor/plasteel/shuttle/red,
 /area/shuttle/escape)
 "aN" = (
-/obj/structure/chair/stool/bar,
+/obj/structure/chair/stool/bar{
+	can_buckle = 1;
+	name = "buckable bar stool"
+	},
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 "aO" = (
@@ -266,7 +271,8 @@
 	pixel_y = 0
 	},
 /obj/structure/table,
-/obj/item/weapon/storage/firstaid/toxin,
+/obj/item/weapon/storage/box/drinkingglasses,
+/obj/item/weapon/reagent_containers/food/drinks/bottle/lizardwine,
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 "aT" = (
@@ -385,10 +391,10 @@
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bn" = (
-/turf/closed/wall/shuttle{
+/obj/structure/grille,
-	icon_state = "swall11";
+/obj/structure/window/shuttle,
-	dir = 2
+/obj/structure/sign/bluecross_2,
-	},
+/turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bo" = (
 /obj/machinery/door/airlock/shuttle{
@@ -400,22 +406,16 @@
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bq" = (
-/obj/structure/table/reinforced,
+/obj/machinery/door/airlock/glass_medical{
-/obj/item/weapon/storage/firstaid/fire{
+	name = "Medbay"
-	pixel_x = 4;
-	pixel_y = 4
 	},
-/obj/item/weapon/storage/firstaid/brute,
 /turf/open/floor/plasteel/shuttle/white,
 /area/shuttle/escape)
 "br" = (
-/obj/structure/sink{
+/obj/machinery/sleeper{
-	dir = 4;
+	dir = 8
-	icon_state = "sink";
-	pixel_x = 10;
-	tag = "icon-sink (EAST)"
 	},
-/turf/open/floor/plasteel/freezer,
+/turf/open/floor/plasteel/shuttle/white,
 /area/shuttle/escape)
 "bs" = (
 /obj/machinery/door/airlock{
@@ -439,16 +439,15 @@
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bw" = (
-/obj/structure/statue/silver/janitor{
+/obj/structure/table/optable,
-	anchored = 1
+/obj/item/weapon/surgical_drapes,
-	},
+/turf/open/floor/plasteel/shuttle/white,
-/turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bx" = (
 /obj/structure/toilet{
-	tag = "icon-toilet00 (NORTH)";
+	dir = 4;
 	icon_state = "toilet00";
-	dir = 1
+	tag = "icon-toilet00 (NORTH)"
 	},
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
@@ -457,10 +456,12 @@
 /turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bz" = (
-/obj/structure/closet/jcloset{
+/obj/structure/table,
-	name = "cleaning supplies closet"
+/obj/item/weapon/circular_saw,
-	},
+/obj/item/weapon/hemostat,
-/turf/open/floor/plasteel/freezer,
+/obj/item/weapon/retractor,
+/obj/item/weapon/scalpel,
+/turf/open/floor/plasteel/shuttle/white,
 /area/shuttle/escape)
 "bA" = (
 /turf/closed/wall/shuttle{
@@ -497,7 +498,7 @@
 "bF" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
-/turf/open/floor/plasteel/shuttle/white,
+/turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bG" = (
 /obj/item/weapon/twohanded/required/kirbyplants{
@@ -541,6 +542,7 @@
 /obj/structure/table,
 /obj/item/weapon/storage/box/drinkingglasses,
 /obj/item/weapon/reagent_containers/food/drinks/shaker,
+/obj/item/weapon/storage/fancy/cigarettes/cigars/havana,
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 "bO" = (
@@ -570,7 +572,12 @@
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 "bS" = (
-/obj/machinery/door/airlock/glass_medical,
+/obj/structure/table,
+/obj/item/weapon/storage/firstaid/regular,
+/obj/item/weapon/storage/firstaid/toxin{
+	pixel_x = 4;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/shuttle/white,
 /area/shuttle/escape)
 "bT" = (
@@ -581,16 +588,13 @@
 /turf/open/floor/plasteel/bar,
 /area/shuttle/escape)
 "bU" = (
-/obj/structure/sink{
+/obj/structure/table,
-	dir = 4;
+/obj/item/weapon/storage/firstaid/fire,
-	icon_state = "sink";
+/obj/item/weapon/storage/firstaid/brute{
-	pixel_x = 10;
+	pixel_x = 4;
-	tag = "icon-sink (EAST)"
+	pixel_y = 4
 	},
-/obj/structure/mirror{
+/turf/open/floor/plasteel/shuttle/white,
-	pixel_x = 28
-	},
-/turf/open/floor/plasteel/freezer,
 /area/shuttle/escape)
 "bV" = (
 /obj/structure/table/wood/bar{
@@ -692,7 +696,7 @@ bP
 bQ
 aE
 bt
-bp
+ak
 bu
 bx
 bC
@@ -715,7 +719,7 @@ bH
 bK
 bH
 aE
-bt
+aA
 bp
 bt
 bt
@@ -739,7 +743,7 @@ aE
 aE
 aE
 aE
-aA
+bm
 bp
 bv
 by
@@ -764,7 +768,7 @@ aN
 aE
 aE
 bt
-ak
+bt
 bt
 bt
 bC
@@ -787,8 +791,8 @@ aR
 bd
 aN
 aE
-bt
+bn
-bp
+bi
 bw
 bz
 bC
@@ -811,10 +815,10 @@ aE
 be
 aE
 aE
-bm
+bq
-bp
+bi
-bp
+bi
-bp
+bS
 bC
 bE
 "}
@@ -835,10 +839,10 @@ bN
 be
 bT
 bk
-bt
+bF
+br
 br
 bU
-br
 bB
 bB
 "}