Merge remote-tracking branch 'upstream/master'

_maps/RandomRuins/SpaceRuins/bus.dmm

@@ -19,7 +19,8 @@
 "an" = (
 /obj/structure/fluff/bus/passable/seat,
 /obj/item/toy/plush/pkplush{
-	pixel_z = 17
+	pixel_z = 17;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -39,7 +40,8 @@
 	pixel_y = 15
 	},
 /obj/item/toy/plush/lizard_plushie/green{
-	pixel_z = 17
+	pixel_z = 17;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -49,7 +51,8 @@
 /obj/structure/fluff/bus/passable/seat,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/head/helmet/knight{
-	pixel_z = 16
+	pixel_z = 16;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -60,11 +63,13 @@
 /obj/item/grown/novaflower{
 	offset_at_init = 0;
 	pixel_z = 24;
-	pixel_y = 1
+	pixel_y = 1;
+	anchored = 1
 	},
 /obj/item/food/grown/watermelon{
 	offset_at_init = 0;
-	pixel_z = 17
+	pixel_z = 17;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -75,15 +80,18 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/toy/plush/moth{
 	pixel_z = 26;
-	pixel_y = 2
+	pixel_y = 2;
+	anchored = 1
 	},
 /obj/item/food/grown/citrus/orange{
 	offset_at_init = 0;
 	pixel_z = 18;
-	pixel_y = 1
+	pixel_y = 1;
+	anchored = 1
 	},
 /obj/item/toy/talking/ai{
-	pixel_z = 16
+	pixel_z = 16;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -149,10 +157,12 @@
 /obj/item/bodypart/arm/right{
 	pixel_z = 25;
 	pixel_y = 1;
-	pixel_x = -4
+	pixel_x = -4;
+	anchored = 1
 	},
 /obj/item/food/meat/slab/penguin{
-	pixel_z = 13
+	pixel_z = 13;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
@@ -188,12 +198,14 @@
 /obj/item/food/grown/tomato{
 	offset_at_init = 0;
 	pixel_z = 23;
-	pixel_y = 2
+	pixel_y = 2;
+	anchored = 1
 	},
 /obj/item/food/donut/plain{
 	pixel_z = 15;
 	pixel_y = 1;
-	pixel_x = 1
+	pixel_x = 1;
+	anchored = 1
 	},
 /obj/effect/decal/cleanable/ants{
 	pixel_z = 8;
@@ -291,7 +303,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/toy/plush/awakenedplushie{
 	pixel_z = 26;
-	pixel_y = 1
+	pixel_y = 1;
+	anchored = 1
 	},
 /obj/machinery/telecomms/server{
 	pixel_z = 12;
@@ -384,11 +397,13 @@
 /obj/item/toy/singlecard{
 	pixel_z = 24;
 	pixel_y = 1;
-	pixel_x = 0
+	pixel_x = 0;
+	anchored = 1
 	},
 /obj/item/food/grown/potato{
 	offset_at_init = 0;
-	pixel_z = 15
+	pixel_z = 15;
+	anchored = 1
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"

_maps/map_files/Birdshot/birdshot.dmm

@@ -22386,6 +22386,12 @@
 	},
 /turf/open/floor/engine/co2,
 /area/station/engineering/atmos/space_catwalk)
+"izw" = (
+/obj/machinery/transport/tram_controller/tcomms{
+	configured_transport_id = "bird_2"
+	},
+/turf/open/floor/circuit,
+/area/station/tcommsat/server)
 "izB" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/structure/sign/painting/library{
@@ -40716,6 +40722,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/open/floor/catwalk_floor,
 /area/station/engineering/break_room)
 "oJn" = (
@@ -54321,13 +54328,14 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
 "sKD" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Airlock"
-	},
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
 /obj/structure/cable,
 /obj/effect/landmark/navigate_destination,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/machinery/door/airlock/engineering{
+	name = "Main Engineering"
+	},
 /turf/open/floor/catwalk_floor,
 /area/station/engineering/break_room)
 "sKE" = (
@@ -58360,8 +58368,10 @@
 /turf/open/floor/iron/dark,
 /area/station/medical/pharmacy)
 "tUD" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/obj/machinery/transport/tram_controller/tcomms{
+	configured_transport_id = "bird_1"
+	},
+/turf/open/floor/circuit,
 /area/station/tcommsat/server)
 "tUH" = (
 /obj/structure/disposalpipe/segment,
@@ -121802,7 +121812,7 @@ wos
 udv
 tSq
 mvo
-tUD
+izw
 bFw
 ulK
 cdn

_maps/map_files/tramstation/tramstation.dmm

@@ -6765,7 +6765,10 @@
 	dir = 8
 	},
 /obj/item/radio/intercom/directional/west,
-/obj/item/paper/fluff/jobs/engineering/frequencies,
+/obj/item/toy/plush/lizard_plushie/green{
+	name = "Runs-The-Rails";
+	desc = "An adorable, hard working lizard that runs in circles to keep the tram operating safely."
+	},
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "boc" = (
@@ -26721,6 +26724,7 @@
 	},
 /obj/item/folder/blue,
 /obj/item/pen/blue,
+/obj/item/paper/fluff/jobs/engineering/frequencies,
 /turf/open/floor/iron,
 /area/station/tcommsat/computer)
 "iDQ" = (
@@ -61751,6 +61755,10 @@
 "uGW" = (
 /turf/closed/wall,
 /area/station/cargo/miningdock)
+"uGX" = (
+/obj/machinery/transport/tram_controller/tcomms,
+/turf/open/floor/iron/dark/telecomms,
+/area/station/tcommsat/server)
 "uHb" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/photocopier,
@@ -98247,7 +98255,7 @@ dwR
 ngp
 dwR
 dwR
-cXL
+ney
 ney
 sMr
 sMr
@@ -98505,7 +98513,7 @@ gga
 rBW
 ffN
 sMr
-sMr
+uGX
 drH
 ney
 tms
@@ -98761,7 +98769,7 @@ ocK
 ngp
 dwR
 dwR
-cXL
+sMr
 sMr
 sMr
 sMr